Menu
▾
▴
web-erp-svn
|
From: <dai...@us...> - 2016-05-16 09:45:02
|
Revision: 7532
http://sourceforge.net/p/web-erp/reponame/7532
Author: daintree
Date: 2016-05-16 09:44:58 +0000 (Mon, 16 May 2016)
Log Message:
-----------
Pre release 4.13
Modified Paths:
--------------
trunk/UpgradeDatabase.php
trunk/doc/Change.log
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.mo
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/country_sql/default.sql
trunk/sql/mysql/country_sql/demo.sql
trunk/sql/mysql/upgrade4.12.3-4.13.sql
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2016-05-16 02:00:45 UTC (rev 7531)
+++ trunk/UpgradeDatabase.php 2016-05-16 09:44:58 UTC (rev 7532)
@@ -193,7 +193,7 @@
case '4.12.2':
$SQLScripts[] = './sql/mysql/upgrade4.12.2-4.12.3.sql';
case '4.12.3':
- $SQLScripts[] = './sql/mysql/upgrdate4.12.3-4.13.sql';
+ $SQLScripts[] = './sql/mysql/upgrade4.12.3-4.13.sql';
break;
} //end switch
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-05-16 02:00:45 UTC (rev 7531)
+++ trunk/doc/Change.log 2016-05-16 09:44:58 UTC (rev 7532)
@@ -1,5 +1,7 @@
webERP Change Log
+16/5/16 Release 4.13
+
15/05/16 RChacon: In SelectCustomer.php, use a default map host if $map_host is empty.
15/05/16 RChacon: In AccountGroups.php, hide no printing elements.
15/05/16 Exson: Add sequence digitals to make BOM sequences can be adjusted flexible and avoid any uncertainty of the number stored in SQL. Thanks Tim's suggestion.
@@ -10,7 +12,7 @@
09/05/16 Exson: Tidy Code Up to remove redundant code according to Tim's guide.
05/06/16 Exson: Modify Z_RePostGLFromPeriod.php to make this feature still reliable with prev
05/06/16: Exson: Remove the $db which is not needed now. Reported by Tim. ious version of GLPostings.inc. Rework the new GLPostings.inc.
-05/06/16 Exson: Fixed typo of IndentText, thanks for Tim's report. Change sequence from int to double to make item is easily inserted into BOMs and Add pictures to BOMs and make BOM printable.
+05/06/16 Exson: Fixed typo of IndentText, thanks for Tim's report. Change sequence from int to double to make item is easily inserted into BOMs and Add pictures to BOMs and make BOM printable.
01/05/2016 RChacon: In Z_poAddLanguage.php, fix directory name and default language file name.
29/4/16 RChacon: In includes/DateFunctions.inc, add year in long date and time in locale format.
26/4/16 Phil committed for Tim: apparently only change required for PHP7 see http://www.weberp.org/forum/showthread.php?tid=2733&pid=7132#pid7132
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 2016-05-16 02:00:45 UTC (rev 7531)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2016-05-16 09:44:58 UTC (rev 7532)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-15 17:54-0600\n"
+"POT-Creation-Date: 2016-05-16 21:31+1200\n"
"PO-Revision-Date: 2013-06-01 11:19-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -230,11 +230,11 @@
#: 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:280 BOMs.php:981
-#: COGSGLPostings.php:19 CollectiveWorkOrderCost.php:7
-#: CollectiveWorkOrderCost.php:273 CompanyPreferences.php:102
-#: CounterReturns.php:1629 CounterSales.php:2097 CounterSales.php:2193
-#: Credit_Invoice.php:276 CreditStatus.php:21 CustEDISetup.php:17
-#: CustItem.php:120 CustItem.php:210 CustItem.php:238
+#: BOMs_SingleLevel.php:231 BOMs_SingleLevel.php:881 COGSGLPostings.php:19
+#: CollectiveWorkOrderCost.php:7 CollectiveWorkOrderCost.php:273
+#: CompanyPreferences.php:102 CounterReturns.php:1629 CounterSales.php:2097
+#: CounterSales.php:2193 Credit_Invoice.php:276 CreditStatus.php:21
+#: CustEDISetup.php:17 CustItem.php:120 CustItem.php:210 CustItem.php:238
#: DebtorsAtPeriodEnd.php:129 DiscountCategories.php:12
#: DiscountCategories.php:149 DiscountMatrix.php:16 EDIMessageFormat.php:105
#: FixedAssetLocations.php:13 FixedAssetRegister.php:16
@@ -255,7 +255,7 @@
#: SalesGLPostings.php:19 SalesGraph.php:40 SalesPeople.php:28
#: SalesTypes.php:20 SelectAsset.php:48 SelectCompletedOrder.php:11
#: SelectContract.php:69 SelectCreditItems.php:221 SelectCreditItems.php:292
-#: SelectCustomer.php:257 SelectGLAccount.php:77 SelectOrderItems.php:559
+#: SelectCustomer.php:258 SelectGLAccount.php:77 SelectOrderItems.php:559
#: SelectOrderItems.php:1469 SelectOrderItems.php:1569 SelectProduct.php:522
#: SelectQASamples.php:45 SelectSalesOrder.php:512 SelectSupplier.php:14
#: SelectSupplier.php:222 SelectWorkOrder.php:9 SelectWorkOrder.php:174
@@ -271,7 +271,7 @@
#: WhereUsedInquiry.php:18 WorkCentres.php:113 WorkOrderCosting.php:22
#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:34
#: WorkOrderStatus.php:58 WWW_Users.php:34 Z_BottomUpCosts.php:57
-#: ../webSHOP/includes/header.php:251
+#: ../webSHOP/includes/header.php:218
msgid "Search"
msgstr "إبحث"
@@ -295,6 +295,7 @@
#: AccountGroups.php:307 AccountGroups.php:310 AccountGroups.php:461
#: AccountGroups.php:463 BOMs.php:135 BOMs.php:886 BOMs.php:888
+#: BOMs_SingleLevel.php:125 BOMs_SingleLevel.php:793 BOMs_SingleLevel.php:795
#: CompanyPreferences.php:425 CompanyPreferences.php:427
#: CompanyPreferences.php:440 CompanyPreferences.php:442
#: CompanyPreferences.php:455 CompanyPreferences.php:457
@@ -354,19 +355,19 @@
#: TestPlanResults.php:924 TestPlanResults.php:928 UserGLAccounts.php:187
#: UserGLAccounts.php:196 WWW_Users.php:534 WWW_Users.php:536
#: WWW_Users.php:707 WWW_Users.php:709 WWW_Users.php:722 WWW_Users.php:724
-#: reportwriter/languages/en_US/reports.php:114
msgid "Yes"
msgstr "موافق"
#: AccountGroups.php:313 AccountGroups.php:466 AccountGroups.php:468
#: BankAccounts.php:218 BankAccounts.php:412 BankAccounts.php:414
#: BankAccounts.php:418 BankAccounts.php:426 BOMs.php:137 BOMs.php:885
-#: BOMs.php:889 CompanyPreferences.php:424 CompanyPreferences.php:428
-#: CompanyPreferences.php:439 CompanyPreferences.php:443
-#: CompanyPreferences.php:454 CompanyPreferences.php:458
-#: ContractCosting.php:200 Currencies.php:344 Currencies.php:525
-#: Currencies.php:527 CustomerBranches.php:452 Customers.php:658
-#: Customers.php:1047 Customers.php:1054 Customers.php:1057
+#: BOMs.php:889 BOMs_SingleLevel.php:127 BOMs_SingleLevel.php:792
+#: BOMs_SingleLevel.php:796 CompanyPreferences.php:424
+#: CompanyPreferences.php:428 CompanyPreferences.php:439
+#: CompanyPreferences.php:443 CompanyPreferences.php:454
+#: CompanyPreferences.php:458 ContractCosting.php:200 Currencies.php:344
+#: Currencies.php:525 Currencies.php:527 CustomerBranches.php:452
+#: Customers.php:658 Customers.php:1047 Customers.php:1054 Customers.php:1057
#: DailyBankTransactions.php:214 DeliveryDetails.php:1159
#: DeliveryDetails.php:1200 DeliveryDetails.php:1203 FormDesigner.php:99
#: GLAccountUsers.php:183 GLAccountUsers.php:193 GLTransInquiry.php:93
@@ -421,18 +422,17 @@
#: UserGLAccounts.php:199 WWW_Users.php:533 WWW_Users.php:537
#: WWW_Users.php:706 WWW_Users.php:710 WWW_Users.php:721 WWW_Users.php:725
#: includes/PDFLowGPPageHeader.inc:44
-#: reportwriter/languages/en_US/reports.php:82
msgid "No"
msgstr "ﻻ"
#: AccountGroups.php:322 AccountSections.php:196 AddCustomerContacts.php:152
#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
-#: BankAccounts.php:243 BOMs.php:193 COGSGLPostings.php:112
-#: COGSGLPostings.php:219 CreditStatus.php:175 Currencies.php:374
-#: Currencies.php:391 CustItem.php:166 CustomerBranches.php:456
-#: Customers.php:1131 Customers.php:1165 CustomerTypes.php:205
-#: Departments.php:186 EDIMessageFormat.php:150 Factors.php:334
-#: FixedAssetCategories.php:190 FixedAssetLocations.php:111
+#: BankAccounts.php:243 BOMs.php:193 BOMs_SingleLevel.php:153
+#: COGSGLPostings.php:112 COGSGLPostings.php:219 CreditStatus.php:175
+#: Currencies.php:374 Currencies.php:391 CustItem.php:166
+#: CustomerBranches.php:456 Customers.php:1131 Customers.php:1165
+#: CustomerTypes.php:205 Departments.php:186 EDIMessageFormat.php:150
+#: Factors.php:334 FixedAssetCategories.php:190 FixedAssetLocations.php:111
#: FreightCosts.php:253 GeocodeSetup.php:173 GLAccounts.php:317 GLTags.php:96
#: ImportBankTransAnalysis.php:223 InternalStockRequest.php:293 Labels.php:333
#: Labels.php:358 Locations.php:439 MailingGroupMaintenance.php:178
@@ -444,8 +444,8 @@
#: ProductSpecs.php:465 PurchData.php:312 QATests.php:467
#: SalesCategories.php:310 SalesGLPostings.php:137 SalesGLPostings.php:255
#: SalesPeople.php:240 SalesTypes.php:206 SecurityTokens.php:130
-#: SelectCustomer.php:742 SelectCustomer.php:767 SelectCustomer.php:822
-#: SelectCustomer.php:840 SelectCustomer.php:864 SelectCustomer.php:881
+#: SelectCustomer.php:733 SelectCustomer.php:758 SelectCustomer.php:813
+#: SelectCustomer.php:831 SelectCustomer.php:855 SelectCustomer.php:872
#: SelectGLAccount.php:130 SelectGLAccount.php:145 SelectQASamples.php:417
#: SellThroughSupport.php:298 Shippers.php:144 StockCategories.php:296
#: SupplierContacts.php:165 SupplierTenderCreate.php:157 SupplierTypes.php:170
@@ -453,7 +453,6 @@
#: TaxGroups.php:191 TaxProvinces.php:179 UnitsOfMeasure.php:185
#: WorkCentres.php:145 WWW_Access.php:132 WWW_Users.php:368
#: includes/InputSerialItems.php:110 includes/OutputSerialItems.php:20
-#: reportwriter/languages/en_US/reports.php:143
#, php-format
msgid "Edit"
msgstr "تحرير"
@@ -464,14 +463,15 @@
#: AccountGroups.php:323 AccountSections.php:201 AddCustomerContacts.php:153
#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
-#: BankAccounts.php:244 BOMs.php:195 COGSGLPostings.php:113
-#: COGSGLPostings.php:220 ContractBOM.php:272 ContractOtherReqts.php:124
-#: CounterReturns.php:740 CounterSales.php:836 Credit_Invoice.php:409
-#: CreditStatus.php:176 Currencies.php:377 CustItem.php:167
-#: CustomerReceipt.php:993 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:318 GLJournal.php:431 GLTags.php:97
+#: BankAccounts.php:244 BOMs.php:195 BOMs_SingleLevel.php:154
+#: COGSGLPostings.php:113 COGSGLPostings.php:220 ContractBOM.php:272
+#: ContractOtherReqts.php:124 CounterReturns.php:740 CounterSales.php:836
+#: Credit_Invoice.php:409 CreditStatus.php:176 Currencies.php:377
+#: CustItem.php:167 CustomerReceipt.php:993 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:318 GLJournal.php:431 GLTags.php:97
#: ImportBankTransAnalysis.php:224 InternalStockCategoriesByRole.php:184
#: InternalStockRequest.php:294 Labels.php:334 Labels.php:359 Labels.php:612
#: Locations.php:440 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
@@ -486,8 +486,8 @@
#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:311
#: SalesGLPostings.php:138 SalesGLPostings.php:256 SalesPeople.php:241
#: SalesTypes.php:207 SecurityTokens.php:131 SelectCreditItems.php:776
-#: SelectCustomer.php:743 SelectCustomer.php:768 SelectCustomer.php:823
-#: SelectCustomer.php:841 SelectCustomer.php:865 SelectCustomer.php:882
+#: SelectCustomer.php:734 SelectCustomer.php:759 SelectCustomer.php:814
+#: SelectCustomer.php:832 SelectCustomer.php:856 SelectCustomer.php:873
#: SelectOrderItems.php:1381 SelectQASamples.php:418
#: SellThroughSupport.php:299 Shipments.php:438 Shippers.php:145
#: SpecialOrder.php:667 StockCategories.php:297 StockCategories.php:626
@@ -500,7 +500,6 @@
#: WorkCentres.php:146 WOSerialNos.php:335 WWW_Access.php:133
#: WWW_Users.php:369 includes/InputSerialItemsKeyed.php:60
#: includes/OutputSerialItems.php:99
-#: reportwriter/languages/en_US/reports.php:141
#, php-format
msgid "Delete"
msgstr "حذف"
@@ -529,21 +528,22 @@
#: AccountGroups.php:405 AccountSections.php:285 AddCustomerContacts.php:273
#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229
-#: BankAccounts.php:433 BOMs.php:906 COGSGLPostings.php:368
-#: CreditStatus.php:259 Currencies.php:537 CustLoginSetup.php:273
-#: Departments.php:258 DiscountMatrix.php:142 EDIMessageFormat.php:248
-#: FixedAssetCategories.php:350 FixedAssetLocations.php:161
-#: FreightCosts.php:371 GeocodeSetup.php:271 GLAccounts.php:265 Labels.php:647
-#: Locations.php:716 Manufacturers.php:375 MRPDemands.php:424
-#: MRPDemandTypes.php:188 OffersReceived.php:57 OffersReceived.php:146
-#: PaymentMethods.php:302 PaymentTerms.php:310 PO_AuthorisationLevels.php:264
-#: PriceMatrix.php:236 Prices_Customer.php:369 ProductSpecs.php:661
-#: QATests.php:359 SalesAnalReptCols.php:552 SalesAnalRepts.php:519
-#: SalesGLPostings.php:427 SalesPeople.php:381 SelectQASamples.php:531
-#: SelectQASamples.php:601 Shippers.php:203 StockCategories.php:653
-#: SupplierContacts.php:284 SuppLoginSetup.php:291 TaxAuthorities.php:327
-#: TaxCategories.php:244 TaxProvinces.php:234 TestPlanResults.php:967
-#: UnitsOfMeasure.php:241 WorkCentres.php:289 WWW_Users.php:792
+#: BankAccounts.php:433 BOMs.php:906 BOMs_SingleLevel.php:809
+#: COGSGLPostings.php:368 CreditStatus.php:259 Currencies.php:537
+#: CustLoginSetup.php:273 Departments.php:258 DiscountMatrix.php:142
+#: EDIMessageFormat.php:248 FixedAssetCategories.php:350
+#: FixedAssetLocations.php:161 FreightCosts.php:371 GeocodeSetup.php:271
+#: GLAccounts.php:265 Labels.php:647 Locations.php:716 Manufacturers.php:375
+#: MRPDemands.php:424 MRPDemandTypes.php:188 OffersReceived.php:57
+#: OffersReceived.php:146 PaymentMethods.php:302 PaymentTerms.php:310
+#: PO_AuthorisationLevels.php:264 PriceMatrix.php:236 Prices_Customer.php:369
+#: ProductSpecs.php:661 QATests.php:359 SalesAnalReptCols.php:552
+#: SalesAnalRepts.php:519 SalesGLPostings.php:427 SalesPeople.php:381
+#: SelectQASamples.php:531 SelectQASamples.php:601 Shippers.php:203
+#: StockCategories.php:653 SupplierContacts.php:284 SuppLoginSetup.php:291
+#: TaxAuthorities.php:327 TaxCategories.php:244 TaxProvinces.php:234
+#: TestPlanResults.php:967 UnitsOfMeasure.php:241 WorkCentres.php:289
+#: WWW_Users.php:792
msgid "Enter Information"
msgstr "أدخل المعلومات"
@@ -650,8 +650,8 @@
msgid "New Account Section Details"
msgstr ""
-#: AddCustomerContacts.php:6 AddCustomerContacts.php:62 SelectCustomer.php:733
-#: SelectCustomer.php:799
+#: AddCustomerContacts.php:6 AddCustomerContacts.php:62 SelectCustomer.php:724
+#: SelectCustomer.php:790
msgid "Customer Contacts"
msgstr ""
@@ -709,7 +709,7 @@
#: 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:737 StockDispatch.php:277 StockDispatch.php:288
+#: SelectCustomer.php:728 StockDispatch.php:277 StockDispatch.php:288
#: StockDispatch.php:299 SupplierContacts.php:152 SuppTransGLAnalysis.php:108
#: Tax.php:411 TestPlanResults.php:508 UserBankAccounts.php:161
#: UserGLAccounts.php:157 UserLocations.php:176
@@ -718,7 +718,7 @@
msgstr ""
#: AddCustomerContacts.php:130 AddCustomerContacts.php:238 Customers.php:1119
-#: Customers.php:1127 SelectCustomer.php:738 WWW_Access.php:113
+#: Customers.php:1127 SelectCustomer.php:729 WWW_Access.php:113
#: WWW_Access.php:179
msgid "Role"
msgstr ""
@@ -737,14 +737,14 @@
#: PDFWOPrint.php:596 PDFWOPrint.php:676 PDFWOPrint.php:679
#: PO_PDFPurchOrder.php:400 PO_PDFPurchOrder.php:403 PrintCustTrans.php:740
#: PrintCustTransPortrait.php:793 PrintCustTransPortrait.php:1039
-#: PrintCustTransPortrait.php:1095 SelectCustomer.php:420
-#: SelectCustomer.php:740 SelectSupplier.php:290 SupplierContacts.php:156
+#: PrintCustTransPortrait.php:1095 SelectCustomer.php:409
+#: SelectCustomer.php:731 SelectSupplier.php:290 SupplierContacts.php:156
#: SupplierContacts.php:277 UserSettings.php:186 WWW_Users.php:322
#: includes/PDFPickingListHeader.inc:25 includes/PDFStatementPageHeader.inc:67
#: includes/PDFTransPageHeader.inc:85
#: includes/PDFTransPageHeaderPortrait.inc:114 includes/PDFWOPageHeader.inc:19
-#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:298
-#: ../webSHOP/Register.php:595
+#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:443
+#: ../webSHOP/Register.php:608
msgid "Email"
msgstr ""
@@ -754,7 +754,7 @@
#: PcAssignCashToTab.php:394 PcAuthorizeExpenses.php:97
#: PcClaimExpensesFromTab.php:238 PcClaimExpensesFromTab.php:405
#: PcReportTab.php:333 PDFQuotation.php:252 PDFQuotationPortrait.php:249
-#: SelectCustomer.php:741 ShopParameters.php:198 SystemParameters.php:411
+#: SelectCustomer.php:732 ShopParameters.php:198 SystemParameters.php:411
#: WOSerialNos.php:306 WOSerialNos.php:312
msgid "Notes"
msgstr ""
@@ -781,22 +781,22 @@
msgstr ""
#: AddCustomerContacts.php:229 Factors.php:234 SupplierContacts.php:239
-#: ../webSHOP/Checkout.php:379 ../webSHOP/Register.php:610
+#: ../webSHOP/Checkout.php:527 ../webSHOP/Register.php:623
msgid "Contact Name"
msgstr ""
#: AddCustomerContacts.php:247 Contracts.php:788 PDFRemittanceAdvice.php:247
#: PO_Header.php:1026 PO_Header.php:1111 SelectCreditItems.php:246
-#: SelectCustomer.php:418 SelectOrderItems.php:597
+#: SelectCustomer.php:407 SelectOrderItems.php:597
#: SupplierTenderCreate.php:395 includes/PDFStatementPageHeader.inc:63
#: includes/PDFTransPageHeader.inc:84
-#: includes/PDFTransPageHeaderPortrait.inc:110 ../webSHOP/Checkout.php:389
-#: ../webSHOP/Register.php:255 ../webSHOP/Register.php:723
+#: includes/PDFTransPageHeaderPortrait.inc:110 ../webSHOP/Checkout.php:537
+#: ../webSHOP/Register.php:260 ../webSHOP/Register.php:737
msgid "Phone"
msgstr ""
-#: AddCustomerNotes.php:6 AddCustomerNotes.php:51 SelectCustomer.php:815
-#: SelectCustomer.php:848
+#: AddCustomerNotes.php:6 AddCustomerNotes.php:51 SelectCustomer.php:806
+#: SelectCustomer.php:839
msgid "Customer Notes"
msgstr ""
@@ -840,7 +840,7 @@
#: PDFRemittanceAdvice.php:308 PDFWOPrint.php:450 PrintCustTrans.php:822
#: PrintCustTransPortrait.php:907 PrintWOItemSlip.php:186
#: PrintWOItemSlip.php:197 PrintWOItemSlip.php:208 ReverseGRN.php:401
-#: SelectCustomer.php:818 SelectCustomer.php:860 ShipmentCosting.php:538
+#: SelectCustomer.php:809 SelectCustomer.php:851 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
@@ -851,16 +851,15 @@
#: includes/PDFQuotationPortraitPageHeader.inc:80
#: includes/PDFStatementPageHeader.inc:169 includes/PDFTransPageHeader.inc:51
#: includes/PDFTransPageHeaderPortrait.inc:63
-#: reportwriter/languages/en_US/reports.php:64
msgid "Date"
msgstr ""
#: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:180
-#: SelectCustomer.php:819 SelectCustomer.php:861 StockClone.php:942
-#: Stocks.php:1270 UpgradeDatabase.php:244 UpgradeDatabase.php:247
-#: UpgradeDatabase.php:250 UpgradeDatabase.php:253 UpgradeDatabase.php:256
-#: UpgradeDatabase.php:259 UpgradeDatabase.php:262 UpgradeDatabase.php:265
-#: UpgradeDatabase.php:268 Z_Upgrade_3.10-3.11.php:62
+#: SelectCustomer.php:810 SelectCustomer.php:852 StockClone.php:942
+#: Stocks.php:1270 UpgradeDatabase.php:246 UpgradeDatabase.php:249
+#: UpgradeDatabase.php:252 UpgradeDatabase.php:255 UpgradeDatabase.php:258
+#: UpgradeDatabase.php:261 UpgradeDatabase.php:264 UpgradeDatabase.php:267
+#: UpgradeDatabase.php:270 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
@@ -875,7 +874,7 @@
#: AddCustomerNotes.php:120 AddCustomerNotes.php:231
#: AddCustomerTypeNotes.php:114 AddCustomerTypeNotes.php:215
-#: SelectCustomer.php:821 SelectCustomer.php:863
+#: SelectCustomer.php:812 SelectCustomer.php:854
msgid "Priority"
msgstr ""
@@ -896,7 +895,7 @@
msgid "Contact Note"
msgstr ""
-#: AddCustomerTypeNotes.php:5 SelectCustomer.php:857
+#: AddCustomerTypeNotes.php:5 SelectCustomer.php:848
msgid "Customer Type (Group) Notes"
msgstr ""
@@ -912,7 +911,7 @@
msgid "The contacts notes may not be empty"
msgstr ""
-#: AddCustomerTypeNotes.php:48 SelectCustomer.php:889
+#: AddCustomerTypeNotes.php:48 SelectCustomer.php:880
msgid "Customer Group Notes"
msgstr ""
@@ -962,7 +961,6 @@
#: StockReorderLevel.php:20 StockSerialItemResearch.php:9
#: StockSerialItems.php:9 StockStatus.php:45 StockTransferControlled.php:14
#: SuppLoginSetup.php:24 WWW_Users.php:15 includes/MainMenuLinksArray.php:26
-#: reportwriter/languages/en_US/reports.php:243
msgid "Inventory"
msgstr ""
@@ -972,22 +970,22 @@
#: AgedControlledInventory.php:42 MRPReschedules.php:126 MRPShortages.php:261
#: StockClone.php:53 Stocks.php:63
-#: reportwriter/languages/en_US/reports.php:103
msgid "Stock"
msgstr ""
#: AgedControlledInventory.php:43 AutomaticTranslationDescriptions.php:37
#: BOMIndented.php:315 BOMIndentedReverse.php:293 BOMInquiry.php:109
-#: BOMInquiry.php:198 BOMs.php:646 BOMs.php:1005
-#: CollectiveWorkOrderCost.php:45 CollectiveWorkOrderCost.php:317
-#: ContractBOM.php:242 ContractBOM.php:354 ContractOtherReqts.php:98
-#: CounterReturns.php:1692 CounterSales.php:2102 CounterSales.php:2256
-#: CreditStatus.php:152 CreditStatus.php:243 CustomerPurchases.php:81
-#: EmailConfirmation.php:219 EmailConfirmation.php:349
-#: FixedAssetCategories.php:167 FixedAssetDepreciation.php:91
-#: FixedAssetRegister.php:87 FixedAssetRegister.php:388
-#: FixedAssetTransfer.php:60 FixedAssetTransfer.php:162 GLTags.php:63
-#: GLTags.php:82 GLTransInquiry.php:49 GoodsReceived.php:122
+#: BOMInquiry.php:198 BOMs.php:646 BOMs.php:1005 BOMs_SingleLevel.php:558
+#: BOMs_SingleLevel.php:905 CollectiveWorkOrderCost.php:45
+#: CollectiveWorkOrderCost.php:317 ContractBOM.php:242 ContractBOM.php:354
+#: ContractOtherReqts.php:98 CounterReturns.php:1692 CounterSales.php:2102
+#: CounterSales.php:2256 CreditStatus.php:152 CreditStatus.php:243
+#: CustomerPurchases.php:81 EmailConfirmation.php:219
+#: EmailConfirmation.php:349 FixedAssetCategories.php:167
+#: FixedAssetDepreciation.php:91 FixedAssetRegister.php:87
+#: FixedAssetRegister.php:388 FixedAssetTransfer.php:60
+#: FixedAssetTransfer.php:162 GLTags.php:63 GLTags.php:82
+#: GLTransInquiry.php:49 GoodsReceived.php:122
#: InternalStockCategoriesByRole.php:168 InternalStockRequest.php:345
#: InternalStockRequest.php:559 InternalStockRequest.php:629
#: InventoryPlanning.php:419 InventoryQuantities.php:246
@@ -1021,15 +1019,14 @@
#: TestPlanResults.php:177 TestPlanResults.php:280 TopItems.php:170
#: WorkCentres.php:130 WorkOrderCosting.php:98 WorkOrderCosting.php:130
#: WorkOrderEntry.php:735 WorkOrderIssue.php:785 Z_ItemsWithoutPicture.php:35
-#: api/api_xml-rpc.php:3489 includes/PDFGrnHeader.inc:30
-#: includes/PDFInventoryPlanPageHeader.inc:51
+#: includes/DefineLabelClass.php:12 includes/DefineLabelClass.php:45
+#: includes/PDFGrnHeader.inc:30 includes/PDFInventoryPlanPageHeader.inc:51
#: includes/PDFOstdgGRNsPageHeader.inc:38
#: includes/PDFStockLocTransferHeader.inc:65
#: includes/PDFStockTransferHeader.inc:36 includes/PDFTopItemsHeader.inc:50
#: includes/PDFTransPageHeader.inc:211
-#: includes/PDFTransPageHeaderPortrait.inc:267
-#: includes/DefineLabelClass.php:12 includes/DefineLabelClass.php:45
-#: ../webSHOP/includes/PlaceOrder.php:236
+#: includes/PDFTransPageHeaderPortrait.inc:267 api/api_xml-rpc.php:3489
+#: ../webSHOP/includes/PlaceOrder.php:250
msgid "Description"
msgstr ""
@@ -1073,14 +1070,12 @@
#: SupplierAllocations.php:457 SupplierAllocations.php:569
#: SupplierAllocations.php:644 SupplierCredit.php:407 SupplierInquiry.php:215
#: SuppShiptChgs.php:97 SuppTransGLAnalysis.php:140 Tax.php:250
-#: Z_CheckDebtorsControl.php:149 api/api_debtortransactions.php:1271
+#: Z_CheckDebtorsControl.php:149 includes/PDFQuotationPageHeader.inc:109
+#: includes/PDFQuotationPortraitPageHeader.inc:100
+#: includes/PO_PDFOrderPageHeader.inc:81 api/api_debtortransactions.php:1271
#: api/api_debtortransactions.php:1284 api/api_debtortransactions.php:1581
-#: includes/PDFQuotationPageHeader.inc:109
-#: includes/PDFQuotationPortraitPageHeader.inc:100
-#: includes/PO_PDFOrderPageHeader.inc:81
-#: reportwriter/languages/en_US/reports.php:107
-#: ../webSHOP/includes/DisplayShoppingCart.php:7
-#: ../webSHOP/includes/PlaceOrder.php:285
+#: ../webSHOP/includes/DisplayShoppingCart.php:8
+#: ../webSHOP/includes/PlaceOrder.php:299
#, php-format
msgid "Total"
msgstr ""
@@ -1180,15 +1175,15 @@
#: Tax.php:310 Z_DataExport.php:72 Z_DataExport.php:168 Z_DataExport.php:259
#: Z_DataExport.php:308 Z_DataExport.php:347 Z_DataExport.php:383
#: Z_DataExport.php:419 Z_DataExport.php:471 Z_poRebuildDefault.php:41
-#: includes/ConstructSQLForUserDefinedSalesReport.inc:180
-#: includes/ConstructSQLForUserDefinedSalesReport.inc:188
-#: includes/ConstructSQLForUserDefinedSalesReport.inc:343
#: includes/PDFPaymentRun_PymtFooter.php:59
#: includes/PDFPaymentRun_PymtFooter.php:89
#: includes/PDFPaymentRun_PymtFooter.php:119
#: includes/PDFPaymentRun_PymtFooter.php:156
#: includes/PDFPaymentRun_PymtFooter.php:187
#: includes/PDFPaymentRun_PymtFooter.php:218
+#: includes/ConstructSQLForUserDefinedSalesReport.inc:180
+#: includes/ConstructSQLForUserDefinedSalesReport.inc:188
+#: includes/ConstructSQLForUserDefinedSalesReport.inc:343
msgid "Back to the menu"
msgstr ""
@@ -1235,14 +1230,14 @@
#: Z_ChangeSupplierCode.php:88 Z_DeleteCreditNote.php:63
#: Z_DeleteCreditNote.php:73 Z_DeleteCreditNote.php:82 Z_DeleteInvoice.php:88
#: Z_DeleteInvoice.php:98 Z_DeleteInvoice.php:110 Z_UpdateItemCosts.php:93
-#: includes/ConnectDB_mysqli.inc:74 includes/ConnectDB_mysql.inc:66
#: includes/PDFPaymentRun_PymtFooter.php:61
#: includes/PDFPaymentRun_PymtFooter.php:91
#: includes/PDFPaymentRun_PymtFooter.php:121
#: includes/PDFPaymentRun_PymtFooter.php:158
-#: includes/PDFPaymentRun_PymtFooter.php:189
+#: includes/PDFPaymentRun_PymtFooter.php:189 includes/ConnectDB_mysqli.inc:74
+#: includes/ConnectDB_mysql.inc:66
#: ../webSHOP/includes/DatabaseFunctions.php:60
-#: ../webSH...
[truncated message content] |
|
From: <dai...@us...> - 2016-05-20 05:19:44
|
Revision: 7534
http://sourceforge.net/p/web-erp/reponame/7534
Author: daintree
Date: 2016-05-20 05:19:41 +0000 (Fri, 20 May 2016)
Log Message:
-----------
Paul Harness: sorting customerallocations.php
Modified Paths:
--------------
trunk/CustomerAllocations.php
trunk/doc/Change.log
trunk/includes/Z_POSDataCreation.php
Modified: trunk/CustomerAllocations.php
===================================================================
--- trunk/CustomerAllocations.php 2016-05-19 14:55:28 UTC (rev 7533)
+++ trunk/CustomerAllocations.php 2016-05-20 05:19:41 UTC (rev 7534)
@@ -273,7 +273,7 @@
$SQL .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
}
- $SQL .= " ORDER BY debtortrans.trandate";
+ $SQL .= " ORDER BY debtortrans.trandate, debtortrans.transno";
$Result = DB_query($SQL);
@@ -314,7 +314,7 @@
$SQL .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
}
- $SQL .= " ORDER BY debtortrans.trandate";
+ $SQL .= " ORDER BY debtortrans.trandate, debtortrans.transno";
$Result=DB_query($SQL);
@@ -484,7 +484,7 @@
$SQL .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
}
- $SQL .= " ORDER BY debtortrans.id";
+ $SQL .= " ORDER BY debtortrans.trandate, debtortrans.transno";
$result = DB_query($SQL);
@@ -548,7 +548,7 @@
$SQL .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
}
- $SQL .= " ORDER BY debtorsmaster.name";
+ $SQL .= " ORDER BY debtortrans.trandate, debtortrans.transno";
$result = DB_query($SQL);
$NoOfUnallocatedTrans = DB_num_rows($result);
@@ -598,15 +598,15 @@
}
echo '<td>' . _($myrow['typename']) . '</td>
- <td>' . $myrow['name'] . '</td>
- <td>' . $myrow['debtorno'] . '</td>
- <td>' . $myrow['transno'] . '</td>
- <td>' . ConvertSQLDate($myrow['trandate']) . '</td>
- <td class="number">' . locale_number_format($myrow['total'],$CurrDecimalPlaces) . '</td>
- <td class="number">' . locale_number_format($myrow['total']-$myrow['alloc'],$CurrDecimalPlaces) . '</td>
- <td>' . $CurrCode . '</td>
- <td>' . $AllocateLink . '</td>
- </tr>';
+ <td>' . $myrow['name'] . '</td>
+ <td>' . $myrow['debtorno'] . '</td>
+ <td>' . $myrow['transno'] . '</td>
+ <td>' . ConvertSQLDate($myrow['trandate']) . '</td>
+ <td class="number">' . locale_number_format($myrow['total'],$CurrDecimalPlaces) . '</td>
+ <td class="number">' . locale_number_format($myrow['total']-$myrow['alloc'],$CurrDecimalPlaces) . '</td>
+ <td>' . $CurrCode . '</td>
+ <td>' . $AllocateLink . '</td>
+ </tr>';
} //end loop around unallocated receipts and credit notes
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-05-19 14:55:28 UTC (rev 7533)
+++ trunk/doc/Change.log 2016-05-20 05:19:41 UTC (rev 7534)
@@ -1,7 +1,8 @@
webERP Change Log
-16/5/16 Release 4.13
+22/5/16 Release 4.13
+20/5/16 Paul Harness: CustomerAllocations.php consistent sort order adding by date and transno sorting for transactions on the same date
15/05/16 RChacon: In SelectCustomer.php, use a default map host if $map_host is empty.
15/05/16 RChacon: In AccountGroups.php, hide no printing elements.
15/05/16 Exson: Add sequence digitals to make BOM sequences can be adjusted flexible and avoid any uncertainty of the number stored in SQL. Thanks Tim's suggestion.
Modified: trunk/includes/Z_POSDataCreation.php
===================================================================
--- trunk/includes/Z_POSDataCreation.php 2016-05-19 14:55:28 UTC (rev 7533)
+++ trunk/includes/Z_POSDataCreation.php 2016-05-20 05:19:41 UTC (rev 7534)
@@ -122,7 +122,7 @@
fwrite($FileHandle,"DELETE FROM stockmaster;\n");
- $result = DB_query("SELECT stockid, categoryid, description, longdescription, units, barcode, taxcatid, decimalplaces, discountcategory FROM stockmaster WHERE (mbflag='B' OR mbflag='M' OR mbflag='D') AND discontinued=0 AND controlled=0");
+ $result = DB_query("SELECT stockid, categoryid, description, longdescription, units, barcode, taxcatid, decimalplaces, discountcategory FROM stockmaster WHERE (mbflag='B' OR mbflag='M' OR mbflag='D' OR mbflag='A') AND discontinued=0 AND controlled=0");
while ($myrow = DB_fetch_array($result)) {
|
|
From: <rc...@us...> - 2016-05-20 13:43:18
|
Revision: 7535
http://sourceforge.net/p/web-erp/reponame/7535
Author: rchacon
Date: 2016-05-20 13:43:16 +0000 (Fri, 20 May 2016)
Log Message:
-----------
Add a return link.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/Login.php
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-05-20 05:19:41 UTC (rev 7534)
+++ trunk/doc/Change.log 2016-05-20 13:43:16 UTC (rev 7535)
@@ -2,6 +2,7 @@
22/5/16 Release 4.13
+20/5/16 RChacon: In Login.php, add a return link.
20/5/16 Paul Harness: CustomerAllocations.php consistent sort order adding by date and transno sorting for transactions on the same date
15/05/16 RChacon: In SelectCustomer.php, use a default map host if $map_host is empty.
15/05/16 RChacon: In AccountGroups.php, hide no printing elements.
Modified: trunk/includes/Login.php
===================================================================
--- trunk/includes/Login.php 2016-05-20 05:19:41 UTC (rev 7534)
+++ trunk/includes/Login.php 2016-05-20 13:43:16 UTC (rev 7535)
@@ -4,7 +4,8 @@
//include ('LanguageSetup.php');
if ((isset($AllowDemoMode)) AND ($AllowDemoMode == True) AND (!isset($demo_text))) {
- $demo_text = _('Login as user') .': <i>' . _('admin') . '</i><br />' ._('with password') . ': <i>' . _('weberp') . '</i>';
+ $demo_text = _('Login as user') .': <i>' . _('admin') . '</i><br />' ._('with password') . ': <i>' . _('weberp') . '</i>' .
+ '<br /><a href="../">' . _('Return') . '</a>';// This line is to add a return link.
} elseif (!isset($demo_text)) {
$demo_text = '';
}
@@ -90,8 +91,8 @@
echo '</select>';
}
} //end provision for backward compat
+?>
-?>
</span>
<br />
<span><?php echo _('User name'); ?>:</span><br />
@@ -104,8 +105,8 @@
if (isset($demo_text)){
echo $demo_text;
}
+?>
-?>
</div>
<input class="button" type="submit" value="<?php echo _('Login'); ?>" name="SubmitUser" />
</div>
|
|
From: <rc...@us...> - 2016-05-20 15:45:40
|
Revision: 7537
http://sourceforge.net/p/web-erp/reponame/7537
Author: rchacon
Date: 2016-05-20 15:45:38 +0000 (Fri, 20 May 2016)
Log Message:
-----------
Insert missing script as an utility.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/doc/Manual/ManualSpecialUtilities.html
trunk/includes/MainMenuLinksArray.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/upgrade4.12.3-4.13.sql
Added Paths:
-----------
trunk/Z_GLAccountUsersCopyAuthority.php
Removed Paths:
-------------
trunk/GLAccountUsersCopyAuthority.php
Deleted: trunk/GLAccountUsersCopyAuthority.php
===================================================================
--- trunk/GLAccountUsersCopyAuthority.php 2016-05-20 14:12:25 UTC (rev 7536)
+++ trunk/GLAccountUsersCopyAuthority.php 2016-05-20 15:45:38 UTC (rev 7537)
@@ -1,88 +0,0 @@
-<?php
-
-include ('includes/session.inc');
-$Title = _('GLAccount - Users Authority Copy Authority');// Screen identificator.
-include('includes/header.inc');
-echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/maintenance.png" title="',// Icon image.
- _('Copy Authority of GL Accounts from one user to another'), '" /> ',// Icon title.
- _('Copy Authority of GL Accounts from one user to another'), '</p>';// Page title.
-
-include('includes/SQL_CommonFunctions.inc');
-
-if(isset($_POST['ProcessCopyAuthority'])) {
-
- $InputError =0;
-
- if($_POST['FromUserID']==$_POST['ToUserID']) {
- prnMsg(_('User FROM must be different from user TO'),'error');
- $InputError =1;
- }
-
- if($InputError ==0) {// no input errors
- $result = DB_Txn_Begin();
-
- echo '<br />' . _('Deleting the current authority to view / update the GL Accounts of user') . ' ' . $_POST['ToUserID'];
- $sql = "DELETE FROM glaccountusers WHERE userid = '" . $_POST['ToUserID'] . "'";
- $DbgMsg = _('The SQL statement that failed was');
- $ErrMsg =_('The SQL to delete the auhority in glaccountusers record failed');
- $result = DB_query($sql,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
-
- echo '<br />' . _('Copying the authority to view / update the GL Accounts from user') . ' ' . $_POST['FromUserID'] . ' ' . _('to') . ' ' . $_POST['ToUserID'];
- $sql = "INSERT INTO glaccountusers (userid, accountcode, canview, canupd)
- SELECT '" . $_POST['ToUserID'] . "', accountcode, canview, canupd
- FROM glaccountusers
- WHERE userid = '" . $_POST['FromUserID'] . "'";
-
- $DbgMsg = _('The SQL statement that failed was');
- $ErrMsg =_('The SQL to insert the auhority in glaccountusers record failed');
- $result = DB_query($sql,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
- echo '<br />';
- $result = DB_Txn_Commit();
-
- }//only do the stuff above if $InputError==0
-}
-
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
-echo '<div class="centre">';
-echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-
-echo '<table>';
-echo ' <tr>
- <td>' . _('Select User to copy the Authority FROM') . ':</td>
- <td><select name="FromUserID">';
-$Result = DB_query("SELECT userid,
- realname
- FROM www_users
- ORDER BY userid");
-
-echo '<option selected value="">' . _('Not Yet Selected') . '</option>';
-while ($MyRow = DB_fetch_array($Result)) {
- echo '<option value="';
- echo $MyRow['userid'] . '">' . $MyRow['userid'] . ' - ' . $MyRow['realname'] . '</option>';
-} //end while loop
-echo '</select></td></tr>';
-
-echo ' <tr>
- <td>' . _('Select User to copy the Authority TO') . ':</td>
- <td><select name="ToUserID">';
-$Result = DB_query("SELECT userid,
- realname
- FROM www_users
- ORDER BY userid");
-
-echo '<option selected value="">' . _('Not Yet Selected') . '</option>';
-while ($MyRow = DB_fetch_array($Result)) {
- echo '<option value="';
- echo $MyRow['userid'] . '">' . $MyRow['userid'] . ' - ' . $MyRow['realname'] . '</option>';
-} //end while loop
-echo '</select></td></tr>';
-echo '</table>';
-echo '<input type="submit" name="ProcessCopyAuthority" value="' . _('Process Copy of Authority') . '" />
- </div>
- </form>';
-
-include('includes/footer.inc');
-?>
\ No newline at end of file
Added: trunk/Z_GLAccountUsersCopyAuthority.php
===================================================================
--- trunk/Z_GLAccountUsersCopyAuthority.php (rev 0)
+++ trunk/Z_GLAccountUsersCopyAuthority.php 2016-05-20 15:45:38 UTC (rev 7537)
@@ -0,0 +1,101 @@
+<?php
+/* $Id: Z_GLAccountUsersCopyAuthority.php 7392 2015-11-16 07:30:11Z tehonu $*/
+/* Utility to copy authority of GL accounts from one user to another */
+
+include('includes/session.inc');
+$Title = _('GLAccount - Users Authority Copy Authority');
+$ViewTopic = 'SpecialUtilities';
+$BookMark = 'Z_GLAccountUsersCopyAuthority';
+include('includes/header.inc');
+
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/maintenance.png" title="',// Icon image.
+ _('Copy Authority of GL Accounts from one user to another'), '" /> ',// Icon title.
+ _('Copy Authority of GL Accounts from one user to another'), '</p>';// Page title.
+
+include('includes/SQL_CommonFunctions.inc');
+
+if(isset($_POST['ProcessCopyAuthority'])) {
+
+ $InputError =0;
+
+ if($_POST['FromUserID']==$_POST['ToUserID']) {
+ prnMsg(_('User FROM must be different from user TO'),'error');
+ $InputError =1;
+ }
+
+ if($InputError ==0) {// no input errors
+ $result = DB_Txn_Begin();
+
+ echo '<br />' . _('Deleting the current authority to view / update the GL Accounts of user') . ' ' . $_POST['ToUserID'];
+ $sql = "DELETE FROM glaccountusers WHERE userid = '" . $_POST['ToUserID'] . "'";
+ $DbgMsg = _('The SQL statement that failed was');
+ $ErrMsg =_('The SQL to delete the auhority in glaccountusers record failed');
+ $result = DB_query($sql,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Copying the authority to view / update the GL Accounts from user') . ' ' . $_POST['FromUserID'] . ' ' . _('to') . ' ' . $_POST['ToUserID'];
+ $sql = "INSERT INTO glaccountusers (userid, accountcode, canview, canupd)
+ SELECT '" . $_POST['ToUserID'] . "', accountcode, canview, canupd
+ FROM glaccountusers
+ WHERE userid = '" . $_POST['FromUserID'] . "'";
+
+ $DbgMsg = _('The SQL statement that failed was');
+ $ErrMsg =_('The SQL to insert the auhority in glaccountusers record failed');
+ $result = DB_query($sql,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+ echo '<br />';
+ $result = DB_Txn_Commit();
+
+ }//only do the stuff above if $InputError==0
+}
+
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<div class="centre noprint">';
+echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
+echo '<table>';
+echo ' <tr>
+ <td>' . _('Select User to copy the Authority FROM') . ':</td>
+ <td><select name="FromUserID">';
+$Result = DB_query("SELECT userid,
+ realname
+ FROM www_users
+ ORDER BY userid");
+
+echo '<option selected value="">' . _('Not Yet Selected') . '</option>';
+while ($MyRow = DB_fetch_array($Result)) {
+ echo '<option value="';
+ echo $MyRow['userid'] . '">' . $MyRow['userid'] . ' - ' . $MyRow['realname'] . '</option>';
+} //end while loop
+echo '</select></td></tr>';
+
+echo ' <tr>
+ <td>' . _('Select User to copy the Authority TO') . ':</td>
+ <td><select name="ToUserID">';
+$Result = DB_query("SELECT userid,
+ realname
+ FROM www_users
+ ORDER BY userid");
+
+echo '<option selected value="">' . _('Not Yet Selected') . '</option>';
+while ($MyRow = DB_fetch_array($Result)) {
+ echo '<option value="';
+ echo $MyRow['userid'] . '">' . $MyRow['userid'] . ' - ' . $MyRow['realname'] . '</option>';
+} //end while loop
+echo '</select></td></tr>';
+echo '</table>';
+/*echo '<input type="submit" name="ProcessCopyAuthority" value="' . _('Process Copy of Authority') . '" />
+ </div>
+ </form>';*/
+
+// Form buttons:
+echo '<button name="ProcessCopyAuthority" type="submit" value="', _('Process Copy of Authority'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/user.png" /> ', _('Process'), '</button>', // "Process Copy of Authority" button.
+ '<button formaction="index.php?Application=Utilities" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/previous.png" /> ', _('Return'), '</button>', // "Return" button.
+ '</div>
+ </form>';
+
+include('includes/footer.inc');
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-05-20 14:12:25 UTC (rev 7536)
+++ trunk/doc/Change.log 2016-05-20 15:45:38 UTC (rev 7537)
@@ -2,6 +2,7 @@
22/5/16 Release 4.13
+20/5/16 RChacon: Insert missing script as an utility.
20/5/16 RChacon: In Login.php, add a return link.
20/5/16 Paul Harness: CustomerAllocations.php consistent sort order adding by date and transno sorting for transactions on the same date
15/05/16 RChacon: In SelectCustomer.php, use a default map host if $map_host is empty.
Modified: trunk/doc/Manual/ManualSpecialUtilities.html
===================================================================
--- trunk/doc/Manual/ManualSpecialUtilities.html 2016-05-20 14:12:25 UTC (rev 7536)
+++ trunk/doc/Manual/ManualSpecialUtilities.html 2016-05-20 15:45:38 UTC (rev 7537)
@@ -66,6 +66,13 @@
<p>However, occasionally incorrect cost data that has made a monkey of the sales analysis and general ledger can only be rectified by running this utility.</p>
+<h2><a id="Z_GLAccountUsersCopyAuthority">Copy Authority of GL Accounts from one user to another</a></h2>
+
+<p>This utility allows you to copy access rights to general ledger accounts from one user to another.</p>
+
+<!-- "Inquiries and Reports" -->
+
+
<h2><a id="Z_CurrencyDebtorsBalances.php">Debtors Balances By Currency Totals</a></h2>
<p>This script is an utility to show debtors balances in total by currency.</p>
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2016-05-20 14:12:25 UTC (rev 7536)
+++ trunk/includes/MainMenuLinksArray.php 2016-05-20 15:45:38 UTC (rev 7537)
@@ -402,7 +402,6 @@
_('GL Tags'),
_('GL Accounts Authorised Users Maintenance'),
_('User Authorised GL Accounts Maintenance'),
- _('Copy Authority GL Accounts from user A to B'),
_('Bank Accounts'),
_('Bank Account Authorized Users'),
_('User Authorized Bank Accounts'));
@@ -414,7 +413,6 @@
'/GLTags.php',
'/GLAccountUsers.php',
'/UserGLAccounts.php',
- '/GLAccountUsersCopyAuthority.php',
'/BankAccounts.php',
'/BankAccountUsers.php',
'/UserBankAccounts.php');
@@ -575,7 +573,8 @@
_('Re-apply costs to Sales Analysis'),
_('Delete sales transactions'),
_('Reverse all supplier payments on a specified date'),
- _('Update sales analysis with latest customer data'));
+ _('Update sales analysis with latest customer data'),
+ _('Copy Authority of GL Accounts from one user to another'));
$MenuItems['Utilities']['Transactions']['URL'] = array( '/Z_ChangeCustomerCode.php',
'/Z_ChangeBranchCode.php',
@@ -589,7 +588,8 @@
'/Z_ReApplyCostToSA.php',
'/Z_DeleteSalesTransActions.php',
'/Z_ReverseSuppPaymentRun.php',
- '/Z_UpdateSalesAnalysisWithLatestCustomerData.php');
+ '/Z_UpdateSalesAnalysisWithLatestCustomerData.php',
+ '/Z_GLAccountUsersCopyAuthority.php');
$MenuItems['Utilities']['Reports']['Caption'] = array( _('Debtors Balances By Currency Totals'),
_('Suppliers Balances By Currency Totals'),
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 2016-05-20 14:12:25 UTC (rev 7536)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-05-20 15:45:38 UTC (rev 7537)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-05-16 21:31+1200\n"
-"PO-Revision-Date: 2016-05-20 08:06-0600\n"
+"PO-Revision-Date: 2016-05-20 09:09-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -14930,7 +14930,7 @@
#: GLAccountUsersCopyAuthority.php:83
msgid "Process Copy of Authority"
-msgstr ""
+msgstr "Procesar copia de derechos de acceso"
#: GLAccountUsers.php:6 GLAccountUsers.php:43 GLAccountUsers.php:44
#: GLAccountUsers.php:85
Modified: trunk/sql/mysql/upgrade4.12.3-4.13.sql
===================================================================
--- trunk/sql/mysql/upgrade4.12.3-4.13.sql 2016-05-20 14:12:25 UTC (rev 7536)
+++ trunk/sql/mysql/upgrade4.12.3-4.13.sql 2016-05-20 15:45:38 UTC (rev 7537)
@@ -16,6 +16,8 @@
('SupplierGRNAndInvoiceInquiry.php',5,'Supplier\'s delivery note and grn relationship inquiry'),
('UserBankAccounts.php', '15', 'Maintains table bankaccountusers (Authorized users to work with a bank account in webERP)'),
('UserGLAccounts.php', '15', 'Maintenance of GL Accounts allowed for a user');
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES
+ ('Z_GLAccountUsersCopyAuthority.php', '15', 'Utility to copy authority of GL accounts from one user to another');
CREATE TABLE IF NOT EXISTS `suppinvstogrn` (
`suppinv` int(11) NOT NULL,
|
|
From: <rc...@us...> - 2016-05-21 16:15:12
|
Revision: 7539
http://sourceforge.net/p/web-erp/reponame/7539
Author: rchacon
Date: 2016-05-21 16:15:10 +0000 (Sat, 21 May 2016)
Log Message:
-----------
Standardise link names and add help to manual.
Modified Paths:
--------------
trunk/BankAccountUsers.php
trunk/UserBankAccounts.php
trunk/doc/Manual/ManualGeneralLedger.html
trunk/doc/Manual/ManualSpecialUtilities.html
trunk/includes/MainMenuLinksArray.php
Modified: trunk/BankAccountUsers.php
===================================================================
--- trunk/BankAccountUsers.php 2016-05-21 02:00:42 UTC (rev 7538)
+++ trunk/BankAccountUsers.php 2016-05-21 16:15:10 UTC (rev 7539)
@@ -1,13 +1,13 @@
<?php
/* $Id: BankAccountUsers.php 6946 2014-10-27 07:30:11Z daintree $*/
-/* This script maintains table bankaccountusers (Authorized users to work with a bank account in webERP). */
+/* This script maintains table bankaccountusers (Authorized users to work with a bank account in webERP) */
include('includes/session.inc');
-$Title = _('Bank Account Users');;// Screen identificator.
-$ViewTopic = 'GeneralLedger';// Filename's id in ManualContents.php's TOC.
-/* To do this section in the manual.
-$BookMark = 'BankAccountUsers';// Anchor's id in the manual's html document.*/
+$Title = _('Bank Account Users');
+$ViewTopic = 'GeneralLedger';
+$BookMark = 'BankAccountUsers';
include('includes/header.inc');
+
echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
'/images/bank.png" title="' .
_('Bank Account Authorised Users') . '" /> ' .// Icon title.
Modified: trunk/UserBankAccounts.php
===================================================================
--- trunk/UserBankAccounts.php 2016-05-21 02:00:42 UTC (rev 7538)
+++ trunk/UserBankAccounts.php 2016-05-21 16:15:10 UTC (rev 7539)
@@ -1,6 +1,6 @@
<?php
-/* $Id: UserBankAccounts.php 7398 2015-11-24 19:59:10Z tehonu $*/
-/* Maintains table bankaccountusers (Authorized users to work with a bank account in webERP). */
+/* $Id: UserBankAccounts.php 7398 2015-11-24 19:59:10Z tehonu $*/
+/* Maintains table bankaccountusers (Authorized users to work with a bank account in webERP) */
include('includes/session.inc');
$Title = _('Bank Account Users');
@@ -8,7 +8,10 @@
$BookMark = 'UserBankAccounts';
include('includes/header.inc');
-echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/money_add.png" title="' . _('User Authorised Bank Accounts') . '" alt="" />' . ' ' . $Title . '</p>';
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/money_add.png" title="',// Icon image.
+ _('User Authorised Bank Accounts'), '" /> ',// Icon title.
+ _('Bank Account Users'), '</p>';// Page title.
if (isset($_POST['SelectedBankAccount'])) {
$SelectedBankAccount = mb_strtoupper($_POST['SelectedBankAccount']);
Modified: trunk/doc/Manual/ManualGeneralLedger.html
===================================================================
--- trunk/doc/Manual/ManualGeneralLedger.html 2016-05-21 02:00:42 UTC (rev 7538)
+++ trunk/doc/Manual/ManualGeneralLedger.html 2016-05-21 16:15:10 UTC (rev 7539)
@@ -406,13 +406,15 @@
<div class="floatright"><a class="minitext" href="#top">⬆ Top</a></div>
<h2>Maintenance</h2>
-<h3><a id="GLAccountUsers">GL Accounts Authorised Users</a></h3>
+<h3><a id="GLAccountUsers">GL Account Authorised Users</a></h3>
<p>This software has methods to assign permissions or access rights to specific users and groups of users. The system controls the ability of the users to view or make changes to the contents of the GL accounts.</p>
<p>With this script, you can change a specific GL account access permissions for users:</p>
<ul>
<li>You can add or remove the read permission for each user that grants or denies his ability to view that GL account.</li>
<li>You can add or remove the write permission for each user that grants or denies the ability to update that GL account.</li>
</ul>
+<p>If you need to copy the access rights to general ledger accounts from one user to another, you can use an utility. See: <a href="ManualContents.php?
+ViewTopic=SpecialUtilities#Z_GLAccountUsersCopyAuthority">Copy Authority of GL Accounts from one user to another</a>.</p>
<h3><a id="UserGLAccounts">User Authorised GL Accounts</a></h3>
<p>This software has methods to assign permissions or access rights to specific users and groups of users. The system controls the ability of the users to view or make changes to the contents of the GL accounts.</p>
@@ -421,12 +423,16 @@
<li>You can add or remove the read permission for each GL account that grants or denies the ability of that user to view it.</li>
<li>You can add or remove the write permission for each GL account that grants or denies the ability of that user to update it.</li>
</ul>
+<p>If you need to copy the access rights to general ledger accounts from one user to another, you can use an utility. See: <a href="ManualContents.php?
+ViewTopic=SpecialUtilities#Z_GLAccountUsersCopyAuthority">Copy Authority of GL Accounts from one user to another</a>.</p>
<!--h3><a id="BankAccounts.php">Bank Accounts</a></h3>
<p>.</p-->
-<!--h3><a id="BankAccountUsers.php">Bank Account Authorized Users</a></h3>
-<p>.</p-->
+<h3><a id="BankAccountUsers">Bank Account Authorized Users</a></h3>
+<p>This software has methods to assign permissions or access rights to specific users and groups of users. The system controls the ability of the users to view and make changes to the contents of the bank accounts.</p>
+<p>With this script, you can add or remove the access permission for each user that grants or denies his ability to view or update that bank account.</p>
-<!--h3><a id="UserBankAccounts.php">User Authorized Bank Accounts</a></h3>
-<p>.</p-->
+<h3><a id="UserBankAccounts">User Authorized Bank Accounts</a></h3>
+<p>This software has methods to assign permissions or access rights to specific users and groups of users. The system controls the ability of the users to view and make changes to the contents of the bank accounts.</p>
+<p>With this script, you can add or remove the access permission for each bank account that grants or denies the ability of that user to view or update it.</p>
Modified: trunk/doc/Manual/ManualSpecialUtilities.html
===================================================================
--- trunk/doc/Manual/ManualSpecialUtilities.html 2016-05-21 02:00:42 UTC (rev 7538)
+++ trunk/doc/Manual/ManualSpecialUtilities.html 2016-05-21 16:15:10 UTC (rev 7539)
@@ -68,7 +68,7 @@
<h2><a id="Z_GLAccountUsersCopyAuthority">Copy Authority of GL Accounts from one user to another</a></h2>
-<p>This utility allows you to copy access rights to general ledger accounts from one user to another.</p>
+<p>This utility allows you to the copy access rights to general ledger accounts from one user to another. This utility overwrites all the access rights of the destination user.</p>
<!-- "Inquiries and Reports" -->
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2016-05-21 02:00:42 UTC (rev 7538)
+++ trunk/includes/MainMenuLinksArray.php 2016-05-21 16:15:10 UTC (rev 7539)
@@ -398,10 +398,10 @@
$MenuItems['GL']['Maintenance']['Caption'] = array( _('Account Sections'),
_('Account Groups'),
_('GL Accounts'),
+ _('GL Account Authorised Users'),
+ _('User Authorised GL Accounts'),
_('GL Budgets'),
_('GL Tags'),
- _('GL Accounts Authorised Users Maintenance'),
- _('User Authorised GL Accounts Maintenance'),
_('Bank Accounts'),
_('Bank Account Authorized Users'),
_('User Authorized Bank Accounts'));
@@ -409,10 +409,10 @@
$MenuItems['GL']['Maintenance']['URL'] = array( '/AccountSections.php',
'/AccountGroups.php',
'/GLAccounts.php',
+ '/GLAccountUsers.php',
+ '/UserGLAccounts.php',
'/GLBudgets.php',
'/GLTags.php',
- '/GLAccountUsers.php',
- '/UserGLAccounts.php',
'/BankAccounts.php',
'/BankAccountUsers.php',
'/UserBankAccounts.php');
@@ -588,7 +588,7 @@
'/Z_ReApplyCostToSA.php',
'/Z_DeleteSalesTransActions.php',
'/Z_ReverseSuppPaymentRun.php',
- '/Z_UpdateSalesAnalysisWithLatestCustomerData.php',
+ '/Z_UpdateSalesAnalysisWithLatestCustomerData.php',
'/Z_GLAccountUsersCopyAuthority.php');
$MenuItems['Utilities']['Reports']['Caption'] = array( _('Debtors Balances By Currency Totals'),
|
|
From: <dai...@us...> - 2016-05-23 07:20:00
|
Revision: 7540
http://sourceforge.net/p/web-erp/reponame/7540
Author: daintree
Date: 2016-05-23 07:19:58 +0000 (Mon, 23 May 2016)
Log Message:
-----------
fix credit_invoice.php for adding tax authorities correctly
Modified Paths:
--------------
trunk/Credit_Invoice.php
trunk/doc/Change.log
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2016-05-21 16:15:10 UTC (rev 7539)
+++ trunk/Credit_Invoice.php 2016-05-23 07:19:58 UTC (rev 7540)
@@ -233,12 +233,13 @@
$_SESSION['CreditItems' . $identifier]->SalesPerson = $_POST['SalesPerson'];
}
}
-foreach($_SESSION['CreditItems' . $identifier]->FreightTaxes as $FreightTaxLine) {
- if(isset($_POST['FreightTaxRate' . $FreightTaxLine->TaxCalculationOrder])) {
- $_SESSION['CreditItems' . $identifier]->FreightTaxes[$FreightTaxLine->TaxCalculationOrder]->TaxRate = filter_number_format($_POST['FreightTaxRate' . $FreightTaxLine->TaxCalculationOrder])/100;
+foreach ($_SESSION['CreditItems'.$identifier]->FreightTaxes as $FreightTaxKey=>$FreightTaxLine) {
+ if (is_numeric(filter_number_format($_POST['FreightTaxRate' . $FreightTaxLine->TaxCalculationOrder]))){
+ $_SESSION['CreditItems'.$identifier]->FreightTaxes[$FreightTaxKey]->TaxRate = filter_number_format($_POST['FreightTaxRate' . $FreightTaxKey])/100;
}
}
+
if($_SESSION['CreditItems' . $identifier]->ItemsOrdered > 0 OR isset($_POST['NewItem'])) {
if(isset($_GET['Delete'])) {
@@ -262,9 +263,9 @@
$_SESSION['CreditItems' . $identifier]->LineItems[$LineItem->LineNumber]->DiscountPercent=($DiscountPercentage/100);
$_SESSION['CreditItems' . $identifier]->LineItems[$LineItem->LineNumber]->Narrative=$Narrative;
}
- foreach($LineItem->Taxes as $TaxLine) {
- if(isset($_POST[$LineItem->LineNumber . $TaxLine->TaxCalculationOrder . '_TaxRate'])) {
- $_SESSION['CreditItems' . $identifier]->LineItems[$LineItem->LineNumber]->Taxes[$TaxLine->TaxCalculationOrder]->TaxRate = filter_number_format($_POST[$LineItem->LineNumber . $TaxLine->TaxCalculationOrder . '_TaxRate'])/100;
+ foreach ($LineItem->Taxes as $TaxKey=>$TaxLine) {
+ if (is_numeric(filter_number_format($_POST[$LineItem->LineNumber . $TaxLine->TaxCalculationOrder . '_TaxRate']))){
+ $_SESSION['CreditItems'.$identifier]->LineItems[$LineItem->LineNumber]->Taxes[$TaxKey]->TaxRate = filter_number_format($_POST[$LineItem->LineNumber . $TaxKey . '_TaxRate'])/100;
}
}
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-05-21 16:15:10 UTC (rev 7539)
+++ trunk/doc/Change.log 2016-05-23 07:19:58 UTC (rev 7540)
@@ -2,6 +2,8 @@
22/5/16 Release 4.13
+23/5/16 Phil: Credit_Invoice.php now adds correct tax authorities - correcting bug that resulted in foreign key errors when adding taxauthorities as per fix to SelectCreditItems.php on 13/1/16
+20/5/16 Phil: POS upload file now includes assembly items
20/5/16 RChacon: Insert missing script as an utility.
20/5/16 RChacon: In Login.php, add a return link.
20/5/16 Paul Harness: CustomerAllocations.php consistent sort order adding by date and transno sorting for transactions on the same date
|
|
From: <dai...@us...> - 2016-05-23 07:40:50
|
Revision: 7541
http://sourceforge.net/p/web-erp/reponame/7541
Author: daintree
Date: 2016-05-23 07:40:48 +0000 (Mon, 23 May 2016)
Log Message:
-----------
allow additional space for the date
Modified Paths:
--------------
trunk/PrintCustStatements.php
trunk/doc/Change.log
Modified: trunk/PrintCustStatements.php
===================================================================
--- trunk/PrintCustStatements.php 2016-05-23 07:19:58 UTC (rev 7540)
+++ trunk/PrintCustStatements.php 2016-05-23 07:40:48 UTC (rev 7541)
@@ -202,7 +202,7 @@
$LeftOvers = $pdf->addTextWrap($Left_Margin+1,$YPos,60,$FontSize, _($myrow['typename']), 'left');
$LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,50,$FontSize,$myrow['transno'], 'left');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+211,$YPos,50,$FontSize,ConvertSQLDate($myrow['trandate']), 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+211,$YPos,55,$FontSize,ConvertSQLDate($myrow['trandate']), 'left');
$FontSize=10;
if ($myrow['total']>0){
@@ -252,7 +252,7 @@
$FontSize=9;
$LeftOvers = $pdf->addTextWrap($Left_Margin+1,$YPos,60,$FontSize, _($myrow['typename']), 'left');
$LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,50,$FontSize,$myrow['transno'], 'left');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+211,$YPos,50,$FontSize,ConvertSQLDate($myrow['trandate']), 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+211,$YPos,55,$FontSize,ConvertSQLDate($myrow['trandate']), 'left');
$FontSize=10;
if ($myrow['total']>0){
@@ -463,12 +463,12 @@
} else { //its not an email just print the invoice to PDF
-
+
$pdf->OutputD($_SESSION['DatabaseName'] . '_CustStatements_' . date('Y-m-d') . '.pdf');
}
-
+
$pdf->__destruct();
} else {
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-05-23 07:19:58 UTC (rev 7540)
+++ trunk/doc/Change.log 2016-05-23 07:40:48 UTC (rev 7541)
@@ -2,6 +2,7 @@
22/5/16 Release 4.13
+23/5/16 Phil: PrintCustomerStatement.php now shows all the date.
23/5/16 Phil: Credit_Invoice.php now adds correct tax authorities - correcting bug that resulted in foreign key errors when adding taxauthorities as per fix to SelectCreditItems.php on 13/1/16
20/5/16 Phil: POS upload file now includes assembly items
20/5/16 RChacon: Insert missing script as an utility.
|
|
From: <dai...@us...> - 2016-05-28 03:45:58
|
Revision: 7542
http://sourceforge.net/p/web-erp/reponame/7542
Author: daintree
Date: 2016-05-28 03:45:56 +0000 (Sat, 28 May 2016)
Log Message:
-----------
CustStatement email capability
Modified Paths:
--------------
trunk/AddCustomerContacts.php
trunk/PrintCustStatements.php
trunk/SelectCustomer.php
trunk/doc/Change.log
trunk/doc/Manual/ManualAccountsReceivable.html
trunk/sql/mysql/upgrade4.12.3-4.13.sql
Removed Paths:
-------------
trunk/EmailCustStatements.php
Modified: trunk/AddCustomerContacts.php
===================================================================
--- trunk/AddCustomerContacts.php 2016-05-23 07:40:48 UTC (rev 7541)
+++ trunk/AddCustomerContacts.php 2016-05-28 03:45:56 UTC (rev 7542)
@@ -56,7 +56,8 @@
role='" . $_POST['ContactRole'] . "',
phoneno='" . $_POST['ContactPhone'] . "',
notes='" . $_POST['ContactNotes'] . "',
- email='" . $_POST['ContactEmail'] . "'
+ email='" . $_POST['ContactEmail'] . "',
+ statement='" . $_POST['StatementAddress'] . "'
WHERE debtorno ='".$DebtorNo."'
AND contid='".$Id."'";
$msg = _('Customer Contacts') . ' ' . $DebtorNo . ' ' . _('has been updated');
@@ -67,13 +68,15 @@
role,
phoneno,
notes,
- email)
+ email,
+ statement)
VALUES ('" . $DebtorNo. "',
'" . $_POST['ContactName'] . "',
'" . $_POST['ContactRole'] . "',
'" . $_POST['ContactPhone'] . "',
'" . $_POST['ContactNotes'] . "',
- '" . $_POST['ContactEmail'] . "')";
+ '" . $_POST['ContactEmail'] . "',
+ '" . $_POST['StatementAddress'] . "')";
$msg = _('The contact record has been added');
}
@@ -116,6 +119,7 @@
contactname,
role,
phoneno,
+ statement,
notes,
email
FROM custcontacts
@@ -130,6 +134,7 @@
<th class="text">', _('Role'), '</th>
<th class="text">', _('Phone no'), '</th>
<th class="text">', _('Email'), '</th>
+ <th class="text">', _('Statement'), '</th>
<th class="text">', _('Notes'), '</th>
<th class="noprint" colspan="2"> </th>
</tr>';
@@ -149,6 +154,7 @@
<td class="text">%s</td>
<td class="text"><a href="mailto:%s">%s</a></td>
<td class="text">%s</td>
+ <td class="text">%s</td>
<td class="noprint"><a href="%sId=%s&DebtorNo=%s">' . _('Edit') . '</a></td>
<td class="noprint"><a href="%sId=%s&DebtorNo=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this contact?') . '\');">' . _('Delete'). '</a></td></tr>',
$myrow['contactname'],
@@ -156,6 +162,7 @@
$myrow['phoneno'],
$myrow['email'],
$myrow['email'],
+ ($myrow['statement']==0) ? _('No') : _('Yes'),
$myrow['notes'],
htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?',
$myrow['contid'],
@@ -226,7 +233,7 @@
}
// Contact name:
echo '<tr>
- <td>', _('Contact Name'), '</td>
+ <td>', _('Contact Name'), ':</td>
<td><input maxlength="40" name="ContactName" required="required" size="35" type="text" ';
if( isset($_POST['ContactName']) ) {
echo 'autofocus="autofocus" value="', $_POST['ContactName'], '" ';
@@ -235,7 +242,7 @@
</tr>';
// Role:
echo '<tr>
- <td>', _('Role'), '</td>
+ <td>', _('Role'), ':</td>
<td><input maxlength="40" name="ContactRole" size="35" type="text" ';
if( isset($_POST['ContactRole']) ) {
echo 'value="', $_POST['ContactRole'], '" ';
@@ -244,7 +251,7 @@
</tr>';
// Phone:
echo '<tr>
- <td>', _('Phone'), '</td>
+ <td>', _('Phone'), ':</td>
<td><input maxlength="40" name="ContactPhone" size="35" type="tel" ';
if( isset($_POST['ContactPhone']) ) {
echo 'value="', $_POST['ContactPhone'], '" ';
@@ -253,13 +260,30 @@
</tr>';
// Email:
echo '<tr>
- <td>', _('Email'), '</td>
+ <td>', _('Email'), ':</td>
<td><input maxlength="55" name="ContactEmail" size="55" type="email" ';
if( isset($_POST['ContactEmail']) ) {
echo 'value="', $_POST['ContactEmail'], '" ';
}
echo '/></td>
</tr>';
+ echo '<tr>
+ <td>', _('Send Statement'), ':</td>
+ <td><select name="StatementAddress" title="' , _('This flag identifies the contact as one who should receive an email cusstomer statement') , '" >';
+ if( !isset($_POST['StatementAddress']) ) {
+ echo '<option selected="selected" value="0">', _('No') , '</option>
+ <option value="1">', _('Yes') , '</option>';
+ } else {
+ if ($_POST['StatementAddress']==0) {
+ echo '<option selected="selected" value="0">', _('No') , '</option>
+ <option value="1">', _('Yes') , '</option>';
+ } else {
+ echo '<option value="0">', _('No') , '</option>
+ <option selected="selected" value="1">', _('Yes') , '</option>';
+ }
+ }
+ echo '</select></td>
+ </tr>';
// Notes:
echo '<tr>
<td>', _('Notes'), '</td>
Deleted: trunk/EmailCustStatements.php
===================================================================
--- trunk/EmailCustStatements.php 2016-05-23 07:40:48 UTC (rev 7541)
+++ trunk/EmailCustStatements.php 2016-05-28 03:45:56 UTC (rev 7542)
@@ -1,51 +0,0 @@
-<?php
-
-/* $Id: EmailCustTrans.php 6310 2013-08-29 10:42:50Z daintree $*/
-
-include ('includes/session.inc');
-include ('includes/SQL_CommonFunctions.inc');
-if (!isset($_GET['FromCust'])) {
- $_GET['FromCust'] = $_SESSION['CustomerID'];
-}
-$Title=_('Email Customer Statement For Customer No.') . ' ' . $_GET['FromCust'];
-
-if (isset($_POST['DoIt']) AND IsEmailAddress($_POST['EmailAddr'])){
- echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/PrintCustStatements.php?FromCust=' . $_SESSION['CustomerID'] . '&ToCust='.$_SESSION['CustomerID'] . '&PrintPDF=Yes&Email=' . $_POST['EmailAddr'] . '">';
- prnMsg(_('The customer statement should have been emailed off') . '. ' . _('If this does not happen') . ' (' . _('if the browser does not support META Refresh') . ')' . '<a href="' . $RootPath . '/PrintCustStatements.php?FromCust=' . $_SESSION['CustomerID'] . '&PrintPDF=Yes&Email=' . $_POST['EmailAddr'] . '">' . _('click here') . '</a> ' . _('to email the customer statement'),'success');
- exit;
-} elseif (isset($_POST['DoIt'])) {
- prnMsg(_('The email address does not appear to be a valid email address. The statement was not emailed'),'warn');
-}
-include ('includes/header.inc');
-
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
-echo '<div>';
-echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<br /><table>';
-
-$SQL = "SELECT custbranch.email as email
- FROM custbranch INNER JOIN debtorsmaster
- ON custbranch.debtorno= debtorsmaster.debtorno
- WHERE debtorsmaster.debtorno='" .$_SESSION['CustomerID'] . "' LIMIT 1";
-
-$ErrMsg = _('There was a problem retrieving the contact details for the customer');
-$ContactResult=DB_query($SQL,$db,$ErrMsg);
-
-if (DB_num_rows($ContactResult)>0){
- $EmailAddrRow = DB_fetch_row($ContactResult);
- $EmailAddress = $EmailAddrRow[0];
-} else {
- $EmailAddress ='';
-}
-
-echo '<tr><td>' . _('Email to') . ':</td>
- <td><input type="email" name="EmailAddr" autofocus="autofocus" maxlength="60" size="60" value="' . $EmailAddress . '" /></td>
- </tr>
- </table>';
-
-echo '<br /><div class="centre"><input type="submit" name="DoIt" value="' . _('OK') . '" />';
-echo '</div>
- </div>
- </form>';
-include ('includes/footer.inc');
-?>
Modified: trunk/PrintCustStatements.php
===================================================================
--- trunk/PrintCustStatements.php 2016-05-23 07:40:48 UTC (rev 7541)
+++ trunk/PrintCustStatements.php 2016-05-28 03:45:56 UTC (rev 7542)
@@ -4,7 +4,7 @@
include('includes/session.inc');
include('includes/SQL_CommonFunctions.inc');
-
+include ('includes/htmlMimeMail.php');
$ViewTopic = 'ARReports';
$BookMark = 'CustomerStatements';
$Title = _('Print Customer Statements');
@@ -37,37 +37,12 @@
$_POST['FromCust'] = mb_strtoupper($_POST['FromCust']);
If (!isset($_POST['ToCust'])){
- $_POST['ToCust'] = $_POST['FromCust'];
+ $_POST['ToCust'] = $_POST['FromCust'];
} else {
$_POST['ToCust'] = mb_strtoupper($_POST['ToCust']);
}
- include('includes/PDFStarter.php');
- $pdf->addInfo('Title', _('Customer Statements') );
- $pdf->addInfo('Subject', _('Statements from') . ' ' . $_POST['FromCust'] . ' ' . _('to') . ' ' . $_POST['ToCust']);
- $PageNumber = 1;
- $line_height=16;
- $FirstStatement = True;
-
- // check if the user has set a default bank account for invoices, if not leave it blank
- $sql = "SELECT bankaccounts.invoice,
- bankaccounts.bankaccountnumber,
- bankaccounts.bankaccountcode
- FROM bankaccounts
- WHERE bankaccounts.invoice = '1'";
- $result=DB_query($sql,'','',false,false);
- if (DB_error_no()!=1) {
- if (DB_num_rows($result)==1){
- $myrow = DB_fetch_array($result);
- $DefaultBankAccountNumber = $myrow['bankaccountnumber'];
- } else {
- $DefaultBankAccountNumber = '';
- }
- } else {
- $DefaultBankAccountNumber = '';
- }
-
/* Do a quick tidy up to settle any transactions that should have been settled at the time of allocation but for whatever reason weren't */
$ErrMsg = _('There was a problem settling the old transactions.');
$DbgMsg = _('The SQL used to settle outstanding transactions was');
@@ -105,373 +80,427 @@
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . _('Print Customer Account Statements') . '</p>';
prnMsg( _('There were no Customers matching your selection of '). $_POST['FromCust']. ' - '.
$_POST['ToCust'].'.' , 'error');
-// echo '</div>';
include('includes/footer.inc');
exit();
}
+ //Start the statement if there are any in the range and we are printing the whole lot
+ if ($_POST['EmailOrPrint']=='print') {
+ include('includes/PDFStarter.php');
+ $pdf->addInfo('Title', _('Customer Statements') );
+ $pdf->addInfo('Subject', _('Statements from') . ' ' . $_POST['FromCust'] . ' ' . _('to') . ' ' . $_POST['ToCust']);
+ $PageNumber = 1;
+ } else {
+ $Title = _('Email Customer Statements');
+ include('includes/header.inc');
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/email.png" title="' . _('Email') . '" alt="" />' . ' ' . _('Emailing Customer Account Statements') . '</p>';
+
+ echo '<table class="selection">
+ <tr>
+ <th class="text">', _('Account #'), '</th>
+ <th class="text">', _('Customer Name'), '</th>
+ <th class="text">', _('Recipients'), '</th>
+ </tr>';
+ }
+ $FirstStatement = True;
+ // check if the user has set a default bank account for invoices, if not leave it blank
+ $sql = "SELECT bankaccounts.invoice,
+ bankaccounts.bankaccountnumber,
+ bankaccounts.bankaccountcode
+ FROM bankaccounts
+ WHERE bankaccounts.invoice = '1'";
+ $result=DB_query($sql,'','',false,false);
+ if (DB_error_no()!=1) {
+ if (DB_num_rows($result)==1){
+ $myrow = DB_fetch_array($result);
+ $DefaultBankAccountNumber = $myrow['bankaccountnumber'];
+ } else {
+ $DefaultBankAccountNumber = '';
+ }
+ } else {
+ $DefaultBankAccountNumber = '';
+ }
+
while ($StmtHeader=DB_fetch_array($StatementResults)){ /*loop through all the customers returned */
- /*now get all the outstanding transaction ie Settled=0 */
- $ErrMsg = _('There was a problem retrieving the outstanding transactions for') . ' ' . $StmtHeader['name'] . ' '. _('from the database') . '.';
- $sql = "SELECT systypes.typename,
- debtortrans.transno,
- debtortrans.trandate,
- debtortrans.ovamount+debtortrans.ovdiscount+debtortrans.ovfreight+debtortrans.ovgst as total,
- debtortrans.alloc,
- debtortrans.ovamount+debtortrans.ovdiscount+debtortrans.ovfreight+debtortrans.ovgst-debtortrans.alloc as ostdg
- FROM debtortrans INNER JOIN systypes
- ON debtortrans.type=systypes.typeid
- WHERE debtortrans.debtorno='" . $StmtHeader['debtorno'] . "'
- AND debtortrans.settled=0";
-
- if ($_SESSION['SalesmanLogin'] != '') {
- $sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
+ if ($_POST['EmailOrPrint']=='email'){
+ if (isset($RecipientArray)) {
+ unset($RecipientArray);
+ }
+ $RecipientArray = array();
+ include('includes/PDFStarter.php');
+ $pdf->addInfo('Title', $_SESSION['CompanyRecord']['coyname'] . ' - ' . _('Customer Statement') );
+ $pdf->addInfo('Subject', _('For customer') . ': ' . $StmtHeader['name']);
+ $PageNumber = 1;
+ $RecipientsResult = DB_query("SELECT email FROM custcontacts WHERE statement=1 AND debtorno='" . $StmtHeader['debtorno'] . "'");
+ while ($RecipientRow = DB_fetch_row($RecipientsResult)){
+ if (IsEmailAddress($RecipientRow[0])){
+ $RecipientArray[] = $RecipientRow[0];
+ }
}
- $sql .= " ORDER BY debtortrans.id";
+ if ($_POST['EmailOrPrint']=='print' OR
+ ($_POST['EmailOrPrint']=='email' AND count($RecipientArray)>0) ){
- $OstdgTrans=DB_query($sql, $ErrMsg);
+ $line_height=16;
- $NumberOfRecordsReturned = DB_num_rows($OstdgTrans);
+ /*now get all the outstanding transaction ie Settled=0 */
+ $ErrMsg = _('There was a problem retrieving the outstanding transactions for') . ' ' . $StmtHeader['name'] . ' '. _('from the database') . '.';
+ $sql = "SELECT systypes.typename,
+ debtortrans.transno,
+ debtortrans.trandate,
+ debtortrans.ovamount+debtortrans.ovdiscount+debtortrans.ovfreight+debtortrans.ovgst as total,
+ debtortrans.alloc,
+ debtortrans.ovamount+debtortrans.ovdiscount+debtortrans.ovfreight+debtortrans.ovgst-debtortrans.alloc as ostdg
+ FROM debtortrans INNER JOIN systypes
+ ON debtortrans.type=systypes.typeid
+ WHERE debtortrans.debtorno='" . $StmtHeader['debtorno'] . "'
+ AND debtortrans.settled=0";
-/*now get all the settled transactions which were allocated this month */
- $ErrMsg = _('There was a problem retrieving the transactions that were settled over the course of the last month for'). ' ' . $StmtHeader['name'] . ' ' . _('from the database');
- if ($_SESSION['Show_Settled_LastMonth']==1){
- $sql = "SELECT DISTINCT debtortrans.id,
- systypes.typename,
- debtortrans.transno,
- debtortrans.trandate,
- debtortrans.ovamount+debtortrans.ovdiscount+debtortrans.ovfreight+debtortrans.ovgst AS total,
- debtortrans.alloc,
- debtortrans.ovamount+debtortrans.ovdiscount+debtortrans.ovfreight+debtortrans.ovgst-debtortrans.alloc AS ostdg
- FROM debtortrans INNER JOIN systypes
- ON debtortrans.type=systypes.typeid
- INNER JOIN custallocns
- ON (debtortrans.id=custallocns.transid_allocfrom
- OR debtortrans.id=custallocns.transid_allocto)
- WHERE custallocns.datealloc >='" .
- Date('Y-m-d',Mktime(0,0,0,Date('m')-1,Date('d'),Date('y'))) . "'
- AND debtortrans.debtorno='" . $StmtHeader['debtorno'] . "'
- AND debtortrans.settled=1";
-
if ($_SESSION['SalesmanLogin'] != '') {
$sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
}
$sql .= " ORDER BY debtortrans.id";
- $SetldTrans=DB_query($sql, $ErrMsg);
- $NumberOfRecordsReturned += DB_num_rows($SetldTrans);
+ $OstdgTrans=DB_query($sql, $ErrMsg);
- }
+ $NumberOfRecordsReturned = DB_num_rows($OstdgTrans);
- if ( $NumberOfRecordsReturned >=1){
+ /*now get all the settled transactions which were allocated this month */
+ $ErrMsg = _('There was a problem retrieving the transactions that were settled over the course of the last month for'). ' ' . $StmtHeader['name'] . ' ' . _('from the database');
+ if ($_SESSION['Show_Settled_LastMonth']==1){
+ $sql = "SELECT DISTINCT debtortrans.id,
+ systypes.typename,
+ debtortrans.transno,
+ debtortrans.trandate,
+ debtortrans.ovamount+debtortrans.ovdiscount+debtortrans.ovfreight+debtortrans.ovgst AS total,
+ debtortrans.alloc,
+ debtortrans.ovamount+debtortrans.ovdiscount+debtortrans.ovfreight+debtortrans.ovgst-debtortrans.alloc AS ostdg
+ FROM debtortrans INNER JOIN systypes
+ ON debtortrans.type=systypes.typeid
+ INNER JOIN custallocns
+ ON (debtortrans.id=custallocns.transid_allocfrom
+ OR debtortrans.id=custallocns.transid_allocto)
+ WHERE custallocns.datealloc >='" .
+ Date('Y-m-d',Mktime(0,0,0,Date('m')-1,Date('d'),Date('y'))) . "'
+ AND debtortrans.debtorno='" . $StmtHeader['debtorno'] . "'
+ AND debtortrans.settled=1";
- /* Then there's a statement to print. So print out the statement header from the company record */
+ if ($_SESSION['SalesmanLogin'] != '') {
+ $sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
+ }
- $PageNumber =1;
+ $sql .= " ORDER BY debtortrans.id";
- if ($FirstStatement==True){
- $FirstStatement=False;
- } else {
- $pdf->newPage();
- }
+ $SetldTrans=DB_query($sql, $ErrMsg);
+ $NumberOfRecordsReturned += DB_num_rows($SetldTrans);
- include('includes/PDFStatementPageHeader.inc');
+ }
- $Cust_Name = $StmtHeader['name'];
- $Cust_No = $StmtHeader['debtorno'];
+ if ( $NumberOfRecordsReturned >=1){
- if ($_SESSION['Show_Settled_LastMonth']==1){
- if (DB_num_rows($SetldTrans)>=1) {
+ /* Then there's a statement to print. So print out the statement header from the company record */
- $FontSize=12;
- $pdf->addText($Left_Margin+1,$YPos+5,$FontSize, _('Settled Transactions'));
+ $PageNumber =1;
- $YPos -= (2*$line_height);
+ if ($FirstStatement==True){
+ $FirstStatement=False;
+ } else {
+ $pdf->newPage();
+ }
- $FontSize=10;
+ include('includes/PDFStatementPageHeader.inc');
- while ($myrow=DB_fetch_array($SetldTrans)){
+ $Cust_Name = $StmtHeader['name'];
+ $Cust_No = $StmtHeader['debtorno'];
- $DisplayAlloc = locale_number_format($myrow['alloc'],$StmtHeader['currdecimalplaces']);
- $DisplayOutstanding = locale_number_format($myrow['ostdg'],$StmtHeader['currdecimalplaces']);
+ if ($_SESSION['Show_Settled_LastMonth']==1){
+ if (DB_num_rows($SetldTrans)>=1) {
- $FontSize=9;
+ $FontSize=12;
+ $pdf->addText($Left_Margin+1,$YPos+5,$FontSize, _('Settled Transactions'));
- $LeftOvers = $pdf->addTextWrap($Left_Margin+1,$YPos,60,$FontSize, _($myrow['typename']), 'left');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,50,$FontSize,$myrow['transno'], 'left');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+211,$YPos,55,$FontSize,ConvertSQLDate($myrow['trandate']), 'left');
+ $YPos -= (2*$line_height);
$FontSize=10;
- if ($myrow['total']>0){
- $DisplayTotal = locale_number_format($myrow['total'],$StmtHeader['currdecimalplaces']);
- $LeftOvers = $pdf->addTextWrap($Left_Margin+300,$YPos,60,$FontSize,$DisplayTotal, 'right');
- } else {
- $DisplayTotal = locale_number_format(-$myrow['total'],$StmtHeader['currdecimalplaces']);
- $LeftOvers = $pdf->addTextWrap($Left_Margin+382,$YPos,60,$FontSize,$DisplayTotal, 'right');
- }
- $LeftOvers = $pdf->addTextWrap($Left_Margin+459,$YPos,60,$FontSize,$DisplayAlloc, 'right');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+536,$YPos,60,$FontSize,$DisplayOutstanding, 'right');
- if ($YPos-$line_height <= $Bottom_Margin){
- /* head up a new statement page */
+ while ($myrow=DB_fetch_array($SetldTrans)){
- $PageNumber++;
- $pdf->newPage();
- include ('includes/PDFStatementPageHeader.inc');
- } //end if need a new page headed up
+ $DisplayAlloc = locale_number_format($myrow['alloc'],$StmtHeader['currdecimalplaces']);
+ $DisplayOutstanding = locale_number_format($myrow['ostdg'],$StmtHeader['currdecimalplaces']);
- /*increment a line down for the next line item */
- $YPos -= ($line_height);
+ $FontSize=9;
- } //end while there transactions settled this month to print out
- }
- } // end of if there are transaction that were settled this month
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+1,$YPos,60,$FontSize, _($myrow['typename']), 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,50,$FontSize,$myrow['transno'], 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+211,$YPos,55,$FontSize,ConvertSQLDate($myrow['trandate']), 'left');
- if (DB_num_rows($OstdgTrans)>=1){
+ $FontSize=10;
+ if ($myrow['total']>0){
+ $DisplayTotal = locale_number_format($myrow['total'],$StmtHeader['currdecimalplaces']);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+300,$YPos,60,$FontSize,$DisplayTotal, 'right');
+ } else {
+ $DisplayTotal = locale_number_format(-$myrow['total'],$StmtHeader['currdecimalplaces']);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+382,$YPos,60,$FontSize,$DisplayTotal, 'right');
+ }
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+459,$YPos,60,$FontSize,$DisplayAlloc, 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+536,$YPos,60,$FontSize,$DisplayOutstanding, 'right');
- $YPos -= ($line_height);
- if ($YPos-(2 * $line_height) <= $Bottom_Margin){
- $PageNumber++;
- $pdf->newPage();
- include ('includes/PDFStatementPageHeader.inc');
- }
- /*Now the same again for outstanding transactions */
+ if ($YPos-$line_height <= $Bottom_Margin){
+ /* head up a new statement page */
- $FontSize=12;
- $pdf->addText($Left_Margin+1,$YPos+20,$FontSize, _('Outstanding Transactions') );
- $YPos -= $line_height;
+ $PageNumber++;
+ $pdf->newPage();
+ include ('includes/PDFStatementPageHeader.inc');
+ } //end if need a new page headed up
- while ($myrow=DB_fetch_array($OstdgTrans)){
+ /*increment a line down for the next line item */
+ $YPos -= ($line_height);
- $DisplayAlloc = locale_number_format($myrow['alloc'],$StmtHeader['currdecimalplaces']);
- $DisplayOutstanding = locale_number_format($myrow['ostdg'],$StmtHeader['currdecimalplaces']);
+ } //end while there transactions settled this month to print out
+ }
+ } // end of if there are transaction that were settled this month
- $FontSize=9;
- $LeftOvers = $pdf->addTextWrap($Left_Margin+1,$YPos,60,$FontSize, _($myrow['typename']), 'left');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,50,$FontSize,$myrow['transno'], 'left');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+211,$YPos,55,$FontSize,ConvertSQLDate($myrow['trandate']), 'left');
+ if (DB_num_rows($OstdgTrans)>=1){
- $FontSize=10;
- if ($myrow['total']>0){
- $DisplayTotal = locale_number_format($myrow['total'],$StmtHeader['currdecimalplaces']);
- $LeftOvers = $pdf->addTextWrap($Left_Margin+300,$YPos,55,$FontSize,$DisplayTotal, 'right');
- } else {
- $DisplayTotal = locale_number_format(-$myrow['total'],$StmtHeader['currdecimalplaces']);
- $LeftOvers = $pdf->addTextWrap($Left_Margin+382,$YPos,55,$FontSize,$DisplayTotal, 'right');
- }
+ $YPos -= ($line_height);
+ if ($YPos-(2 * $line_height) <= $Bottom_Margin){
+ $PageNumber++;
+ $pdf->newPage();
+ include ('includes/PDFStatementPageHeader.inc');
+ }
+ /*Now the same again for outstanding transactions */
- $LeftOvers = $pdf->addTextWrap($Left_Margin+459,$YPos,59,$FontSize,$DisplayAlloc, 'right');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+536,$YPos,60,$FontSize,$DisplayOutstanding, 'right');
+ $FontSize=12;
+ $pdf->addText($Left_Margin+1,$YPos+20,$FontSize, _('Outstanding Transactions') );
+ $YPos -= $line_height;
- /*Now show also in the remittance advice sectin */
- $FontSize=8;
- $LeftOvers = $pdf->addTextWrap($Perforation+10,$YPos,30,$FontSize, _($myrow['typename']), 'left');
- $LeftOvers = $pdf->addTextWrap($Perforation+75,$YPos,30,$FontSize,$myrow['transno'], 'left');
- $LeftOvers = $pdf->addTextWrap($Perforation+90,$YPos,60,$FontSize,$DisplayOutstanding, 'right');
+ while ($myrow=DB_fetch_array($OstdgTrans)){
- if ($YPos-$line_height <= $Bottom_Margin){
- /* head up a new statement page */
+ $DisplayAlloc = locale_number_format($myrow['alloc'],$StmtHeader['currdecimalplaces']);
+ $DisplayOutstanding = locale_number_format($myrow['ostdg'],$StmtHeader['currdecimalplaces']);
- $PageNumber++;
- $pdf->newPage();
- include ('includes/PDFStatementPageHeader.inc');
- } //end if need a new page headed up
+ $FontSize=9;
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+1,$YPos,60,$FontSize, _($myrow['typename']), 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,50,$FontSize,$myrow['transno'], 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+211,$YPos,55,$FontSize,ConvertSQLDate($myrow['trandate']), 'left');
- /*increment a line down for the next line item */
- $YPos -= ($line_height);
+ $FontSize=10;
+ if ($myrow['total']>0){
+ $DisplayTotal = locale_number_format($myrow['total'],$StmtHeader['currdecimalplaces']);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+300,$YPos,55,$FontSize,$DisplayTotal, 'right');
+ } else {
+ $DisplayTotal = locale_number_format(-$myrow['total'],$StmtHeader['currdecimalplaces']);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+382,$YPos,55,$FontSize,$DisplayTotal, 'right');
+ }
- } //end while there are outstanding transaction to print
- } // end if there are outstanding transaction to print
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+459,$YPos,59,$FontSize,$DisplayAlloc, 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+536,$YPos,60,$FontSize,$DisplayOutstanding, 'right');
+ /*Now show also in the remittance advice sectin */
+ $FontSize=8;
+ $LeftOvers = $pdf->addTextWrap($Perforation+10,$YPos,30,$FontSize, _($myrow['typename']), 'left');
+ $LeftOvers = $pdf->addTextWrap($Perforation+75,$YPos,30,$FontSize,$myrow['transno'], 'left');
+ $LeftOvers = $pdf->addTextWrap($Perforation+90,$YPos,60,$FontSize,$DisplayOutstanding, 'right');
- /* check to see enough space left to print the totals/footer
- which is made up of 2 ruled lines, the totals/aging another 2 lines
- and details of the last payment made - in all 6 lines */
- if (($YPos-$Bottom_Margin)<(4*$line_height)){
+ if ($YPos-$line_height <= $Bottom_Margin){
+ /* head up a new statement page */
- /* head up a new statement/credit note page */
- $PageNumber++;
- $pdf->newPage();
- include ('includes/PDFStatementPageHeader.inc');
- }
- /*Now figure out the aged analysis for the customer under review */
+ $PageNumber++;
+ $pdf->newPage();
+ include ('includes/PDFStatementPageHeader.inc');
+ } //end if need a new page headed up
- $SQL = "SELECT debtorsmaster.name,
- currencies.currency,
- paymentterms.terms,
- debtorsmaster.creditlimit,
- holdreasons.dissallowinvoices,
- holdreasons.reasondescription,
- SUM(debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight +
- debtortrans.ovdiscount - debtortrans.alloc) AS balance,
- SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate)) >=
- paymentterms.daysbeforedue
- THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight +
- debtortrans.ovdiscount - debtortrans.alloc
- ELSE 0 END
- ELSE
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . interval('1', 'MONTH') . "), " . interval('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))','DAY') . ")) >= 0
- THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight +
- debtortrans.ovdiscount - debtortrans.alloc
- ELSE 0 END
- END) AS due,
- Sum(CASE WHEN paymentterms.daysbeforedue > 0 THEN
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) > paymentterms.daysbeforedue
- AND TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) >=
- (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ")
- THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight +
- debtortrans.ovdiscount - debtortrans.alloc
- ELSE 0 END
- ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . interval('1','MONTH') . "), " . interval('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))','DAY') .")) >= " . $_SESSION['PastDueDays1'] . ")
- THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight +
- debtortrans.ovdiscount - debtortrans.alloc
- ELSE 0 END
- END) AS overdue1,
- Sum(CASE WHEN paymentterms.daysbeforedue > 0 THEN
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) > paymentterms.daysbeforedue
- AND TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) >= (paymentterms.daysbeforedue +
- " . $_SESSION['PastDueDays2'] . ")
- THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight +
- debtortrans.ovdiscount - debtortrans.alloc
- ELSE 0 END
- ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . interval('1','MONTH') . "), " .
- interval('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))','DAY') . "))
- >= " . $_SESSION['PastDueDays2'] . ")
- THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight +
- debtortrans.ovdiscount - debtortrans.alloc
- ELSE 0 END
- END) AS overdue2
- FROM debtorsmaster INNER JOIN paymentterms
- ON debtorsmaster.paymentterms = paymentterms.termsindicator
- INNER JOIN currencies
- ON debtorsmaster.currcode = currencies.currabrev
- INNER JOIN holdreasons
- ON debtorsmaster.holdreason = holdreasons.reasoncode
- INNER JOIN debtortrans
- ON debtorsmaster.debtorno = debtortrans.debtorno
- WHERE
- debtorsmaster.debtorno = '" . $StmtHeader['debtorno'] . "'";
+ /*increment a...
[truncated message content] |
|
From: <dai...@us...> - 2016-05-28 04:41:58
|
Revision: 7543
http://sourceforge.net/p/web-erp/reponame/7543
Author: daintree
Date: 2016-05-28 04:41:56 +0000 (Sat, 28 May 2016)
Log Message:
-----------
Gilberto updated pt_BR
Modified Paths:
--------------
trunk/doc/Change.log
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-05-28 03:45:56 UTC (rev 7542)
+++ trunk/doc/Change.log 2016-05-28 04:41:56 UTC (rev 7543)
@@ -2,6 +2,7 @@
22/5/16 Release 4.13
+28/5/16 Gilberto Dos Santos Alves: Updated Portuguese Brazilian translation
28/5/16 Phil: PrintCustStatement.php now has an option to email the statement and uses the customer contacts email addresses defined as wanting a statement and sends individual statements to each of the customer contacts for their customer statement and lists the customers and the recipients they have been sent to. The existing emailcustomerstatement script had too much potential to send statement for other customers to another customer by mistake - so I've removed it!
23/5/16 Phil: PrintCustStatement.php now shows all the date.
23/5/16 Phil: Credit_Invoice.php now adds correct tax authorities - correcting bug that resulted in foreign key errors when adding taxauthorities as per fix to SelectCreditItems.php on 13/1/16
Modified: trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po 2016-05-28 03:45:56 UTC (rev 7542)
+++ trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po 2016-05-28 04:41:56 UTC (rev 7543)
@@ -1,22 +1,22 @@
-# webERP - Portuguese Brazil Translation File.
+# webERP - Portuguese Portugal Translation File.
# Copyright (C) 2014 WebERP Contrib
# This file is distributed under the same license as the webERP package.
# gsavix <gs...@gm...> 2014
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.3\n"
+"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-05-16 21:31+1200\n"
-"PO-Revision-Date: 2015-11-16 01:13-0300\n"
+"PO-Revision-Date: 2014-01-28 14:48-0300\n"
"Last-Translator: gilberto dos santos alves <gs...@gm...>\n"
-"Language-Team: pt-br <gs...@gm...>\n"
-"Language: pt_BR\n"
+"Language-Team: pt-PT <gs...@gm...>\n"
+"Language: pt_PT\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: normal;\n"
-"X-Generator: gsavix editor 2015.11\n"
+"X-Generator: Poedit 1.6.1\n"
"X-Poedit-SourceCharset: utf-8\n"
#: AccountGroups.php:6 includes/MainMenuLinksArray.php:399
@@ -969,11 +969,11 @@
#: AgedControlledInventory.php:8
msgid "Aged Controlled Inventory"
-msgstr "Inventário Controlado Histórico"
+msgstr ""
#: AgedControlledInventory.php:8
msgid "as-of"
-msgstr "pos. de"
+msgstr ""
#: AgedControlledInventory.php:12 InventoryQuantities.php:155
#: InventoryValuation.php:217 Locations.php:12 MRPCalendar.php:21
@@ -990,7 +990,7 @@
#: AgedControlledInventory.php:32
msgid "The stock held could not be retrieved because"
-msgstr "Estoque alocado não pode ser recuperado porque"
+msgstr ""
#: AgedControlledInventory.php:42 MRPReschedules.php:126 MRPShortages.php:261
#: StockClone.php:53 Stocks.php:63
@@ -1060,15 +1060,15 @@
#: AgedControlledInventory.php:45
msgid "Quantity Remaining"
-msgstr "Quantidade Restante"
+msgstr ""
#: AgedControlledInventory.php:46
msgid "Inventory Value"
-msgstr "Valor Inventário"
+msgstr ""
#: AgedControlledInventory.php:48
msgid "Days Old"
-msgstr "Dias Decorridos"
+msgstr ""
#: AgedControlledInventory.php:91 ConfirmDispatch_Invoice.php:309
#: ConfirmDispatch_Invoice.php:313 CounterReturns.php:676
@@ -1432,7 +1432,7 @@
#: AnalysisHorizontalIncome.php:146 AnalysisHorizontalIncome.php:147
#: includes/MainMenuLinksArray.php:378
msgid "Horizontal Analysis of Statement of Comprehensive Income"
-msgstr "Análise Horizontal Abrangente de Receitas"
+msgstr ""
#: AnalysisHorizontalIncome.php:22 GLProfit_Loss.php:14
#: GLTagProfit_Loss.php:14 Z_UpdateChartDetailsBFwd.php:14
@@ -1446,7 +1446,7 @@
#: AnalysisHorizontalIncome.php:30
msgid "Print Horizontal Analysis of Statement of Comprehensive Income"
-msgstr "Imprimir Análise Horizontal Abrang. de Receitas"
+msgstr ""
#: AnalysisHorizontalIncome.php:34 AnalysisHorizontalPosition.php:31
msgid ""
@@ -1455,9 +1455,6 @@
"financial statement items over a period of time. It is a useful tool to "
"evaluate trend situations."
msgstr ""
-"Análise horizontal (também conhecida como trend analysis) é uma técnica "
-"análise que exibe modificações nos valores dentro de um período "
-"correspondente. Útil para analisar situações contábeis."
#: AnalysisHorizontalIncome.php:35 AnalysisHorizontalPosition.php:32
msgid ""
@@ -1466,10 +1463,6 @@
"compared with items on the statement of the base period. The changes are "
"shown both in currency (actual change) and percentage (relative change)."
msgstr ""
-"A abrangência de dois períodos é usada para análise horizontal. O período "
-"mais antigo é usado como base. Os itens mais recentes são comparados com os "
-"itens do período base. Diferenças são exibidas em ambas moedas (atual e "
-"relativa)."
#: AnalysisHorizontalIncome.php:36 AnalysisHorizontalPosition.php:33
#: GLBalanceSheet.php:29 GLProfit_Loss.php:33
@@ -1485,15 +1478,15 @@
#: AnalysisHorizontalIncome.php:43
msgid "Select period from"
-msgstr "Selec. período inicial"
+msgstr ""
#: AnalysisHorizontalIncome.php:79
msgid "Select period to"
-msgstr "Selecione perído final"
+msgstr ""
#: AnalysisHorizontalIncome.php:105 AnalysisHorizontalPosition.php:63
msgid "Detail or summary"
-msgstr "Detalhe ou Resumo"
+msgstr ""
#: AnalysisHorizontalIncome.php:106 AnalysisHorizontalPosition.php:64
#: GLBalanceSheet.php:60
@@ -1515,7 +1508,7 @@
#: AnalysisHorizontalIncome.php:112 AnalysisHorizontalPosition.php:70
msgid "Show all accounts including zero balances"
-msgstr "Exibir todas contas incluindo saldos zero"
+msgstr ""
#: AnalysisHorizontalIncome.php:113 AnalysisHorizontalPosition.php:71
#: GLBalanceSheet.php:67 GLProfit_Loss.php:116
@@ -1535,7 +1528,7 @@
#: DailyBankTransactions.php:255 GLAccountUsers.php:253 GLBalanceSheet.php:720
#: GLProfit_Loss.php:1317 GLTrialBalance.php:740 UserGLAccounts.php:259
msgid "Return"
-msgstr "Retornar"
+msgstr ""
#: AnalysisHorizontalIncome.php:131 GLProfit_Loss.php:147
#: GLProfit_Loss.php:577 GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:480
@@ -1617,11 +1610,11 @@
#: AnalysisHorizontalIncome.php:162 AnalysisHorizontalPosition.php:116
msgid "Actual change"
-msgstr "Taxa Real"
+msgstr ""
#: AnalysisHorizontalIncome.php:163 AnalysisHorizontalPosition.php:117
msgid "Relative change"
-msgstr "Taxa Relativa"
+msgstr ""
#: AnalysisHorizontalIncome.php:170
msgid ""
@@ -1629,8 +1622,6 @@
"the net profit; a negative number indicates a variation that decreases the "
"net profit."
msgstr ""
-"Taxa real sinaliza: se positivo indica variação positiva no lucro líquido; "
-"se negativa indica queda no lucro líquido."
#: AnalysisHorizontalIncome.php:171 AnalysisHorizontalPosition.php:125
msgid ""
@@ -1638,8 +1629,6 @@
"of that account; a negative number indicates a decrease in the amount of "
"that account."
msgstr ""
-"Sinais Relativos Modificação: número positivo indica um incremento na conta "
-"contábil; número negativo indica queda na quantia da conta."
#: AnalysisHorizontalIncome.php:200 AnalysisHorizontalPosition.php:166
#: GLBalanceSheet.php:154 GLBalanceSheet.php:392 GLCodesInquiry.php:18
@@ -1673,18 +1662,18 @@
#: AnalysisHorizontalIncome.php:323
msgid "Earnings after"
-msgstr "Lucros após"
+msgstr ""
#: AnalysisHorizontalIncome.php:501
msgid "Net Profit"
-msgstr "Lucro Líquido"
+msgstr ""
#: AnalysisHorizontalIncome.php:518 AnalysisHorizontalPosition.php:358
#: BOMs.php:909 CustWhereAlloc.php:196 DailyBankTransactions.php:249
#: GLAccountUsers.php:248 GLBalanceSheet.php:716 GLProfit_Loss.php:1313
#: GLTrialBalance.php:736 SuppWhereAlloc.php:194 UserGLAccounts.php:254
msgid "Print This"
-msgstr "Imprimir"
+msgstr ""
#: AnalysisHorizontalIncome.php:519 AnalysisHorizontalIncome.php:520
#: AnalysisHorizontalPosition.php:359 AnalysisHorizontalPosition.php:360
@@ -1699,11 +1688,11 @@
#: AnalysisHorizontalPosition.php:100 AnalysisHorizontalPosition.php:101
#: includes/MainMenuLinksArray.php:379
msgid "Horizontal Analysis of Statement of Financial Position"
-msgstr "Análise Horizontal de Posição Financeira"
+msgstr ""
#: AnalysisHorizontalPosition.php:27
msgid "Print Horizontal Analysis of Statement of Financial Position"
-msgstr "Imprimir Análise Horizontal de Posição Financeira"
+msgstr ""
#: AnalysisHorizontalPosition.php:40 GLBalanceSheet.php:36
msgid "Select the balance date"
@@ -1720,8 +1709,6 @@
"Actual change signs: a positive number indicates a source of funds; a "
"negative number indicates an application of funds."
msgstr ""
-"Sinais modificação real: número positivo indica fonte em fundos; número "
-"negativo indica aplicação em fundos."
#: AnalysisHorizontalPosition.php:139 GLBalanceSheet.php:114
#: GLBalanceSheet.php:365
@@ -1962,11 +1949,11 @@
#: AutomaticTranslationDescriptions.php:5 includes/MainMenuLinksArray.php:573
msgid "Translate Item Descriptions"
-msgstr "Traduzir Descrição Itens"
+msgstr ""
#: AutomaticTranslationDescriptions.php:31
msgid "Description Automatic Translation for empty translations"
-msgstr "Descrição automática para traduções vazias"
+msgstr ""
#: AutomaticTranslationDescriptions.php:35 MaterialsNotUsed.php:33
#: TopItems.php:168
@@ -2012,12 +1999,12 @@
#: AutomaticTranslationDescriptions.php:39
msgid "Translated"
-msgstr "Traduzido"
+msgstr ""
#: AutomaticTranslationDescriptions.php:116
#: AutomaticTranslationDescriptions.php:117
msgid "No item description was automatically translated"
-msgstr "Nenhuma tradução de descrição de item foi feita automaticamente"
+msgstr ""
#: BackupDatabase.php:7 BackupTest.php:6
msgid "Backup webERP Database"
@@ -2200,7 +2187,7 @@
#: BankAccounts.php:203
msgid "Import Format"
-msgstr "Importar Formato"
+msgstr ""
#: BankAccounts.php:204 Currencies.php:461 CustItem.php:299 CustItem.php:415
#: CustomerAllocations.php:351 CustomerReceipt.php:844
@@ -2250,19 +2237,19 @@
#: BankAccounts.php:367
msgid "Transaction Import File Format"
-msgstr "Form. Arq. de Transação para Importar"
+msgstr ""
#: BankAccounts.php:370
msgid "MT940 - Siam Comercial Bank Thailand"
-msgstr "MT940 - Banco Comercial Siam Tailândia"
+msgstr ""
#: BankAccounts.php:371
msgid "MT940 - ING Bank Netherlands"
-msgstr "MT940 - ING Banco Holanda"
+msgstr ""
#: BankAccounts.php:372
msgid "GIFTS - Bank of New Zealand"
-msgstr "GIFTS - Banco Nova Zelandia"
+msgstr ""
#: BankAccounts.php:377
msgid "Currency Of Account"
@@ -2270,7 +2257,7 @@
#: BankAccountUsers.php:6 UserBankAccounts.php:6
msgid "Bank Account Users"
-msgstr "Usuários Conta Bancária"
+msgstr ""
#: BankAccountUsers.php:13
msgid "Bank Account Authorised Users"
@@ -3774,7 +3761,7 @@
#: BOMs.php:787 BOMs_SingleLevel.php:693
msgid "Sequence in BOM"
-msgstr "Sequência BOM"
+msgstr ""
#: BOMs.php:788
msgid "Number with decimal places is acceptable"
@@ -3955,7 +3942,7 @@
#: CollectiveWorkOrderCost.php:49 PDFFGLabel.php:202 PDFWOPrint.php:258
#: PDFWOPrint.php:499 includes/DatabaseTranslations.php:49
msgid "Work Order"
-msgstr "Ordem Produção"
+msgstr ""
#: CollectiveWorkOrderCost.php:76
msgid "There are no data available"
@@ -4142,7 +4129,7 @@
#: CollectiveWorkOrderCost.php:443 PDFWOPrint.php:639 SelectWorkOrder.php:332
msgid "Paperwork"
-msgstr "Ordem Produção"
+msgstr ""
#: CollectiveWorkOrderCost.php:445 ContractOtherReqts.php:159
#: InternalStockRequestAuthorisation.php:105 InternalStockRequest.php:273
@@ -4174,7 +4161,7 @@
#: CollectiveWorkOrderCost.php:480 SelectWorkOrder.php:368
#, php-format
msgid "Print W/O"
-msgstr "Imprimir OP"
+msgstr ""
#: CollectiveWorkOrderCost.php:509 HistoricalTestResults.php:82
#: InternalStockRequest.php:301 MailingGroupMaintenance.php:145
@@ -4635,15 +4622,15 @@
#: ConfirmDispatch_Invoice.php:252
msgid "Dispathed Quantity should not be more than order balanced quantity"
-msgstr "Quantidade Despachada não pode ser maior que quantidade do pedido"
+msgstr ""
#: ConfirmDispatch_Invoice.php:252
msgid "To dispatch quantity is"
-msgstr "Quantidade para despachar é"
+msgstr ""
#: ConfirmDispatch_Invoice.php:252
msgid "And the order balance is "
-msgstr "Saldo do Pedido é"
+msgstr ""
#: ConfirmDispatch_Invoice.php:279
msgid "Confirm Invoice"
@@ -7863,12 +7850,10 @@
"invoiced and that it is possible that the credit note may not already have "
"been done"
msgstr ""
-"Falha na recuperação detalhes pedido ao comparar se o pedido já foi enviado "
-"e a nota de crédito não foi feita"
#: Credit_Invoice.php:501
msgid "The credit quantity for the line for"
-msgstr "Quantidade Credora dessa linha para"
+msgstr ""
#: Credit_Invoice.php:512 SelectCreditItems.php:950
msgid ""
@@ -8169,7 +8154,7 @@
#: Currencies.php:33
msgid "Currencies"
-msgstr "Moeda"
+msgstr ""
#: Currencies.php:56
msgid "The currency already exists in the database"
@@ -8268,11 +8253,10 @@
"Cannot delete this currency because there are bank accounts that use this "
"currency"
msgstr ""
-"Não pode remover essa moeda pois existem contas bancárias utilizando a mesma"
#: Currencies.php:273
msgid "bank accounts that refer to this currency"
-msgstr "contas bancárias que usam essa moeda"
+msgstr ""
#: Currencies.php:278
msgid "The currency definition record has been deleted"
@@ -8306,7 +8290,7 @@
#: Currencies.php:310 Currencies.php:516
msgid "Show in webSHOP"
-msgstr "Exibir no webSHOP"
+msgstr ""
#: Currencies.php:312
msgid "1 / Ex Rate"
@@ -8464,7 +8448,7 @@
#: CustItem.php:6
msgid "Customer Item Data"
-msgstr "Dados Item do Cliente"
+msgstr ""
#: CustItem.php:36 Prices.php:14 PurchData.php:51 RelatedItemsUpdate.php:26
#: StockClone.php:50 StockCostUpdate.php:18 StockReorderLevel.php:17
@@ -8502,12 +8486,12 @@
#: CustItem.php:56
msgid "The customer sells an item by the tonne and we hold stock by the kg"
-msgstr "Unidad de vendas para o cliente TON e nosso estoque em KG"
+msgstr ""
#: CustItem.php:56
msgid ""
"The debtorsmaster.price must be divided by 1000 to get to our cost per kg"
-msgstr "O preço de débito deve ser dividido por 100 para nosso custo por kg"
+msgstr ""
#: CustItem.php:56 PurchData.php:84
msgid "The conversion factor to enter is 1000"
@@ -8519,27 +8503,27 @@
#: CustItem.php:72
msgid "The customer Item details could not be added to the database because"
-msgstr "Detalhes do item do cliente não pode ser adicionado ao DB porque"
+msgstr ""
#: CustItem.php:75
msgid "This customer data has been added to the database"
-msgstr "Dados desse cliente adicionado ao DB"
+msgstr ""
#: CustItem.php:85
msgid "The customer details could not be updated because"
-msgstr "Detalhes do cliente não podem ser atualizados porque"
+msgstr ""
#: CustItem.php:88
msgid "customer data has been updated"
-msgstr "dados do cliente atualizados"
+msgstr ""
#: CustItem.php:109
msgid "The customer details could not be deleted because"
-msgstr "Detalhes do cliente não podem ser movidos porque"
+msgstr ""
#: CustItem.php:111
msgid "This customer data record has been successfully deleted"
-msgstr "Dados desse cliente foram removidos com sucesso"
+msgstr ""
#: CustItem.php:120 CustItem.php:210 CustItem.php:238 PurchData.php:241
#: PurchData.php:373 PurchData.php:401 SupplierPriceList.php:395
@@ -8550,15 +8534,14 @@
msgid ""
"The customer details for the selected part could not be retrieved because"
msgstr ""
-"Detalhes do cliente para o item selecionado não podem ser recuperados porque"
#: CustItem.php:138
msgid "There is no customer data set up for the part selected"
-msgstr "Não há dados do cliente para o item selecionado"
+msgstr ""
#: CustItem.php:145
msgid "Customer Unit"
-msgstr "Unidade do cliente"
+msgstr ""
#: CustItem.php:146 PurchData.php:274 SupplierPriceList.php:536
msgid "Conversion Factor"
@@ -8566,23 +8549,21 @@
#: CustItem.php:147 SelectOrderItems.php:1642
msgid "Customer Item"
-msgstr "Item Cliente"
+msgstr ""
#: CustItem.php:148
msgid "Customer Description"
-msgstr "Descrição Cliente"
+msgstr ""
#: CustItem.php:167
#, php-format
msgid "Are you sure you wish to delete this customer data?"
-msgstr "Confirma remoção dos dados desse cliente?"
+msgstr ""
#: CustItem.php:196
msgid ""
"The customer details for the selected customer could not be retrieved because"
msgstr ""
-"Detalhes do cliente para o cliente selecionado não podem ser recuperados "
-"porque"
#: CustItem.php:205 Z_ChangeCustomerCode.php:20
msgid "The customer code"
@@ -8590,19 +8571,17 @@
#: CustItem.php:205
msgid "is not an existing customer in the database"
-msgstr "cliente não existente no DB"
+msgstr ""
#: CustItem.php:205
msgid ""
"You must enter an alternative customer code or select a customer using the "
"search facility below"
msgstr ""
-"Favor informar um código cliente alternativo ou selecionar um cliente "
-"usando a função pesquisar"
#: CustItem.php:218
msgid "Text in the customer"
-msgstr "Texto no nome do Cliente"
+msgstr ""
#: CustItem.php:218 PurchData.php:381 SellThroughSupport.php:200
#: SupplierPriceList.php:404
@@ -8611,7 +8590,7 @@
#: CustItem.php:221
msgid "Text in customer"
-msgstr "Texto no Nome do Cliente"
+msgstr ""
#: CustItem.php:221 PurchData.php:384 SellThroughSupport.php:203
#: SupplierPriceList.php:407
@@ -8620,24 +8599,22 @@
#: CustItem.php:227
msgid "Find Customers Now"
-msgstr "Pesquisar Clientes agora"
+msgstr ""
#: CustItem.php:243
msgid ""
"Customer Name keywords have been used in preference to the customer Code "
"extract entered"
msgstr ""
-"Palavras chave Nome de Cliente usada em detrimento do código do Cliente "
-"informado"
#: CustItem.php:273
msgid ""
"The cuswtomer matching the criteria entered could not be retrieved because"
-msgstr "Critério de localizar cliente informado não pode ser recuperado porque"
+msgstr ""
#: CustItem.php:274
msgid "The SQL to retrieve customer details that failed was"
-msgstr "Detalhes, do SQL que falhou, foi"
+msgstr ""
#: CustItem.php:287 OffersReceived.php:107 PurchData.php:459 Stocks.php:594
#: includes/PDFPeriodStockTransListingPageHeader.inc:47
@@ -8671,8 +8648,6 @@
"The customer purchasing details for the selected customer and item could not "
"be retrieved because"
msgstr ""
-"Detalhes de compra do cliente para o cliente selecionado não podem ser "
-"recuperados porque"
#: CustItem.php:394 PurchData.php:583
msgid "A search facility is available below if necessary"
@@ -8684,7 +8659,7 @@
#: CustItem.php:425
msgid "Customer Unit of Measure"
-msgstr "Unidade de medida do cliente"
+msgstr ""
#: CustItem.php:434 PurchData.php:639
msgid "Conversion Factor (to our UOM)"
@@ -8692,11 +8667,11 @@
#: CustItem.php:438
msgid "Customer Stock Code"
-msgstr "Código estoque cliente"
+msgstr ""
#: CustItem.php:442
msgid "Customer Stock Description"
-msgstr "Descrição Estoque do Cliente"
+msgstr ""
#: CustItem.php:455 MailingGroupMaintenance.php:250 ProductSpecs.php:163
#: ProductSpecs.php:238 PurchData.php:763 SellThroughSupport.php:481
@@ -8898,31 +8873,29 @@
#: CustomerAccount.php:6
msgid "Customer Account"
-msgstr "Conta Cliente"
+msgstr ""
#: CustomerAccount.php:14
msgid ""
"To display the account a customer must first be selected from the customer "
"selection screen"
msgstr ""
-"Para exibir a conta do cliente, primeiro selecionar na tela de seleção de "
-"cliente"
#: CustomerAccount.php:15
msgid "Select a Customer Account to Display"
-msgstr "Selecionar Conta Cliente para Exibir"
+msgstr ""
#: CustomerAccount.php:28 CustomerInquiry.php:28
msgid "Failed to retrieve sales data"
-msgstr "Falha na recuperação dados de venda"
+msgstr ""
#: CustomerAccount.php:37
msgid "There is no salesman data set for this customer"
-msgstr "Não há dados do vendedor para esse cliente"
+msgstr ""
#: CustomerAccount.php:42
msgid "You have no authority to review this customer account"
-msgstr "Seu usuário/login não tem permissão para revisar conta desse cliente"
+msgstr ""
#: CustomerAccount.php:56 PrintCustStatements.php:139
msgid ""
@@ -8950,11 +8923,11 @@
#: CustomerAccount.php:216 CustomerInquiry.php:158
msgid "Back to Customer Screen"
-msgstr "voltar para Tela Clientes"
+msgstr ""
#: CustomerAccount.php:220
msgid "Customer Statement For"
-msgstr "Dados Cliente para"
+msgstr ""
#: CustomerAccount.php:231 CustomerInquiry.php:162 CustomerReceipt.php:1028
#: SelectOrderItems.php:698 SupplierCredit.php:264 SupplierInquiry.php:123
@@ -9017,11 +8990,11 @@
#: CustomerAccount.php:275
msgid "TRANSACTIONS SETTLED SINCE"
-msgstr "Transações lançadas desde"
+msgstr ""
#: CustomerAccount.php:278
msgid "OUTSTANDING TRANSACTIONS"
-msgstr "Transações Pendentes de Conciliação"
+msgstr ""
#: CustomerAccount.php:306 CustomerInquiry.php:311 CustomerInquiry.php:357
#: CustomerInquiry.php:396 CustomerTransInquiry.php:140
@@ -9297,7 +9270,7 @@
#: CustomerBalancesMovement.php:5 CustomerBalancesMovement.php:12
#: includes/MainMenuLinksArray.php:118
msgid "Customer Activity and Balances"
-msgstr "Atividade Cliente e Saldos"
+msgstr ""
#: CustomerBalancesMovement.php:38 CustomerBranches.php:787
#: SalesAnalRepts.php:20 SalesAnalRepts.php:22 SalesInquiry.php:776
@@ -9328,16 +9301,16 @@
#: CustomerBalancesMovement.php:66
msgid "Create CSV"
-msgstr "Criar CSV"
+msgstr ""
#: CustomerBalancesMovement.php:73
msgid "Show Customer Balance Movements"
-msgstr "Exibir Saldo Movimento Cliente"
+msgstr ""
#: CustomerBalancesMovement.php:116 CustomerBalancesMovement.php:122
#: CustomerBalancesMovement.php:195 includes/DatabaseTranslations.php:55
msgid "Opening Balance"
-msgstr "Saldo Abertura"
+msgstr ""
#: CustomerBalancesMovement.php:117 CustomerBalancesMovement.php:122
#: CustomerBalancesMovement.php:196 GLTransInquiry.php:50
@@ -9346,7 +9319,7 @@
#: CustomerBalancesMovement.php:201 CustomerBalancesMovement.php:209
msgid "TOTALS"
-msgstr "TOTAIS"
+msgstr ""
#: CustomerBranches.php:6
msgid "Customer Branches"
@@ -9424,8 +9397,6 @@
"Warning - Geocode Integration is enabled, but no hosts are setup. Go to "
"Geocode Setup"
msgstr ""
-"Atenção - integração Geocode habilitada, mas nenhum host configurado. Vá "
-"para Config Geocode"
#: CustomerBranches.php:134
msgid "Geocode Notice"
@@ -9531,7 +9502,6 @@
"Cannot delete this branch because it is the only branch defined for this "
"customer."
msgstr ""
-"Não pode remover essa sucursal pois é a única definida para esse cliente"
#: CustomerBranches.php:355
msgid "The branch record could not be deleted"
@@ -9840,23 +9810,23 @@
#: CustomerInquiry.php:37
msgid "There is no salesman data set for this debtor"
-msgstr "Não há dados de vendedor para esse Devedor"
+msgstr ""
#: CustomerInquiry.php:42
msgid "You have no authority to review this data"
-msgstr "Seu login não tem autoridade para revisar esses dados"
+msgstr ""
#: CustomerInquiry.php:57
msgid "The balance status should be all or zero balance or not zero balance"
-msgstr "Status do saldo deve ser tudo ou saldo zero"
+msgstr ""
#: CustomerInquiry.php:194 CustomerInquiry.php:199 CustomerInquiry.php:203
msgid "Invoices not fully allocated"
-msgstr "Pedidos não alocados totalmente"
+msgstr ""
#: CustomerInquiry.php:195 CustomerInquiry.php:200 CustomerInquiry.php:204
msgid "Invoices fully allocated"
-msgstr "Pedidos totalmente alocados"
+msgstr ""
#: CustomerInquiry.php:236 SupplierInquiry.php:194
msgid "No transactions were returned by the SQL because"
@@ -9879,12 +9849,12 @@
#: CustomerInquiry.php:328 CustomerInquiry.php:455 CustomerInquiry.php:530
#: CustomerInquiry.php:586 CustomerInquiry.php:636 SupplierInquiry.php:276
msgid "Click to view the GL entries"
-msgstr "Clique para ver lançamentos GL"
+msgstr ""
#: CustomerInquiry.php:330 CustomerInquiry.php:457 CustomerInquiry.php:532
#: CustomerInquiry.php:588 CustomerInquiry.php:638 SupplierInquiry.php:277
msgid "GL Entries"
-msgstr "Entradas GL"
+msgstr ""
#: CustomerPurchases.php:6
msgid "Customer Purchases"
@@ -9990,10 +9960,6 @@
"accounts are automatically maintained. This setting can be disabled in "
"System Configuration"
msgstr ""
-"Pagamentos envolvendo conta de controle de devedores não pode ser informada. "
-"integração para devedores contábeis (AR) está habilidado, portanto as contas "
-"são automaticamente mantidas. Essas configurações podem ser desabilitadas em "
-"Config Sistema"
#: CustomerReceipt.php:187 Payments.php:707
msgid ""
@@ -10002,18 +9968,12 @@
"enabled so control accounts are automatically maintained. This setting can "
"be disabled in System Configuration"
msgstr ""
-"Pagamentos envolvendo contas contábeis de controle de credores ou suspensão "
-"dos recebimentos não podem ser informados. Integração contábil para módulo "
-"(AP) podem ser automaticamente mantidas. Essa configuração pode ser feita em "
-"Config Sistema"
#: CustomerReceipt.php:191 Payments.php:711
msgid ""
"Payments involving the retained earnings control account cannot be entered. "
"This account is automtically maintained."
msgstr ""
-"Conta Contábil dos pagamentos envolvendo retençao de lucros não pode ser "
-"informada. Essa conta é automaticamente mantida."
#: CustomerReceipt.php:240
msgid "The company has not yet been set up properly"
@@ -10244,7 +10204,7 @@
#: CustomerReceipt.php:1043
msgid "Customer Transaction Inquiry"
-msgstr "Consulta Transações Cliente"
+msgstr ""
#: CustomerReceipt.php:1052 SelectGLAccount.php:129 SelectGLAccount.php:144
#, php-format
@@ -10456,24 +10416,22 @@
#: Customers.php:323
msgid "Cannot delete this customer because users exist that refer to it"
-msgstr "Não pode remover esse cliente pois existem usuários que o utilizam."
+msgstr ""
#: Customers.php:333
msgid ""
"Cannot delete this customer because contracts have been created that refer "
"to it"
msgstr ""
-"Não pode remover este cliente porque contratos foram criados referindo-se a "
-"ele"
#: Customers.php:334
msgid "contracts referring to this customer"
-msgstr "contratos que referem esse cliente"
+msgstr ""
#: Customers.php:348
msgid ""
"has been deleted - together with all the associated branches and contacts"
-msgstr "foi removido. junto com todas as sucursais e contatos associados"
+msgstr ""
#: Customers.php:424
msgid ""
@@ -11090,11 +11048,11 @@
#: Dashboard.php:6 Dashboard.php:10
msgid "Dashboard"
-msgstr "Painel Controle"
+msgstr ""
#: Dashboard.php:15 Dashboard.php:42
msgid "The security for Aging Debtors cannot be retrieved because"
-msgstr "A securança para Saldo de Devedores não ode ser recuperada porque."
+msgstr ""
#: Dashboard.php:16 Dashboard.php:25 Dashboard.php:34 Dashboard.php:43
#: ProductSpecs.php:78 ProductSpecs.php:282 ProductSpecs.php:317
@@ -11107,15 +11065,15 @@
#: Dashboard.php:24
msgid "The security for upcoming payments cannot be retrieved because"
-msgstr "A segurança para pagamentos não pode ser recuperada porque"
+msgstr ""
#: Dashboard.php:33
msgid "The security for G/L Accounts cannot be retrieved because"
-msgstr "A segurança para conta GL não pode ser recuperada porque"
+msgstr ""
#: Dashboard.php:49
msgid "Overdue Customer Balances"
-msgstr "Saldo do Cliente Excedido"
+msgstr ""
#: Dashboard.php:55 includes/PDFCustTransListingPageHeader.inc:50
#: includes/PDFPeriodStockTransListingPageHeader.inc:49
@@ -11152,7 +11110,7 @@
#: Dashboard.php:367
msgid "Supplier Invoices Due within 1 Month"
-msgstr "Ordem Compra Acum em 1 Mês"
+msgstr ""
#: Dashboard.php:372 PrintCustTrans.php:788 PrintCustTransPortrait.php:857
#: SalesInquiry.php:1088 SupplierInvoice.php:634
@@ -11161,7 +11119,7 @@
#: Dashboard.php:374
msgid "Amount Due"
-msgstr "Valor Acum."
+msgstr ""
#: Dashboard.php:437 SuppPaymentRun.php:111
msgid "The details of supplier invoices due could not be retrieved because"
@@ -11173,7 +11131,7 @@
#: Dashboard.php:526
msgid "Bank and Credit Card Balances"
-msgstr "Saldo Bancário e Cartão Crédito"
+msgstr ""
#: Dashboard.php:601 Dashboard.php:620 GLAccountCSV.php:193
#: GLAccountCSV.php:222 GLAccountInquiry.php:210 GLAccountInquiry.php:247
@@ -11183,7 +11141,7 @@
#: Dashboard.php:653
msgid "Outstanding Orders"
-msgstr "Ordens Pendentes"
+msgstr ""
#: Dashboard.php:656 ../webSHOP/includes/Functions.php:63
#: ../webSHOP/includes/header.php:193
@@ -12940,7 +12898,7 @@
#: FixedAssetCategories.php:316
msgid "Profit or Loss on Disposal GL Code"
-msgstr "Código GL Lucros e Perdas "
+msgstr ""
#: FixedAssetCategories.php:317
msgid ""
@@ -14064,7 +14022,7 @@
#: geocode.php:54
msgid "Customer Code: "
-msgstr "Código Cliente:"
+msgstr ""
#: geocode.php:89
msgid "failed to geocode."
@@ -14206,7 +14164,7 @@
#: geo_displaymap_customers.php:5
msgid "Geocoded Customers Report"
-msgstr "Relatório de Clientes com GeoCode"
+msgstr ""
#: geo_displaymap_customers.php:118 geo_displaymap_suppliers.php:118
msgid "Go to Geocode Setup"
@@ -14673,21 +14631,21 @@
#: GLAccountUsers.php:191 LocationUsers.php:192
msgid "Are you sure you wish to remove Update for this user?"
-msgstr "Confirma remover usuário para o Local?"
+msgstr ""
#: GLAccountUsers.php:191 LocationUsers.php:192 UserGLAccounts.php:197
#: UserLocations.php:193
msgid "Remove Update"
-msgstr "Remoção atualizada"
+msgstr ""
#: GLAccountUsers.php:194 LocationUsers.php:194
msgid "Are you sure you wish to add Update for this user?"
-msgstr "Confirma adição para esse usuário?"
+msgstr ""
#: GLAccountUsers.php:194 LocationUsers.php:194 UserGLAccounts.php:200
#: UserLocations.php:195
msgid "Add Update"
-msgstr "Adic. Atualização"
+msgstr ""
#: GLAccountUsers.php:201
msgid "GL account does not have access permissions for users"
@@ -14707,7 +14665,7 @@
#: GLBalanceShee...
[truncated message content] |
|
From: <dai...@us...> - 2016-05-28 05:44:36
|
Revision: 7544
http://sourceforge.net/p/web-erp/reponame/7544
Author: daintree
Date: 2016-05-28 05:44:34 +0000 (Sat, 28 May 2016)
Log Message:
-----------
dont print statements if there is an email address set up for the customer
Modified Paths:
--------------
trunk/PrintCustStatements.php
trunk/SelectCustomer.php
trunk/doc/Manual/ManualAccountsReceivable.html
Modified: trunk/PrintCustStatements.php
===================================================================
--- trunk/PrintCustStatements.php 2016-05-28 04:41:56 UTC (rev 7543)
+++ trunk/PrintCustStatements.php 2016-05-28 05:44:34 UTC (rev 7544)
@@ -34,6 +34,7 @@
}
If (isset($_POST['PrintPDF']) AND isset($_POST['FromCust']) AND $_POST['FromCust']!=''){
+
$_POST['FromCust'] = mb_strtoupper($_POST['FromCust']);
If (!isset($_POST['ToCust'])){
@@ -123,23 +124,29 @@
while ($StmtHeader=DB_fetch_array($StatementResults)){ /*loop through all the customers returned */
+ if (isset($RecipientArray)) {
+ unset($RecipientArray);
+ }
+ $RecipientArray = array();
+ $RecipientsResult = DB_query("SELECT email FROM custcontacts WHERE statement=1 AND debtorno='" . $StmtHeader['debtorno'] . "'");
+ while ($RecipientRow = DB_fetch_row($RecipientsResult)){
+ if (IsEmailAddress($RecipientRow[0])){
+ $RecipientArray[] = $RecipientRow[0];
+ }
+ }
if ($_POST['EmailOrPrint']=='email'){
- if (isset($RecipientArray)) {
- unset($RecipientArray);
- }
- $RecipientArray = array();
include('includes/PDFStarter.php');
$pdf->addInfo('Title', $_SESSION['CompanyRecord']['coyname'] . ' - ' . _('Customer Statement') );
$pdf->addInfo('Subject', _('For customer') . ': ' . $StmtHeader['name']);
$PageNumber = 1;
- $RecipientsResult = DB_query("SELECT email FROM custcontacts WHERE statement=1 AND debtorno='" . $StmtHeader['debtorno'] . "'");
- while ($RecipientRow = DB_fetch_row($RecipientsResult)){
- if (IsEmailAddress($RecipientRow[0])){
- $RecipientArray[] = $RecipientRow[0];
- }
}
- if ($_POST['EmailOrPrint']=='print' OR
+/*Only create the pdf for this customer if
+ * set to print and there are no email addresses defined
+ * OR
+ * set to email and there are email addresses defined.
+ */
+ if (($_POST['EmailOrPrint']=='print' AND count($RecipientArray)==0) OR
($_POST['EmailOrPrint']=='email' AND count($RecipientArray)>0) ){
$line_height=16;
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2016-05-28 04:41:56 UTC (rev 7543)
+++ trunk/SelectCustomer.php 2016-05-28 05:44:34 UTC (rev 7544)
@@ -262,12 +262,11 @@
echo '<tr>
<td colspan="2">', _('Enter a partial Name'), ':</td>
- <td><input type="text" maxlength="25" name="Keywords" size="20" ',
+ <td><input type="text" maxlength="25" name="Keywords" title="', _('If there is an entry in this field then customers with the text entered in their name will be returned') , '" size="20" ',
( isset($_POST['Keywords']) ? 'value="' . $_POST['Keywords'] . '" ' : '' ), '/></td>';
echo '<td><b>', _('OR'), '</b></td><td>', _('Enter a partial Code'), ':</td>
- <td><input maxlength="18" name="CustCode" pattern="[\w-]*" size="15" type="text" ',
- (isset($_POST['CustCode']) ? 'value="' . $_POST['CustCode'] . '" ' : '' ), '/></td>
+ <td><input maxlength="18" name="CustCode" pattern="[\w-]*" size="15" type="text" title="', _('If there is an entry in this field then customers with the text entered in their customer code will be returned') , '" ', (isset($_POST['CustCode']) ? 'value="' . $_POST['CustCode'] . '" ' : '' ), '/></td>
</tr>';
echo '<tr>
Modified: trunk/doc/Manual/ManualAccountsReceivable.html
===================================================================
--- trunk/doc/Manual/ManualAccountsReceivable.html 2016-05-28 04:41:56 UTC (rev 7543)
+++ trunk/doc/Manual/ManualAccountsReceivable.html 2016-05-28 05:44:34 UTC (rev 7544)
@@ -186,6 +186,7 @@
<h2><a id="CustomerStatements">Customer Statements</a></h2>
<p>Customer statements can either be printed or emailed directly to all the customers in the selected range, that have a contact defined as receiving a statement. If there are no contacts defined for the customer that have the statement flag set to yes then their statement will not be emailed to them. If the customer has many contacts with several of them having the statement flag set to yes then all those contacts will receive a copy of the pdf statement.</p>
+<p>If the customer has any contacts that have the statement flag set then it will not be possible to print their statement so as to avoid sending both a printed statement and an email statement</p>
<div class="floatright">
|
|
From: <rc...@us...> - 2016-05-28 18:19:19
|
Revision: 7545
http://sourceforge.net/p/web-erp/reponame/7545
Author: rchacon
Date: 2016-05-28 18:19:17 +0000 (Sat, 28 May 2016)
Log Message:
-----------
Add help and standardise authorise vs. authorize.
Modified Paths:
--------------
trunk/doc/Manual/ManualGeneralLedger.html
trunk/doc/Manual/ManualSpecialUtilities.html
trunk/includes/MainMenuLinksArray.php
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
Modified: trunk/doc/Manual/ManualGeneralLedger.html
===================================================================
--- trunk/doc/Manual/ManualGeneralLedger.html 2016-05-28 05:44:34 UTC (rev 7544)
+++ trunk/doc/Manual/ManualGeneralLedger.html 2016-05-28 18:19:17 UTC (rev 7545)
@@ -429,10 +429,10 @@
<!--h3><a id="BankAccounts.php">Bank Accounts</a></h3>
<p>.</p-->
-<h3><a id="BankAccountUsers">Bank Account Authorized Users</a></h3>
+<h3><a id="BankAccountUsers">Bank Account Authorised Users</a></h3>
<p>This software has methods to assign permissions or access rights to specific users and groups of users. The system controls the ability of the users to view and make changes to the contents of the bank accounts.</p>
<p>With this script, you can add or remove the access permission for each user that grants or denies his ability to view or update that bank account.</p>
-<h3><a id="UserBankAccounts">User Authorized Bank Accounts</a></h3>
+<h3><a id="UserBankAccounts">User Authorised Bank Accounts</a></h3>
<p>This software has methods to assign permissions or access rights to specific users and groups of users. The system controls the ability of the users to view and make changes to the contents of the bank accounts.</p>
<p>With this script, you can add or remove the access permission for each bank account that grants or denies the ability of that user to view or update it.</p>
Modified: trunk/doc/Manual/ManualSpecialUtilities.html
===================================================================
--- trunk/doc/Manual/ManualSpecialUtilities.html 2016-05-28 05:44:34 UTC (rev 7544)
+++ trunk/doc/Manual/ManualSpecialUtilities.html 2016-05-28 18:19:17 UTC (rev 7545)
@@ -50,7 +50,7 @@
<p>It translates from the item description in the default language (It was set up in $DefaultLanguage in config) to the languages to maintain translations for item descriptions (They were set up in <u>Main Menu</u> > <u>Setup</u> > General Setup Options > <u>System Parameters</u> > General Settings). It only translates descriptions of items that are current (stockmaster.discontinued=0).</p>
-<p>It requieres a Google Translator API Key (more info in <a href="https://cloud.google.com/translate/" target=_blank">https://cloud.google.com/translate/</a>) to allow automatic translations.</p>
+<p>It requieres a Google Translator API Key (more info in <a href="https://cloud.google.com/translate/" target="_blank">https://cloud.google.com/translate/</a>) to allow automatic translations.</p>
<p>See also: In <a href="ManualContents.php?ViewTopic=Inventory">Inventory (aka "Stock")</a>, <a href="ManualContents.php?ViewTopic=Inventory#ReviewTranslatedDescriptions">Review Translated Descriptions</a>.</p>
@@ -70,6 +70,11 @@
<p>This utility allows you to the copy access rights to general ledger accounts from one user to another. This utility overwrites all the access rights of the destination user.</p>
+<p>If you need to change a specific GL account access permissions for users, see: <a href="ManualContents.php?ViewTopic=GeneralLedger#GLAccountUsers">GL Account Authorised Users</a>.</p>
+
+<p>If you need to change a specific user access permissions to GL accounts, see: <a href="ManualContents.php?ViewTopic=GeneralLedger#UserGLAccounts">User Authorised GL Accounts</a>.</p>
+
+
<!-- "Inquiries and Reports" -->
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2016-05-28 05:44:34 UTC (rev 7544)
+++ trunk/includes/MainMenuLinksArray.php 2016-05-28 18:19:17 UTC (rev 7545)
@@ -403,8 +403,8 @@
_('GL Budgets'),
_('GL Tags'),
_('Bank Accounts'),
- _('Bank Account Authorized Users'),
- _('User Authorized Bank Accounts'));
+ _('Bank Account Authorised Users'),
+ _('User Authorised Bank Accounts'));
$MenuItems['GL']['Maintenance']['URL'] = array( '/AccountSections.php',
'/AccountGroups.php',
Modified: trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2016-05-28 05:44:34 UTC (rev 7544)
+++ trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2016-05-28 18:19:17 UTC (rev 7545)
@@ -9,7 +9,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-05-16 21:31+1200\n"
-"PO-Revision-Date: 2014-08-18 13:58-0600\n"
+"PO-Revision-Date: 2016-05-28 12:08-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: WebERP Translation Team <web-erp-translation@lists."
"sourceforge.net>\n"
@@ -2216,11 +2216,11 @@
#: BankAccountUsers.php:13
msgid "Bank Account Authorised Users"
-msgstr ""
+msgstr "Bank Account Authorized Users"
#: BankAccountUsers.php:14
msgid "Maintenance Of Bank Account Authorised Users"
-msgstr ""
+msgstr "Maintenance Of Bank Account Authorized Users"
#: BankAccountUsers.php:37
msgid "You have not selected any bank account"
@@ -2240,7 +2240,7 @@
#: BankAccountUsers.php:77
msgid "has been authorised to use"
-msgstr ""
+msgstr "has been authorized to use"
#: BankAccountUsers.php:77 BankAccountUsers.php:90 BankAccountUsers.php:147
msgid "bank account"
@@ -2252,7 +2252,7 @@
#: BankAccountUsers.php:90
msgid "has been un-authorised to use"
-msgstr ""
+msgstr "has been un-authorized to use"
#: BankAccountUsers.php:103 UserBankAccounts.php:195
msgid "Select Bank Account"
@@ -2303,11 +2303,11 @@
#: BankAccountUsers.php:147 LocationUsers.php:153
msgid "Authorised users for"
-msgstr ""
+msgstr "Authorized users for"
#: BankAccountUsers.php:165
msgid "Authorised users for bank account"
-msgstr ""
+msgstr "Authorized users for bank account"
#: BankAccountUsers.php:167 GLAccountUsers.php:150 LocationUsers.php:174
msgid "User Code"
@@ -14124,7 +14124,7 @@
#: GLAccountUsers.php:6 GLAccountUsers.php:43 GLAccountUsers.php:44
#: GLAccountUsers.php:85
msgid "GL Account Authorised Users"
-msgstr ""
+msgstr "GL Account Authorized Users"
#: GLAccountUsers.php:46
msgid "You have not selected any GL Account"
@@ -14136,7 +14136,7 @@
#: GLAccountUsers.php:86
msgid "Authorised Users for"
-msgstr ""
+msgstr "Authorized Users for"
#: GLAccountUsers.php:91
msgid "You have not selected an user to be authorised to use this GL Account"
@@ -14144,7 +14144,7 @@
#: GLAccountUsers.php:102
msgid "is already authorised to use this GL Account"
-msgstr ""
+msgstr "is already authorized to use this GL Account"
#: GLAccountUsers.php:115
msgid "An access permission for a user could not be added"
@@ -16745,11 +16745,11 @@
#: LocationUsers.php:5 includes/MainMenuLinksArray.php:544
msgid "Inventory Location Authorised Users Maintenance"
-msgstr ""
+msgstr "Inventory Location Authorized Users Maintenance"
#: LocationUsers.php:10
msgid "Location Authorised Users"
-msgstr ""
+msgstr "Location Authorized Users"
#: LocationUsers.php:33
msgid "You have not selected any Location"
@@ -16761,7 +16761,7 @@
#: LocationUsers.php:65
msgid "is already authorised to use this location"
-msgstr ""
+msgstr "is already authorized to use this location"
#: LocationUsers.php:77 UserBankAccounts.php:74 UserLocations.php:77
msgid "authority to use the"
@@ -16796,7 +16796,7 @@
#: LocationUsers.php:171
msgid "Authorised users for Location"
-msgstr ""
+msgstr "Authorized users for Location"
#: MailingGroupMaintenance.php:3 includes/MainMenuLinksArray.php:490
msgid "Mailing Group Maintenance"
@@ -21651,7 +21651,7 @@
#: PO_Items.php:100 PurchaseByPrefSupplier.php:168 SelectSalesOrder.php:207
#: SelectSalesOrder.php:373 SpecialOrder.php:314
msgid "Order Created and Authorised by"
-msgstr ""
+msgstr "Order Created and Authorized by"
#: PO_Items.php:105 PurchaseByPrefSupplier.php:173 SelectSalesOrder.php:219
#: SelectSalesOrder.php:385 SpecialOrder.php:319
@@ -22167,7 +22167,7 @@
#: PO_PDFPurchOrder.php:140
msgid "Purchase orders can only be printed once they have been authorised"
-msgstr ""
+msgstr "Purchase orders can only be printed once they have been authorized"
#: PO_PDFPurchOrder.php:140
msgid "This order is currently at a status of"
@@ -22429,7 +22429,7 @@
#: PO_SelectOSPurchOrder.php:228 PO_SelectOSPurchOrder.php:230
msgid "Pending and Authorised"
-msgstr ""
+msgstr "Pending and Authorized"
#: PO_SelectOSPurchOrder.php:256
msgid "Orders Between"
@@ -22495,7 +22495,7 @@
#: PO_SelectPurchOrder.php:136 PO_SelectPurchOrder.php:138
msgid "Pending/Authorised/Completed"
-msgstr ""
+msgstr "Pending/Authorized/Completed"
#: PO_SelectPurchOrder.php:435
msgid "Requisition"
@@ -36349,7 +36349,7 @@
#: UserBankAccounts.php:11
msgid "User Authorised Bank Accounts"
-msgstr ""
+msgstr "User Authorized Bank Accounts"
#: UserBankAccounts.php:34 UserLocations.php:33
msgid "You have not selected any User"
@@ -36365,7 +36365,7 @@
#: UserBankAccounts.php:66 UserGLAccounts.php:103 UserLocations.php:65
msgid "is already authorised for this user"
-msgstr ""
+msgstr "is already authorized for this user"
#: UserBankAccounts.php:74
msgid "bank account has been changed"
@@ -36381,11 +36381,11 @@
#: UserBankAccounts.php:141
msgid "Authorised bank accounts for"
-msgstr ""
+msgstr "Authorized bank accounts for"
#: UserBankAccounts.php:157
msgid "Authorised bank accounts for User"
-msgstr ""
+msgstr "Authorized bank accounts for User"
#: UserBankAccounts.php:177
#, php-format
@@ -36395,7 +36395,7 @@
#: UserGLAccounts.php:6 UserGLAccounts.php:40 UserGLAccounts.php:41
#: UserGLAccounts.php:87
msgid "User Authorised GL Accounts"
-msgstr ""
+msgstr "User Authorized GL Accounts"
#: UserGLAccounts.php:46
msgid "You have not selected any user"
@@ -36403,7 +36403,7 @@
#: UserGLAccounts.php:88
msgid "Authorised GL Accounts for"
-msgstr ""
+msgstr "Authorized GL Accounts for"
#: UserGLAccounts.php:93
msgid "You have not selected an GL Account to be authorised for this user"
@@ -36459,11 +36459,11 @@
#: UserLocations.php:5 includes/MainMenuLinksArray.php:545
msgid "User Authorised Inventory Locations Maintenance"
-msgstr ""
+msgstr "User Authorized Inventory Locations Maintenance"
#: UserLocations.php:10
msgid "User Authorised Locations"
-msgstr ""
+msgstr "User Authorized Locations"
#: UserLocations.php:46
msgid ""
@@ -36476,11 +36476,11 @@
#: UserLocations.php:154
msgid "Authorised inventory locations for"
-msgstr ""
+msgstr "Authorized inventory locations for"
#: UserLocations.php:172
msgid "Authorised Inventory Locations for User"
-msgstr ""
+msgstr "Authorized Inventory Locations for User"
#: UserLocations.php:193
msgid "Are you sure you wish to remove Update for this location?"
@@ -43684,11 +43684,11 @@
#: includes/MainMenuLinksArray.php:403
msgid "GL Accounts Authorised Users Maintenance"
-msgstr ""
+msgstr "GL Accounts Authorized Users Maintenance"
#: includes/MainMenuLinksArray.php:404
msgid "User Authorised GL Accounts Maintenance"
-msgstr ""
+msgstr "User Authorized GL Accounts Maintenance"
#: includes/MainMenuLinksArray.php:405
msgid "Copy Authority GL Accounts from user A to B"
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 2016-05-28 05:44:34 UTC (rev 7544)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-05-28 18:19:17 UTC (rev 7545)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-05-16 21:31+1200\n"
-"PO-Revision-Date: 2016-05-20 19:57-0600\n"
+"PO-Revision-Date: 2016-05-28 11:40-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -2306,7 +2306,7 @@
#: BankAccountUsers.php:13
msgid "Bank Account Authorised Users"
-msgstr "Usuarios autorizados en cuentas bancarias"
+msgstr "Usuarios autorizados por cuenta bancaria"
#: BankAccountUsers.php:14
msgid "Maintenance Of Bank Account Authorised Users"
@@ -46548,7 +46548,7 @@
#: includes/MainMenuLinksArray.php:407
msgid "Bank Account Authorized Users"
-msgstr "Usuarios autorizados en cuenta bancaria"
+msgstr "Usuarios autorizados por cuenta bancaria"
#: includes/MainMenuLinksArray.php:408
msgid "User Authorized Bank Accounts"
|
|
From: <rc...@us...> - 2016-05-29 15:42:57
|
Revision: 7546
http://sourceforge.net/p/web-erp/reponame/7546
Author: rchacon
Date: 2016-05-29 15:42:54 +0000 (Sun, 29 May 2016)
Log Message:
-----------
Minor changes (formating code).
Modified Paths:
--------------
trunk/PrintCustTransPortrait.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2016-05-28 18:19:17 UTC (rev 7545)
+++ trunk/PrintCustTransPortrait.php 2016-05-29 15:42:54 UTC (rev 7546)
@@ -1,6 +1,6 @@
<?php
-
/* $Id$ */
+/* */
include('includes/session.inc');
@@ -8,27 +8,27 @@
$BookMark = 'PrintInvoicesCredits';
-if (isset($_GET['FromTransNo'])) {
+if(isset($_GET['FromTransNo'])) {
$FromTransNo = filter_number_format($_GET['FromTransNo']);
-} elseif (isset($_POST['FromTransNo'])){
+} elseif(isset($_POST['FromTransNo'])) {
$FromTransNo = filter_number_format($_POST['FromTransNo']);
} else {
$FromTransNo = '';
}
-if (isset($_GET['InvOrCredit'])) {
+if(isset($_GET['InvOrCredit'])) {
$InvOrCredit = $_GET['InvOrCredit'];
-} elseif (isset($_POST['InvOrCredit'])) {
+} elseif(isset($_POST['InvOrCredit'])) {
$InvOrCredit = $_POST['InvOrCredit'];
}
-if (isset($_GET['PrintPDF'])) {
+if(isset($_GET['PrintPDF'])) {
$PrintPDF = $_GET['PrintPDF'];
-} elseif (isset($_POST['PrintPDF'])) {
+} elseif(isset($_POST['PrintPDF'])) {
$PrintPDF = $_POST['PrintPDF'];
}
-If (!isset($_POST['ToTransNo'])
+if(!isset($_POST['ToTransNo'])
OR trim($_POST['ToTransNo'])==''
OR filter_number_format($_POST['ToTransNo']) < $FromTransNo) {
@@ -37,11 +37,11 @@
$FirstTrans = $FromTransNo; /* Need to start a new page only on subsequent transactions */
-If (isset($PrintPDF)
+if(isset($PrintPDF)
and $PrintPDF!=''
and isset($FromTransNo)
and isset($InvOrCredit)
- and $FromTransNo!=''){
+ and $FromTransNo!='') {
include ('includes/class.pdf.php');
@@ -57,7 +57,7 @@
$pdf->addInfo('Author','webERP ' . $Version);
$pdf->addInfo('Creator','webERP http://www.weberp.org');
- if ($InvOrCredit=='Invoice'){
+ if($InvOrCredit=='Invoice') {
$pdf->addInfo('Title',_('Sales Invoice') . ' ' . $FromTransNo . ' to ' . $_POST['ToTransNo']);
$pdf->addInfo('Subject',_('Invoices from') . ' ' . $FromTransNo . ' ' . _('to') . ' ' . $_POST['ToTransNo']);
} else {
@@ -77,7 +77,7 @@
//Keep a record of the user's language
$UserLanguage = $_SESSION['Language'];
- while ($FromTransNo <= filter_number_format($_POST['ToTransNo'])){
+ while ($FromTransNo <= filter_number_format($_POST['ToTransNo'])) {
/*retrieve the invoice details from the database to print
notice that salesorder record must be present to print the invoice purging of sales orders will
@@ -90,8 +90,8 @@
FROM bankaccounts
WHERE bankaccounts.invoice = '1'";
$result=DB_query($sql,'','',false,false);
- if (DB_error_no()!=1) {
- if (DB_num_rows($result)==1){
+ if(DB_error_no()!=1) {
+ if(DB_num_rows($result)==1) {
$myrow = DB_fetch_array($result);
$DefaultBankAccountNumber = _('Account') .': ' .$myrow['bankaccountnumber'];
$DefaultBankAccountCode = _('Bank Code:') .' ' .$myrow['bankaccountcode'];
@@ -105,7 +105,7 @@
}
// gather the invoice data
- if ($InvOrCredit=='Invoice') {
+ if($InvOrCredit=='Invoice') {
$sql = "SELECT debtortrans.trandate,
debtortrans.ovamount,
debtortrans.ovdiscount,
@@ -178,7 +178,7 @@
WHERE debtortrans.type=10
AND debtortrans.transno='" . $FromTransNo . "'";
- if (isset($_POST['PrintEDI']) and $_POST['PrintEDI']=='No') {
+ if(isset($_POST['PrintEDI']) and $_POST['PrintEDI']=='No') {
$sql = $sql . " AND debtorsmaster.ediinvoices=0";
}
} else {
@@ -233,33 +233,33 @@
AND debtortrans.transno='" . $FromTransNo . "'";
- if (isset($_POST['PrintEDI']) and $_POST['PrintEDI']=='No'){
+ if(isset($_POST['PrintEDI']) and $_POST['PrintEDI']=='No') {
$sql = $sql . ' AND debtorsmaster.ediinvoices=0';
}
}
- $result=DB_query($sql,'','',false,false);
+ $result=DB_query($sql,'','',false,false);
- if (DB_error_no()!=0) {
+ if(DB_error_no()!=0) {
$Title = _('Transaction Print Error Report');
include ('includes/header.inc');
prnMsg( _('There was a problem retrieving the invoice or credit note details for note number') . ' ' . $InvoiceToPrint . ' ' . _('from the database') . '. ' . _('To print an invoice, the sales order record, the customer transaction record and the branch record for the customer must not have been purged') . '. ' . _('To print a credit note only requires the customer, transaction, salesman and branch records be available'),'error');
- if ($debug==1){
+ if($debug==1) {
prnMsg (_('The SQL used to get this information that failed was') . '<br />' . $sql,'error');
}
include ('includes/footer.inc');
exit;
}
- if (DB_num_rows($result)==1){
+ if(DB_num_rows($result)==1) {
$myrow = DB_fetch_array($result);
$ExchRate = $myrow['rate'];
//Change the language to the customer's language
$_SESSION['Language'] = $myrow['language_id'];
include('includes/LanguageSetup.php');
- if ($InvOrCredit == 'Invoice') {
+ if($InvOrCredit == 'Invoice') {
$sql = "SELECT stockmoves.stockid,
stockmaster.description,
-stockmoves.qty as quantity,
@@ -299,49 +299,48 @@
} // end else
$result=DB_query($sql);
- if (DB_error_no()!=0) {
+ if(DB_error_no()!=0) {
$Title = _('Transaction Print Error Report');
include ('includes/header.inc');
echo '<br />' . _('There was a problem retrieving the invoice or credit note stock movement details for invoice number') . ' ' . $FromTransNo . ' ' . _('from the database');
- if ($debug==1){
+ if($debug==1) {
echo '<br />' . _('The SQL used to get this information that failed was') . '<br />' . $sql;
}
include('includes/footer.inc');
exit;
}
+ if(DB_num_rows($result)>0) {
- if (DB_num_rows($result)>0){
-
$FontSize = 10;
$PageNumber = 1;
include('includes/PDFTransPageHeaderPortrait.inc');
$FirstPage = False;
- while ($myrow2=DB_fetch_array($result)){
- if ($myrow2['discountpercent'] == 0) {
- $DisplayDiscount = '';
- } else {
- $DisplayDiscount = locale_number_format($myrow2['discountpercent'] * 100, 2) . '%';
- $DiscountPrice = $myrow2['fxprice'] * (1 - $myrow2['discountpercent']);
- }
+ while ($myrow2=DB_fetch_array($result)) {
+ if($myrow2['discountpercent'] == 0) {
+ $DisplayDiscount = '';
+ } else {
+ $DisplayDiscount = locale_number_format($myrow2['discountpercent'] * 100, 2) . '%';
+ $DiscountPrice = $myrow2['fxprice'] * (1 - $myrow2['discountpercent']);
+ }
$DisplayNet = locale_number_format($myrow2['fxnet'],$myrow['decimalplaces']);
$DisplayPrice = locale_number_format($myrow2['fxprice'],$myrow['decimalplaces']);
$DisplayQty = locale_number_format($myrow2['quantity'],$myrow2['decimalplaces']);
- $LeftOvers = $pdf->addTextWrap($Left_Margin+5,$YPos,71,$FontSize,$myrow2['stockid']);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+5,$YPos,71,$FontSize,$myrow2['stockid']);// Print item code.
//Get translation if it exists
$TranslationResult = DB_query("SELECT descriptiontranslation
FROM stockdescriptiontranslations
WHERE stockid='" . $myrow2['stockid'] . "'
AND language_id='" . $myrow['language_id'] ."'");
- if (DB_num_rows($TranslationResult)==1){ //there is a translation
+ if(DB_num_rows($TranslationResult)==1) { //there is a translation
$TranslationRow = DB_fetch_array($TranslationResult);
- $LeftOvers = $pdf->addTextWrap($Left_Margin+80,$YPos,186,$FontSize,$TranslationRow['descriptiontranslation']);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+80,$YPos,186,$FontSize,$TranslationRow['descriptiontranslation']);// Print translated item short description.
} else {
- $LeftOvers = $pdf->addTextWrap($Left_Margin+80,$YPos,186,$FontSize,$myrow2['description']);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+80,$YPos,186,$FontSize,$myrow2['description']);// Print item short description.
}
$lines=1;
while ($LeftOvers!='') {
@@ -355,18 +354,20 @@
$LeftOvers = $pdf->addTextWrap($Left_Margin+420,$YPos,26,$FontSize,$DisplayDiscount,'right');
$LeftOvers = $pdf->addTextWrap($Page_Width-$Left_Margin-72, $YPos, 72, $FontSize, $DisplayNet, 'right');
- if ($myrow2['controlled']==1){
+ if($myrow2['controlled']==1) {
- $GetControlMovts = DB_query("SELECT moveqty,
- serialno
- FROM stockserialmoves
- WHERE stockmoveno='" . $myrow2['stkmoveno'] . "'");
+ $GetControlMovts = DB_query("
+ SELECT
+ moveqty,
+ serialno
+ FROM stockserialmoves
+ WHERE stockmoveno='" . $myrow2['stkmoveno'] . "'");
- if ($myrow2['serialised']==1){
- while ($ControlledMovtRow = DB_fetch_array($GetControlMovts)){
+ if($myrow2['serialised']==1) {
+ while ($ControlledMovtRow = DB_fetch_array($GetControlMovts)) {
$YPos -= (10*$lines);
$LeftOvers = $pdf->addTextWrap($Left_Margin+82,$YPos,100,$FontSize,$ControlledMovtRow['serialno'],'left');
- if ($YPos-$line_height <= $Bottom_Margin){
+ if($YPos-$line_height <= $Bottom_Margin) {
/* head up a new invoice/credit note page */
/*draw the vertical column lines right to the bottom */
PrintLinesToBottom ();
@@ -374,10 +375,10 @@
} //end if need a new page headed up
}
} else {
- while ($ControlledMovtRow = DB_fetch_array($GetControlMovts)){
+ while ($ControlledMovtRow = DB_fetch_array($GetControlMovts)) {
$YPos -= (10*$lines);
- $LeftOvers = $pdf->addTextWrap($Left_Margin+82,$YPos,100,$FontSize,(-$ControlledMovtRow['moveqty']) . ' x ' . $ControlledMovtRow['serialno'],'left');
- if ($YPos-$line_height <= $Bottom_Margin){
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+82,$YPos,100,$FontSize,(-$ControlledMovtRow['moveqty']) . ' x ' . $ControlledMovtRow['serialno'], 'left');
+ if($YPos-$line_height <= $Bottom_Margin) {
/* head up a new invoice/credit note page */
/*draw the vertical column lines right to the bottom */
PrintLinesToBottom ();
@@ -390,27 +391,28 @@
$lines=explode("\r\n",htmlspecialchars_decode($myrow2['narrative']));
for ($i=0;$i<sizeOf($lines);$i++) {
- while (mb_strlen($lines[$i])>1){
- if ($YPos-$line_height <= $Bottom_Margin){
- /* head up a new invoice/credit note page */
- /*draw the vertical column lines right to the bottom */
- PrintLinesToBottom ();
- include ('includes/PDFTransPageHeaderPortrait.inc');
- } //end if need a new page headed up
- /*increment a line down for the next line item */
- if (mb_strlen($lines[$i])>1){
- $lines[$i] = $pdf->addTextWrap($Left_Margin+85,$YPos,181,$FontSize,stripslashes($lines[$i]));
+ while (mb_strlen($lines[$i])>1) {
+ if($YPos-$line_height <= $Bottom_Margin) {
+ /* head up a new invoice/credit note page */
+ /*draw the vertical column lines right to the bottom */
+ PrintLinesToBottom ();
+ include ('includes/PDFTransPageHeaderPortrait.inc');
+ } //end if need a new page headed up
+ /*increment a line down for the next line item */
+ if(mb_strlen($lines[$i])>1) {
+ $lines[$i] = $pdf->addTextWrap($Left_Margin+85,$YPos,181,$FontSize,stripslashes($lines[$i]));
+ }
+ $YPos -= ($line_height);
}
- $YPos -= ($line_height);
}
- }
- if ($YPos <= $Bottom_Margin){
+ if($YPos <= $Bottom_Margin) {
/* head up a new invoice/credit note page */
/*draw the vertical column lines right to the bottom */
PrintLinesToBottom ();
include ('includes/PDFTransPageHeaderPortrait.inc');
} //end if need a new page headed up
+
} /*end while there are line items to print out*/
} /*end if there are stock movements to show on the invoice or credit note*/
@@ -418,7 +420,7 @@
$YPos -= $line_height;
/* check to see enough space left to print the 4 lines for the totals/footer */
- if (($YPos-$Bottom_Margin)<(2*$line_height)){
+ if(($YPos-$Bottom_Margin)<(2*$line_height)) {
PrintLinesToBottom ();
include ('includes/PDFTransPageHeaderPortrait.inc');
}
@@ -446,12 +448,11 @@
/*Now print out the footer and totals */
- if ($InvOrCredit=='Invoice') {
-
- $DisplaySubTot = locale_number_format($myrow['ovamount'],$myrow['decimalplaces']);
- $DisplayFreight = locale_number_format($myrow['ovfreight'],$myrow['decimalplaces']);
- $DisplayTax = locale_number_format($myrow['ovgst'],$myrow['decimalplaces']);
- $DisplayTotal = locale_number_format($myrow['ovfreight']+$myrow['ovgst']+$myrow['ovamount'],$myrow['decimalplaces']);
+ if($InvOrCredit=='Invoice') {
+ $DisplaySubTot = locale_number_format($myrow['ovamount'],$myrow['decimalplaces']);
+ $DisplayFreight = locale_number_format($myrow['ovfreight'],$myrow['decimalplaces']);
+ $DisplayTax = locale_number_format($myrow['ovgst'],$myrow['decimalplaces']);
+ $DisplayTotal = locale_number_format($myrow['ovfreight']+$myrow['ovgst']+$myrow['ovamount'],$myrow['decimalplaces']);
} else {
$DisplaySubTot = locale_number_format(-$myrow['ovamount'],$myrow['decimalplaces']);
$DisplayFreight = locale_number_format(-$myrow['ovfreight'],$myrow['decimalplaces']);
@@ -487,16 +488,16 @@
$pdf->line($Page_Width-$Right_Margin-222, $YPos+$line_height,$Page_Width-$Right_Margin-222,$Bottom_Margin);
$YPos+=10;
- if ($InvOrCredit=='Invoice'){
+ if($InvOrCredit=='Invoice') {
$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-220, $Bottom_Margin+5, 144, $FontSize, _('TOTAL INVOICE'));
$FontSize=8;
$LeftOvers = $pdf->addTextWrap($Left_Margin, $YPos-18,280,$FontSize,$_SESSION['RomalpaClause']);
- while (mb_strlen($LeftOvers)>0 AND $YPos > $Bottom_Margin){
+ while (mb_strlen($LeftOvers)>0 AND $YPos > $Bottom_Margin) {
$YPos -=10;
$LeftOvers = $pdf->addTextWrap($Left_Margin, $YPos-18,280,$FontSize,$LeftOvers);
}
/* Add Images for Visa / Mastercard / Paypal */
- if (file_exists('companies/' . $_SESSION['DatabaseName'] . '/payment.jpg')) {
+ if(file_exists('companies/' . $_SESSION['DatabaseName'] . '/payment.jpg')) {
$pdf->addJpegFromFile('companies/' . $_SESSION['DatabaseName'] . '/payment.jpg',$Page_Width/2 -60,$YPos-15,0,20);
}
// Print Bank acount details if available and default for invoices is selected
@@ -514,7 +515,7 @@
/* Put the transaction number back as would have been incremented by one after last pass */
$FromTransNo--;
- if (isset($_GET['Email'])){ //email the invoice to address supplied
+ if(isset($_GET['Email'])) { //email the invoice to address supplied
include ('includes/htmlMimeMail.php');
$FromTransNo--; //reverse the increment to retain the correct transaction number
$FileName = $_SESSION['reports_dir'] . '/' . $_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $_GET['FromTransNo'] . '.pdf';
@@ -525,7 +526,7 @@
$mail->setText(_('Please find attached') . ' ' . $InvOrCredit . ' ' . $_GET['FromTransNo'] );
$mail->SetSubject($InvOrCredit . ' ' . $_GET['FromTransNo']);
$mail->addAttachment($Attachment, $FileName, 'application/pdf');
- if($_SESSION['SmtpSetting'] == 0){
+ if($_SESSION['SmtpSetting'] == 0) {
$mail->setFrom($_SESSION['CompanyRecord']['coyname'] . ' <' . $_SESSION['CompanyRecord']['email'] . '>');
$result = $mail->send(array($_GET['Email']));
}else{
@@ -554,7 +555,7 @@
$Title=_('Select Invoices/Credit Notes To Print');
include('includes/header.inc');
- if (!isset($FromTransNo) OR $FromTransNo=='') {
+ if(!isset($FromTransNo) OR $FromTransNo=='') {
/*if FromTransNo is not set then show a form to allow input of either a single invoice number or a range of invoices to be printed. Also get the last invoice number created to show the user where the current range is up to */
@@ -569,7 +570,7 @@
<td>' . _('Print Invoices or Credit Notes') . '</td>
<td><select name="InvOrCredit">';
- if ($InvOrCredit=='Invoice' OR !isset($InvOrCredit)){
+ if($InvOrCredit=='Invoice' OR !isset($InvOrCredit)) {
echo '<option selected="selected" value="Invoice">' . _('Invoices') . '</option>';
echo '<option value="Credit">' . _('Credit Notes') . '</option>';
@@ -584,7 +585,7 @@
<td>' . _('Print EDI Transactions') . '</td>
<td><select name="PrintEDI">';
- if ($InvOrCredit=='Invoice' OR !isset($InvOrCredit)){
+ if($InvOrCredit=='Invoice' OR !isset($InvOrCredit)) {
echo '<option selected="selected" value="No">' . _('Do not Print PDF EDI Transactions') . '</option>';
echo '<option value="Yes">' . _('Print PDF EDI Transactions Too') . '</option>';
@@ -632,13 +633,13 @@
} else {
- while ($FromTransNo <= $_POST['ToTransNo']){
+ while ($FromTransNo <= $_POST['ToTransNo']) {
/*retrieve the invoice details from the database to print
notice that salesorder record must be present to print the invoice purging of sales orders will
nobble the invoice reprints */
- if ($InvOrCredit=='Invoice') {
+ if($InvOrCredit=='Invoice') {
$sql = "SELECT debtortrans.trandate,
debtortrans.ovamount,
@@ -742,19 +743,19 @@
}
$result=DB_query($sql);
- if (DB_num_rows($result)==0 OR DB_error_no()!=0) {
+ if(DB_num_rows($result)==0 OR DB_error_no()!=0) {
echo '<p>' . _('There was a problem retrieving the invoice or credit note details for note number') . ' ' . $InvoiceToPrint . ' ' . _('from the database') . '. ' . _('To print an invoice, the sales order record, the customer transaction record and the branch record for the customer must not have been purged') . '. ' . _('To print a credit note only requires the customer, transaction, salesman and branch records be available');
- if ($debug==1){
+ if($debug==1) {
prnMsg( _('The SQL used to get this information that failed was') . '<br />' . $sql,'warn');
}
break;
include('includes/footer.inc');
exit;
- } elseif (DB_num_rows($result)==1){
+ } elseif(DB_num_rows($result)==1) {
$myrow = DB_fetch_array($result);
/* Then there's an invoice (or credit note) to print. So print out the invoice header and GST Number from the company record */
- if (count($_SESSION['AllowedPageSecurityTokens'])==1 AND in_array(1, $_SESSION['AllowedPageSecurityTokens']) AND $myrow['debtorno'] != $_SESSION['CustomerID']){
+ if(count($_SESSION['AllowedPageSecurityTokens'])==1 AND in_array(1, $_SESSION['AllowedPageSecurityTokens']) AND $myrow['debtorno'] != $_SESSION['CustomerID']) {
echo '<p class="bad">' . _('This transaction is addressed to another customer and cannot be displayed for privacy reasons') . '. ' . _('Please select only transactions relevant to your company');
exit;
}
@@ -767,7 +768,7 @@
<td valign="top" style="width:10%"><img src="' . $_SESSION['LogoFile'] . '" alt="" /></td>
<td style="background-color:#bbbbbb">';
- if ($InvOrCredit=='Invoice') {
+ if($InvOrCredit=='Invoice') {
echo '<h2>' . _('TAX INVOICE') . ' ';
} else {
echo '<h2 style="color:red">' . _('TAX CREDIT NOTE') . ' ';
@@ -821,7 +822,7 @@
</table>';
/*end of the main table showing the company name and charge to details */
- if ($InvOrCredit=='Invoice') {
+ if($InvOrCredit=='Invoice') {
echo '<table class="table1">
<tr>
@@ -933,15 +934,15 @@
echo '<div class="centre"><h4>' . _('All amounts stated in') . ' ' . $myrow['currcode'] . '</h4></div>';
$result=DB_query($sql);
- if (DB_error_no()!=0) {
+ if(DB_error_no()!=0) {
echo '<br />' . _('There was a problem retrieving the invoice or credit note stock movement details for invoice number') . ' ' . $FromTransNo . ' ' . _('from the database');
- if ($debug==1){
+ if($debug==1) {
echo '<br />' . _('The SQL used to get this information that failed was') . '<br />' . $sql;
}
exit;
}
- if (DB_num_rows($result)>0){
+ if(DB_num_rows($result)>0) {
echo '<table class="table1">
<tr>
<th>' . _('Item Code') . '</th>
@@ -956,9 +957,9 @@
$LineCounter =17;
$k=0; //row colour counter
- while ($myrow2=DB_fetch_array($result)){
+ while ($myrow2=DB_fetch_array($result)) {
- if ($k==1){
+ if($k==1) {
$RowStarter = '<tr class="EvenTableRows">';
$k=0;
} else {
@@ -972,7 +973,7 @@
$DisplayQty = locale_number_format($myrow2['quantity'],$myrow2['decimalplaces']);
$DisplayNet = locale_number_format($myrow2['fxnet'],$myrow['decimalplaces']);
- if ($myrow2['discountpercent']==0){
+ if($myrow2['discountpercent']==0) {
$DisplayDiscount ='';
} else {
$DisplayDiscount = locale_number_format($myrow2['discountpercent']*100,2) . '%';
@@ -994,7 +995,7 @@
$DisplayDiscount,
$DisplayNet);
- if (mb_strlen($myrow2['narrative'])>1){
+ if(mb_strlen($myrow2['narrative'])>1) {
echo $RowStarter .
'<td></td>
<td colspan="6">' . $myrow2['narrative'] . '</td>
@@ -1004,7 +1005,7 @@
$LineCounter++;
- if ($LineCounter == ($_SESSION['PageLength'] - 2)){
+ if($LineCounter == ($_SESSION['PageLength'] - 2)) {
/* head up a new invoice/credit note page */
@@ -1015,7 +1016,7 @@
<td valign="top"><img src="' . $_SESSION['LogoFile'] . '" alt="" /></td>
<td style="background-color:#bbbbbb">';
- if ($InvOrCredit=='Invoice') {
+ if($InvOrCredit=='Invoice') {
echo '<h2>' . _('TAX INVOICE') . ' ';
} else {
echo '<h2 style="color:red">' . _('TAX CREDIT NOTE') . ' ';
@@ -1061,7 +1062,7 @@
/* check to see enough space left to print the totals/footer */
$LinesRequiredForText = floor(mb_strlen($myrow['invtext'])/140);
- if ($LineCounter >= ($_SESSION['PageLength'] - 8 - $LinesRequiredForText)){
+ if($LineCounter >= ($_SESSION['PageLength'] - 8 - $LinesRequiredForText)) {
/* head up a new invoice/credit note page */
@@ -1070,7 +1071,7 @@
<tr>
<td valign="top"><img src="' . $_SESSION['LogoFile'] . '" alt="" /></td>
<td style="background-color:#bbbbbb">';
- if ($InvOrCredit=='Invoice') {
+ if($InvOrCredit=='Invoice') {
echo '<h2>' . _('TAX INVOICE') .' ';
} else {
echo '<h2 style="color:red">' . _('TAX CREDIT NOTE') . ' ';
@@ -1116,14 +1117,14 @@
echo '<br /><br />' . $myrow['invtext'];
$LineCounter=$LineCounter+2+$LinesRequiredForText;
- while ($LineCounter < ($_SESSION['PageLength'] -6)){
+ while ($LineCounter < ($_SESSION['PageLength'] -6)) {
echo '<br />';
$LineCounter++;
}
/*Now print out the footer and totals */
- if ($InvOrCredit=='Invoice') {
+ if($InvOrCredit=='Invoice') {
$DisplaySubTot = locale_number_format($myrow['ovamount'],$myrow['decimalplaces']);
$DisplayFreight = locale_number_format($myrow['ovfreight'],$myrow['decimalplaces']);
@@ -1143,7 +1144,7 @@
<td class="number" style="background-color:#EEEEEE">' . $DisplayFreight . '</td></tr>';
echo '<tr><td class="number">' . _('Tax') . '</td>
<td class="number" style="background-color:#EEEEEE">' . $DisplayTax . '</td></tr>';
- if ($InvOrCredit=='Invoice'){
+ if($InvOrCredit=='Invoice') {
echo '<tr><td class="number"><b>' . _('TOTAL INVOICE') . '</b></td>
<td class="number" style="background-color:#EEEEEE"><b>' . $DisplayTotal . '</b></td></tr>';
} else {
@@ -1160,35 +1161,24 @@
} /*end of else not PrintPDF */
-
function PrintLinesToBottom () {
+ global $Bottom_Margin;
+ global $Left_Margin;
+ global $line_height;
+ global $PageNumber;
global $pdf;
- global $PageNumber;
global $TopOfColHeadings;
- global $Left_Margin;
- global $Bottom_Margin;
- global $line_height;
-/*draw the vertical column lines right to the bottom */
+ // Prints column vertical lines:
$pdf->line($Left_Margin+78, $TopOfColHeadings+12,$Left_Margin+78,$Bottom_Margin);
-
- /*Print a column vertical line */
$pdf->line($Left_Margin+268, $TopOfColHeadings+12,$Left_Margin+268,$Bottom_Margin);
-
- /*Print a column vertical line */
$pdf->line($Left_Margin+348, $TopOfColHeadings+12,$Left_Margin+348,$Bottom_Margin);
-
- /*Print a column vertical line */
$pdf->line($Left_Margin+388, $TopOfColHeadings+12,$Left_Margin+388,$Bottom_Margin);
-
- /*Print a column vertical line */
$pdf->line($Left_Margin+418, $TopOfColHeadings+12,$Left_Margin+418,$Bottom_Margin);
-
$pdf->line($Left_Margin+448, $TopOfColHeadings+12,$Left_Margin+448,$Bottom_Margin);
$PageNumber++;
-
}
?>
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 2016-05-28 18:19:17 UTC (rev 7545)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-05-29 15:42:54 UTC (rev 7546)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-05-16 21:31+1200\n"
-"PO-Revision-Date: 2016-05-28 11:40-0600\n"
+"PO-Revision-Date: 2016-05-29 09:40-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -1624,11 +1624,11 @@
#: AnalysisHorizontalIncome.php:160 AnalysisHorizontalPosition.php:114
msgid "Current period"
-msgstr ""
+msgstr "Período actual"
#: AnalysisHorizontalIncome.php:161 AnalysisHorizontalPosition.php:115
msgid "Last period"
-msgstr ""
+msgstr "Período anterior"
#: AnalysisHorizontalIncome.php:162 AnalysisHorizontalPosition.php:116
msgid "Actual change"
@@ -1720,7 +1720,7 @@
#: AnalysisHorizontalPosition.php:27
msgid "Print Horizontal Analysis of Statement of Financial Position"
-msgstr ""
+msgstr "Imprimir análisis horizontal del estado de situación"
#: AnalysisHorizontalPosition.php:40 GLBalanceSheet.php:36
msgid "Select the balance date"
@@ -4029,7 +4029,7 @@
#: CollectiveWorkOrderCost.php:81
msgid "Select Other Work Orders"
-msgstr ""
+msgstr "Seleccionar otras órdenes de trabajo"
#: CollectiveWorkOrderCost.php:112 SelectWorkOrder.php:39
msgid "The work order number entered MUST be numeric"
@@ -18248,7 +18248,7 @@
#: MRPCreateDemands.php:211
msgid "Inventory Categories"
-msgstr ""
+msgstr "Categorías de inventario"
#: MRPCreateDemands.php:228 PDFDeliveryDifferences.php:62 PDFDIFOT.php:66
#: PDFOrdersInvoiced.php:64 PDFOrderStatus.php:61
@@ -18257,11 +18257,11 @@
#: MRPCreateDemands.php:249
msgid "From Sales Date"
-msgstr "Desde la Fecha de Venta"
+msgstr "Desde la fecha de venta"
#: MRPCreateDemands.php:250
msgid "To Sales Date"
-msgstr "Hasta la Fecha de Venta"
+msgstr "Hasta la fecha de venta"
#: MRPCreateDemands.php:253
msgid "Start Date For Distribution"
@@ -18289,7 +18289,7 @@
#: MRPCreateDemands.php:264
msgid "Number of Periods"
-msgstr "Número de Períodos"
+msgstr "Cantidad de períodos"
#: MRPCreateDemands.php:268
msgid "Exclude Total Quantity Less Than"
@@ -51543,7 +51543,7 @@
#: ../webSHOP/CreditCardPayFlowPro.php:240
#: ../webSHOP/CreditCardPayPalPro.php:307
msgid "Card Number"
-msgstr ""
+msgstr "Número de tarjeta"
#: ../webSHOP/CreditCardPayFlowPro.php:241
#: ../webSHOP/CreditCardPayPalPro.php:308
|
|
From: <dai...@us...> - 2016-05-30 07:23:12
|
Revision: 7547
http://sourceforge.net/p/web-erp/reponame/7547
Author: daintree
Date: 2016-05-30 07:23:09 +0000 (Mon, 30 May 2016)
Log Message:
-----------
remove hidden form field for GP_Percent
Modified Paths:
--------------
trunk/SelectOrderItems.php
trunk/doc/Change.log
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2016-05-29 15:42:54 UTC (rev 7546)
+++ trunk/SelectOrderItems.php 2016-05-30 07:23:09 UTC (rev 7547)
@@ -727,7 +727,7 @@
custitem.cust_part,
custitem.cust_description
FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid
+ ON stockmaster.categoryid=stockcategory.categoryid
" . $IncludeCustItem . "
WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L' " . $RawMaterialSellable . ")
AND stockmaster.mbflag <>'G'
@@ -1371,7 +1371,6 @@
<td><input class="number" maxlength="40" name="GPPercent_' . $OrderLine->LineNumber . '" required="required" size="4" value="' . locale_number_format($OrderLine->GPPercent,2) . '" title="' . _('Enter a gross profit percentage to use as the basis to calculate the price to charge the customer for this line item') . '" type="text" /></td>';
} else {
echo '<td class="number">' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
- echo '<input class="number" maxlength="40" name="GPPercent_' . $OrderLine->LineNumber . '" size="4" type="hidden" value="' . locale_number_format($OrderLine->GPPercent,2) . '" />';
echo '<input name="Price_' . $OrderLine->LineNumber . '" type="hidden" value="' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '" /></td>';
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-05-29 15:42:54 UTC (rev 7546)
+++ trunk/doc/Change.log 2016-05-30 07:23:09 UTC (rev 7547)
@@ -2,6 +2,7 @@
22/5/16 Release 4.13
+30/5/16 Andew Galuski: remove hidden GP_Percent form field when customer login to prevent un-authorised viewing of this data when looking at the page source
28/5/16 Gilberto Dos Santos Alves: Updated Portuguese Brazilian translation
28/5/16 Phil: PrintCustStatement.php now has an option to email the statement and uses the customer contacts email addresses defined as wanting a statement and sends individual statements to each of the customer contacts for their customer statement and lists the customers and the recipients they have been sent to. The existing emailcustomerstatement script had too much potential to send statement for other customers to another customer by mistake - so I've removed it!
23/5/16 Phil: PrintCustStatement.php now shows all the date.
|
|
From: <dai...@us...> - 2016-05-30 09:59:58
|
Revision: 7548
http://sourceforge.net/p/web-erp/reponame/7548
Author: daintree
Date: 2016-05-30 09:59:55 +0000 (Mon, 30 May 2016)
Log Message:
-----------
default new salesperson to being current
Modified Paths:
--------------
trunk/SalesPeople.php
trunk/doc/Change.log
Modified: trunk/SalesPeople.php
===================================================================
--- trunk/SalesPeople.php 2016-05-30 07:23:09 UTC (rev 7547)
+++ trunk/SalesPeople.php 2016-05-30 09:59:55 UTC (rev 7548)
@@ -329,7 +329,7 @@
$_POST['Breakpoint']=0;
}
if (!isset($_POST['Current'])){
- $_POST['Current']=0;
+ $_POST['Current']=1;
}
echo '<tr>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-05-30 07:23:09 UTC (rev 7547)
+++ trunk/doc/Change.log 2016-05-30 09:59:55 UTC (rev 7548)
@@ -2,6 +2,7 @@
22/5/16 Release 4.13
+30/5/16 Phil: Default new salesperson to current
30/5/16 Andew Galuski: remove hidden GP_Percent form field when customer login to prevent un-authorised viewing of this data when looking at the page source
28/5/16 Gilberto Dos Santos Alves: Updated Portuguese Brazilian translation
28/5/16 Phil: PrintCustStatement.php now has an option to email the statement and uses the customer contacts email addresses defined as wanting a statement and sends individual statements to each of the customer contacts for their customer statement and lists the customers and the recipients they have been sent to. The existing emailcustomerstatement script had too much potential to send statement for other customers to another customer by mistake - so I've removed it!
|
|
From: <tu...@us...> - 2016-06-12 16:34:34
|
Revision: 7554
http://sourceforge.net/p/web-erp/reponame/7554
Author: turbopt
Date: 2016-06-12 16:34:32 +0000 (Sun, 12 Jun 2016)
Log Message:
-----------
Fix syntax error: add matching parenthesis.
Modified Paths:
--------------
trunk/StockClone.php
trunk/doc/Change.log
Modified: trunk/StockClone.php
===================================================================
--- trunk/StockClone.php 2016-06-08 04:17:53 UTC (rev 7553)
+++ trunk/StockClone.php 2016-06-12 16:34:32 UTC (rev 7554)
@@ -344,10 +344,10 @@
language_id,
descriptiontranslation,
longdescriptiontranslation)
- VALUES('" . $_POST['StockID'] . "','" .
- $LanguageId . "', '" .
- $_POST['Description_' . str_replace('.','_',$LanguageId)] . "', '" .
- $_POST['LongDescription_' . str_replace('.','_',$LanguageId)].
+ VALUES('" . $_POST['StockID'] . "','" .
+ $LanguageId . "', '" .
+ $_POST['Description_' . str_replace('.','_',$LanguageId)] . "', '" .
+ $_POST['LongDescription_' . str_replace('.','_',$LanguageId)].
"')",$ErrMsg,$DbgMsg,true);
}
}
@@ -588,7 +588,7 @@
<input type="hidden" name="New" value="'.$_POST['New'].'" />
<table class="selection">';
-if (empty($_POST['StockID']) || $_POST['StockID'] == $_POST['OldStockID']) || isset($_POST['UpdateCategories'])) {
+if (empty($_POST['StockID']) || ($_POST['StockID'] == $_POST['OldStockID']) || isset($_POST['UpdateCategories'])) {
/*If the page was called without $StockID or empty $StockID then a new cloned stock item is to be entered. Show a form with a part Code field,
otherwise show form for editing with only a hidden OldStockID field. */
@@ -655,10 +655,10 @@
$_POST['Pansize'] = $myrow['pansize'];
$_POST['ShrinkFactor'] = $myrow['shrinkfactor'];
- $sql = "SELECT descriptiontranslation,
- longdescriptiontranslation,
- language_id
- FROM stockdescriptiontranslations
+ $sql = "SELECT descriptiontranslation,
+ longdescriptiontranslation,
+ language_id
+ FROM stockdescriptiontranslations
WHERE stockid='" . $selectedStockID . "' AND (";
foreach ($ItemDescriptionLanguagesArray as $LanguageId) {
$sql .= "language_id='" . $LanguageId ."' OR ";
@@ -694,7 +694,7 @@
echo '<tr>
<td>' . $LanguagesArray[$LanguageId]['LanguageName'] . ' ' . _('Description') . ':</td>
<td><input type="text" name="'. $PostVariableName . '" size="52" maxlength="50" value="' . $_POST[$PostVariableName] . '" /></td>
- <td><input type="hidden" name="' . $LongDescriptionTranslated . '" value="' . $_POST['LongDescription_' . str_replace('.','_',$LanguageId)] . '" />
+ <td><input type="hidden" name="' . $LongDescriptionTranslated . '" value="' . $_POST['LongDescription_' . str_replace('.','_',$LanguageId)] . '" />
</tr>';
}
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-06-08 04:17:53 UTC (rev 7553)
+++ trunk/doc/Change.log 2016-06-12 16:34:32 UTC (rev 7554)
@@ -1,5 +1,6 @@
webERP Change Log
+12/06/16 TurboPT: Fix syntax error in StockClone.php
08/06/16 Exson: add data label for SalesGraph.php.
22/5/16 Release 4.13
|
|
From: <rc...@us...> - 2016-06-13 15:30:47
|
Revision: 7555
http://sourceforge.net/p/web-erp/reponame/7555
Author: rchacon
Date: 2016-06-13 15:30:45 +0000 (Mon, 13 Jun 2016)
Log Message:
-----------
Divide mysql script to avoid interruption if Scripts table was previouly updated. Add other contributors.
Modified Paths:
--------------
trunk/doc/Manual/ManualContributors.html
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/upgrade4.12.3-4.13.sql
Modified: trunk/doc/Manual/ManualContributors.html
===================================================================
--- trunk/doc/Manual/ManualContributors.html 2016-06-12 16:34:32 UTC (rev 7554)
+++ trunk/doc/Manual/ManualContributors.html 2016-06-13 15:30:45 UTC (rev 7555)
@@ -1,256 +1,138 @@
<a id="Contributors"><h1>Contributors - Acknowledgements</h1></a>
-<p>
-The following is a list of known contributors. Many of these people can usually be contacted by posting to the appropriate mailing list.
-The copyright to the code belongs to these individuals who contributed the code. Collectively this group are referred to as "weberp.org" or the "webERP Project" or the "webERP Developers".
+<p>The following is a list of known contributors. Many of these people can usually be contacted by posting to the appropriate mailing list. The copyright to the code belongs to these individuals who contributed the code. Collectively this group are referred to as "weberp.org" or the "webERP Project" or the "webERP Developers".
</p>
<table width="100%">
- <tr>
- <td width="50%" valign="top"><b>Development (sorted by last name)</b><br />
- <br />
- Jesus Aguirre<br />
- <br />
- Nicola Asuni (TCPDF)<br />
- <br />
- Shane Barnaby<br />
- <br />
- Tom Barry<br />
- <br />
- Klaus Beucher<br />
- <br />
- Chris Bice<br />
- <br />
- Danie Brink<br />
- <br />
- Daffyd Crosby<br />
- <br />
- Phil Daintree<br />
- <br />
- Murray Dancey<br />
- <br />
- Gilles Deacur<br />
- <br />
- Miguel de Benito Delgado (phplot)<br />
- <br />
- Javier de Lorenzo-Cáceres<br />
- <br />
- Janusz Dobrowolski<br />
- <br />
- Edd Dumbill (phpxmlrpc)<br />
- <br />
- Ahmed Fawzy<br />
- <br />
- Tom Fox<br />
- <br />
- Andrew Galuski<br/>
- <br />
- Braian Gomez<br />
- <br />
- Fahad Hatib<br />
- <br />
- Paul Harness<br />
- <br />
- Lindsay Harris<br />
- <br />
- David Hawke<br />
- <br />
- Fahad Hatib<br />
- <br />
- Richard Heyes (html.mime.mail)<br />
- <br />
- High-Tech Bridge SA Security Research Lab<br />
- <br />
- Tomáš Horáček (barcodepack)<br />
- <br />
- Icedlava<br />
- <br />
- Hindra Joshua<br />
- <br />
- Alan Jones<br />
- <br />
- Steve Kaill - bugfixes<br />
- <br />
- Nico Kaiser (php-gettext)<br />
- <br />
- CQZ,KE<br />
- <br />
- Mo Kelly - due dates and customer po by sales order line<br />
- <br />
- Meraj Khattak - database diagram<br />
- <br />
- Steve Kitchen<br />
- <br />
- Ditesh Kumar<br />
- <br />
- Khwunchai J.: Xenos themeFelix Lim<br />
- <br />
- David Luo<br />
- <br />
- David Lynn<br />
- <br />
- Martha Madjack<br />
- <br />
- Wayne McDougall<br />
- <br />
- Greg Morehead<br />
- <br />
- Clay Mokus<br />
- <br />
- Suren Naidu<br />
- <br />
- Hani Naguib<br />
- <br />
- Samudaya Nanayakkara<br />
- <br />
- Harold Naparst<br />
- <br />
- Sherif Omar<br />
- <br />
- Simon Peter Otandeka<br />
- <br />
- Afan Ottenheimer (phplot)<br />
- <br />
- Kunshan-Ouhai<br />
- <br />
- Ricardo Pedroso<br />
- <br />
- Jesse Peterson<br />
- <br />
- Kalmer Piiskop<br />
- <br />
- Olivier Plathey (FPDF - from which TCPDF was derived)<br />
- <br />
- Renier du Plessis<br />
- <br />
- Dave Premo (report writer)<br />
- <br />
- Simon Rhodes
- <br />
- Carlos Rubio
- <br />
- Exson Qu<br />
- <br />
- Pak Ricard<br />
- <br />
- Harald Ringehahn<br />
- <br />
- Gunnar Rikardsson<br />
- <br />
- Scott Rosa<br />
- <br />
- Tim Schofield<br />
- <br />
- Jurgen Schopenhouer<br />
- <br />
- Fred Schuettler (aguapop - theme)<br />
- <br />
- Danilo Segan (php-gettext)<br />
- <br />
- Gjergj Sheldija<br />
- <br />
- Matthew Sibson<br />
- <br />
- Vitaliy Shevkunov<br />
- <br />
- David Short<br />
- <br />
- Marcos Skambraks<br />
- <br />
- Jake Stride<br />
- <br />
- Matt Taylor<br />
- <br />
- Bob Thomas<br />
- <br />
- Paul Thursby<br />
- <br />
- Marcos Garcia Trejo<br />
- <br />
- Jeff Trickett<br />
- <br />
- Wes Wolfenbarger
- <br />
- Mark Yeager (MRP)<br />
- <br />
- Zhiguo Yuan</td>
+<tr>
+<td width="50%" valign="top">
+ <p><b>Development (sorted by last name)</b></p>
+ <p>Jesus Aguirre</p>
+ <p>Nicola Asuni (TCPDF)</p>
+ <p>Shane Barnaby</p>
+ <p>Tom Barry</p>
+ <p>Klaus Beucher</p>
+ <p>Jan Bakke</p>
+ <p>Chris Bice</p>
+ <p>Danie Brink</p>
+ <p>Daffyd Crosby</p>
+ <p>Rafael E. Chacón</p>
+ <p>Phil Daintree</p>
+ <p>Murray Dancey</p>
+ <p>Gilles Deacur</p>
+ <p>Miguel de Benito Delgado (phplot)</p>
+ <p>Javier de Lorenzo-Cáceres</p>
+ <p>Janusz Dobrowolski</p>
+ <p>Edd Dumbill (phpxmlrpc)</p>
+ <p>Ahmed Fawzy</p>
+ <p>Tom Fox</p>
+ <p>Andrew Galuski</p>
+ <p>Braian Gómez</p>
+ <p>Paul Harness</p>
+ <p>Lindsay Harris</p>
+ <p>David Hawke</p>
+ <p>Fahad Hatib</p>
+ <p>Richard Heyes (html.mime.mail)</p>
+ <p>High-Tech Bridge SA Security Research Lab</p>
+ <p>Tomáš Horáček (barcodepack)</p>
+ <p>Icedlava</p>
+ <p>Hindra Joshua</p>
+ <p>Alan Jones</p>
+ <p>Steve Kaill - bugfixes</p>
+ <p>Nico Kaiser (php-gettext)</p>
+ <p>CQZ,KE</p>
+ <p>Mo Kelly - due dates and customer po by sales order line</p>
+ <p>Meraj Khattak - database diagram</p>
+ <p>Steve Kitchen</p>
+ <p>Ditesh Kumar</p>
+ <p>Khwunchai J.: Xenos themeFelix Lim</p>
+ <p>David Luo</p>
+ <p>David Lynn</p>
+ <p>Martha Madjack</p>
+ <p>Wayne McDougall</p>
+ <p>Greg Morehead</p>
+ <p>Clay Mokus</p>
+ <p>Suren Naidu</p>
+ <p>Hani Naguib</p>
+ <p>Samudaya Nanayakkara</p>
+ <p>Harold Naparst</p>
+ <p>Sherif Omar</p>
+ <p>Simon Peter Otandeka</p>
+ <p>Afan Ottenheimer (phplot)</p>
+ <p>Kunshan-Ouhai</p>
+ <p>Ricardo Pedroso</p>
+ <p>Jesse Peterson</p>
+ <p>Kalmer Piiskop</p>
+ <p>Olivier Plathey (FPDF - from which TCPDF was derived)</p>
+ <p>Renier du Plessis</p>
+ <p>Dave Premo (report writer)</p>
+ <p>Simon Rhodes</p>
+ <p>Carlos Rubio</p>
+ <p>Exson Qu</p>
+ <p>Pak Ricard</p>
+ <p>Harald Ringehahn</p>
+ <p>Gunnar Rikardsson</p>
+ <p>Scott Rosa</p>
+ <p>Tim Schofield</p>
+ <p>Jurgen Schopenhouer</p>
+ <p>Fred Schuettler (aguapop - theme)</p>
+ <p>Danilo Segan (php-gettext)</p>
+ <p>Gjergj Sheldija</p>
+ <p>Matthew Sibson</p>
+ <p>Vitaliy Shevkunov</p>
+ <p>David Short</p>
+ <p>Marcos Skambraks</p>
+ <p>Jake Stride</p>
+ <p>Matt Taylor</p>
+ <p>Bob Thomas</p>
+ <p>Paul Thursby</p>
+ <p>Marcos Garcia Trejo</p>
+ <p>Jeff Trickett</p>
+ <p>Wes Wolfenbarger</p>
+ <p>Mark Yeager (MRP)</p>
+ <p>Zhiguo Yuan</p>
+</td>
+<td valign="top"><b>Translation</b></p>
+ <p>Jiro Akits - Taiwanese</p>
+ <p>Wilson Almeida - Spanish</p>
+ <p>Carlos F. Castillo - Spanish</p>
+ <p>Dongbak Cha - Korean</p>
+ <p>Rafael E. Chacón - Spanish</p>
+ <p>Billy Chang,劉世琪 - Taiwanese</p>
+ <p>Csillag Péter Hungarian</p>
+ <p>Danu Satrio Pratomo Djojosoemarto and his cousin - Indonesian</p>
+ <p>Dongbak Cha - Korean</p>
+ <p>Gilberto Dos Santos Alves - Portuguese (Brazilian)</p>
+ <p>Janusz Dobrowolski - Polish</p>
+ <p>James Dupin - French</p>
+ <p>Matt Elbrecht - Estonian</p>
+ <p>Igor Felix - Portuguese Brazilian</p>
+ <p>Karel van der Esch - Dutch</p>
+ <p>Thiago Figueiredo - Portuguese</p>
+ <p>Romel Den - Chinese Traditional - UTF-8</p>
+ <p>Serge Gélinas - French Quebec</p>
+ <p>Thomas Timothy Lie and baliboss.com Team - Indonesian</p>
+ <p>Thiago Mansinho de Lima - Portuguese Brazilian</p>
+ <p>Roberto del Pino - Spanish</p>
+ <p>Alejandro E. Fernández E. - Spanish (Venezuelan)</p>
+ <p>Javier de Lorenzo-Cáceres - Spanish</p>
+ <p>Serge Gélinas - French Canadian (Quebec)</p>
+ <p>Juan L. Grassi - Spanish</p>
+ <p>Tanya Komarova - Russian</p>
+ <p>Hagay Mandel - Hebrew</p>
+ <p>Eddie Molina - Spanish</p>
+ <p>Exson Qu - Chinese (and Manual)</p>
+ <p>J. Hernán Ramírez R. - Spanish (Venezuelan)</p>
+ <p>Harald Ringehahn - German</p>
+ <p>Daniel Rodriguez</p>
+ <p>Manel Sanchez Maulini - Spanish</p>
+ <p>Melvin Sequera - Spanish</p>
+ <p>Carlos Vera - Spanish</p>
+ <p>Hazem Wehbi - Arabic Syria</p>
+ <p>Efren Yevale - Spanish</p>
+ <p>Zhiguo Yuan - Chinese</p>
+</td>
+</tr>
+</table>
- <td valign="top"><b>Translation</b><br />
- <br />
- Jiro Akits - Taiwanese<br />
- <br />
- Rafael Chacón - Spanish<br />
- <br />
- Billy Chang,劉世琪 - Taiwanese<br />
- <br />
- Csillag Péter Hungarian<br />
- <br />
- Danu Satrio Pratomo Djojosoemarto and his cousin - Indonesian<br />
- <br />
- Dongbak Cha - Korean<br />
- <br />
- Gilberto Dos Santos Alves - Portuguese (Brazilian)
- <br />
- Janusz Dobrowolski - Polish<br />
- <br />
- James Dupin - French<br />
- <br />
- Matt Elbrecht - Estonian<br />
- <br />
- Igor Felix - Portuguese Brazilian<br />
- <br />
- Karel van der Esch - Dutch<br />
- <br />
- Thiago Figueiredo - Portuguese<br />
- <br />
- Romel Den - Chinese Traditional - UTF-8<br />
- <br />
- Serge Gélinas - French Quebec<br />
- <br />
- Thomas Timothy Lie and baliboss.com Team - Indonesian<br />
- <br />
- Thiago Mansinho de Lima - Portuguese Brazilian<br />
- <br />
- Roberto del Pino - Spanish<br />
- <br />
- Alejandro E Fernández E Spanish (Venezuelan)<br />
- <br />
- Javier de Lorenzo-Cáceres - Spanish<br />
- <br />
- Serge Gélinas - French Canadian (Quebec)<br />
- <br />
- Juan L Grassi - Spanish<br />
- <br />
- Tanya Komarova - Russian<br />
- <br />
- Eddie Molina - Spanish<br />
- <br />
- Exson Qu - Chinese (and Manual)<br />
- <br />
- J. Hernán Ramírez R. - Spanish (Venezuelan)<br />
- <br />
- Harald Ringehahn - German<br />
- <br />
- Daniel Rodriguez<br />
- <br />
- Manel Sanchez Maulini - Spanish<br />
- <br />
- Melvin Sequera - Spanish<br />
- <br />
- Efren Yevale - Spanish<br />
- <br />
- Carlos F. Castillo - Spanish<br />
- <br />
- Wilson Almeida - Spanish<br />
- <br />
- Carlos Vera - Spanish<br />
- <br />
- Zhiguo Yuan - Chinese<br />
- <br /></td>
- </tr>
-</table>
-<p>
-Some Icons sourced via Creative Commons Attribution 2.5 License. http://www.famfamfam.com/lab/icons/silk/
-</p>
-<p>
-If anyone has been overlooked or should have their entry modified please email in...@we...
-</p>
+<p>Some Icons sourced via Creative Commons Attribution 2.5 License. http://www.famfamfam.com/lab/icons/silk/</p>
+<p>If anyone has been overlooked or should have their entry modified please email in...@we...</p>
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 2016-06-12 16:34:32 UTC (rev 7554)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-06-13 15:30:45 UTC (rev 7555)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-05-16 21:31+1200\n"
-"PO-Revision-Date: 2016-05-29 09:40-0600\n"
+"PO-Revision-Date: 2016-06-11 14:24-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -27795,7 +27795,7 @@
#: SecurityTokens.php:6 includes/MainMenuLinksArray.php:475
msgid "Maintain Security Tokens"
-msgstr "Administrar Testigos de Seguridad"
+msgstr "Administrar fichas de seguridad"
#: SecurityTokens.php:14
msgid ""
@@ -40227,11 +40227,11 @@
#: WWW_Access.php:210
msgid "Assigned Security Tokens"
-msgstr "Asignación de Testigos de Seguridad"
+msgstr "Fichas de seguridad asignadas"
#: WWW_Access.php:211
msgid "Available Security Tokens"
-msgstr "Testigos de Seguridad Disponibles"
+msgstr "Fichas de seguridad disponibles"
#: WWW_Access.php:229
#, php-format
Modified: trunk/sql/mysql/upgrade4.12.3-4.13.sql
===================================================================
--- trunk/sql/mysql/upgrade4.12.3-4.13.sql 2016-06-12 16:34:32 UTC (rev 7554)
+++ trunk/sql/mysql/upgrade4.12.3-4.13.sql 2016-06-13 15:30:45 UTC (rev 7555)
@@ -8,16 +8,16 @@
ALTER TABLE `loctransfercancellations` ADD INDEX `Index2` (`canceldate`, `reference`, `stockid`) COMMENT '';
-- Add new scripts:
-INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES
- ('AnalysisHorizontalIncome.php', '8', 'Shows the horizontal analysis of the statement of comprehensive income'),
- ('AnalysisHorizontalPosition.php', '8', 'Shows the horizontal analysis of the statement of financial position'),
- ('EmailCustStatements.php','3','Email customer statement to customer'),
- ('GLAccountUsers.php', '15', 'Maintenance of users allowed to a GL Account'),
- ('SupplierGRNAndInvoiceInquiry.php',5,'Supplier\'s delivery note and grn relationship inquiry'),
- ('UserBankAccounts.php', '15', 'Maintains table bankaccountusers (Authorized users to work with a bank account in webERP)'),
- ('UserGLAccounts.php', '15', 'Maintenance of GL Accounts allowed for a user');
-INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES
- ('Z_GLAccountUsersCopyAuthority.php', '15', 'Utility to copy authority of GL accounts from one user to another');
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('AnalysisHorizontalIncome.php', '8', 'Shows the horizontal analysis of the statement of comprehensive income');
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('AnalysisHorizontalPosition.php', '8', 'Shows the horizontal analysis of the statement of financial position');
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('CollectiveWorkOrderCost.php', 2, 'Multiple work orders cost review');
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('EmailCustStatements.php','3','Email customer statement to customer');
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('GLAccountUsers.php', '15', 'Maintenance of users allowed to a GL Account');
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('SupplierGRNAndInvoiceInquiry.php',5,'Supplier\'s delivery note and grn relationship inquiry');
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('SuppWhereAlloc.php', 3, 'Suppliers where allocated');
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('UserBankAccounts.php', '15', 'Maintains table bankaccountusers (Authorized users to work with a bank account in webERP)');
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('UserGLAccounts.php', '15', 'Maintenance of GL Accounts allowed for a user');
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('Z_GLAccountUsersCopyAuthority.php', '15', 'Utility to copy authority of GL accounts from one user to another');
CREATE TABLE IF NOT EXISTS `suppinvstogrn` (
`suppinv` int(11) NOT NULL,
@@ -50,9 +50,7 @@
ALTER table stockrequest DROP FOREIGN KEY `stockrequest_ibfk_3`;
ALTER table stockrequest DROP FOREIGN KEY `stockrequest_ibfk_4`;
-INSERT INTO scripts VALUES('CollectiveWorkOrderCost.php',2,'Multiple work orders cost review');
ALTER table bom ADD remark varchar(500) NOT NULL DEFAULT '';
-INSERT INTO scripts VALUES ('SuppWhereAlloc.php',3,'Suppliers Where allocated');
ALTER table pctabs DROP FOREIGN KEY `pctabs_ibfk_4`;
ALTER table pctabs CHANGE authorizer authorizer varchar(100);
ALTER table pctabs CHANGE assigner assigner varchar(100);
|
|
From: <ex...@us...> - 2016-06-16 11:11:48
|
Revision: 7556
http://sourceforge.net/p/web-erp/reponame/7556
Author: exsonqu
Date: 2016-06-16 11:11:45 +0000 (Thu, 16 Jun 2016)
Log Message:
-----------
16/06/16 Exson: Make monthly payment term can be more than 30 days.
Modified Paths:
--------------
trunk/AgedDebtors.php
trunk/AgedSuppliers.php
trunk/CustomerInquiry.php
trunk/CustomerReceipt.php
trunk/Dashboard.php
trunk/PaymentTerms.php
trunk/PrintCustStatements.php
trunk/SupplierInquiry.php
Modified: trunk/AgedDebtors.php
===================================================================
--- trunk/AgedDebtors.php 2016-06-13 15:30:45 UTC (rev 7555)
+++ trunk/AgedDebtors.php 2016-06-16 11:11:45 UTC (rev 7556)
@@ -45,8 +45,9 @@
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
ELSE 0 END
ELSE
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))', 'DAY') .")) >= 0
- THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate),paymentterms.dayinfollowingmonth)) >= 0
+ THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
+ ELSE 0 END
END
) AS due,
SUM(
@@ -55,7 +56,7 @@
CASE WHEN (TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate)) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ")
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
ELSE
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL ('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . "
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate),paymentterms.dayinfollowingmonth)) >= " . $_SESSION['PastDueDays1'] . "
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
ELSE 0 END
END
@@ -66,7 +67,7 @@
CASE WHEN (TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate)) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays2'] . ")
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
ELSE
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL ('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays2'] . "
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate),paymentterms.dayinfollowingmonth)) >= " . $_SESSION['PastDueDays2'] . "
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
ELSE 0 END
END
@@ -116,7 +117,7 @@
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
ELSE 0 END
ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))', 'DAY') . ")) >= 0 )
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate),paymentterms.dayinfollowingmonth)) >= 0
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
END
) AS due,
@@ -127,7 +128,7 @@
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
ELSE 0 END
ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ")
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate),paymentterms.dayinfollowingmonth)) >= " . $_SESSION['PastDueDays1'] . "
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
ELSE 0 END
END
@@ -139,7 +140,7 @@
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
ELSE 0 END
ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays2'] . ")
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate),paymentterms.dayinfollowingmonth)) >= " . $_SESSION['PastDueDays2'] . "
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
ELSE 0 END
END
@@ -173,7 +174,7 @@
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
ELSE 0 END
ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ")
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate),paymentterms.dayinfollowingmonth)) >= " . $_SESSION['PastDueDays1'] . "
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
ELSE 0 END
END
@@ -201,7 +202,7 @@
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
ELSE 0 END
ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate," . INTERVAL('1', 'MONTH') . ")," . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))', 'DAY') . ")) >= 0)
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate),paymentterms.dayinfollowingmonth)) >= 0
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
ELSE 0 END
END
@@ -213,7 +214,7 @@
AND TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ")
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ")
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate),paymentterms.dayinfollowingmonth)) >= " . $_SESSION['PastDueDays1'] . "
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
ELSE 0 END
END
@@ -226,7 +227,7 @@
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
ELSE 0 END
ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))', 'DAY') . ")) >= ".$_SESSION['PastDueDays2'] . ")
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate),paymentterms.dayinfollowingmonth)) >= ".$_SESSION['PastDueDays2'] . "
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
ELSE 0 END
END
@@ -324,31 +325,31 @@
(debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc) as balance,
(CASE WHEN (paymentterms.daysbeforedue > 0)
THEN
- (CASE WHEN (TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate)) >= paymentterms.daysbeforedue
+ CASE WHEN (TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate)) >= paymentterms.daysbeforedue
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
- ELSE 0 END)
+ ELSE 0 END
ELSE
- (CASE WHEN TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))', 'DAY') . ")) >= 0
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate),paymentterms.dayinfollowingmonth)) >= 0
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
- ELSE 0 END)
+ ELSE 0 END
END) AS due,
(CASE WHEN (paymentterms.daysbeforedue > 0)
THEN
- (CASE WHEN TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ") THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END)
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ") THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
ELSE
- (CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ")
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate),paymentterms.dayinfollowingmonth)) >= " . $_SESSION['PastDueDays1'] . "
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
- ELSE 0 END)
+ ELSE 0 END
END) AS overdue1,
(CASE WHEN (paymentterms.daysbeforedue > 0)
THEN
- (CASE WHEN TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays2'] . ")
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays2'] . ")
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
- ELSE 0 END)
+ ELSE 0 END
ELSE
- (CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))','DAY') . ")) >= " . $_SESSION['PastDueDays2'] . ")
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate),paymentterms.dayinfollowingmonth)) >= " . $_SESSION['PastDueDays2'] . "
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
- ELSE 0 END)
+ ELSE 0 END
END) AS overdue2
FROM debtorsmaster,
paymentterms,
Modified: trunk/AgedSuppliers.php
===================================================================
--- trunk/AgedSuppliers.php 2016-06-13 15:30:45 UTC (rev 7555)
+++ trunk/AgedSuppliers.php 2016-06-16 11:11:45 UTC (rev 7556)
@@ -29,17 +29,17 @@
SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN
CASE WHEN (TO_DAYS(Now()) - TO_DAYS(supptrans.trandate)) >= paymentterms.daysbeforedue THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
ELSE
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= 0 THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(supptrans.trandate),paymentterms.dayinfollowingmonth)) >= 0 THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
END) AS due,
SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN
CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') ."), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(supptrans.trandate),paymentterms.dayinfollowingmonth)) >= " . $_SESSION['PastDueDays1'] . " THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
END) AS overdue1,
SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN
CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(supptrans.trandate),paymentterms.dayinfollowingmonth)) >= " . $_SESSION['PastDueDays2'] . " THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
END) AS overdue2
FROM suppliers INNER JOIN paymentterms
ON suppliers.paymentterms = paymentterms.termsindicator
@@ -69,17 +69,17 @@
SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN
CASE WHEN (TO_DAYS(Now()) - TO_DAYS(supptrans.trandate)) >= paymentterms.daysbeforedue THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
ELSE
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= 0 THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(supptrans.trandate),paymentterms.dayinfollowingmonth)) >= 0 THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
END) AS due,
Sum(CASE WHEN paymentterms.daysbeforedue > 0 THEN
CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(supptrans.trandate),paymentterms.dayinfollowingmonth)) >= " . $_SESSION['PastDueDays1'] . " THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
END) AS overdue1,
SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN
CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(supptrans.trandate),paymentterms.dayinfollowingmonth)) >= " . $_SESSION['PastDueDays2'] . " THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
END) AS overdue2
FROM suppliers INNER JOIN paymentterms
ON suppliers.paymentterms = paymentterms.termsindicator
@@ -98,7 +98,7 @@
paymentterms.dayinfollowingmonth
HAVING SUM(IF (paymentterms.daysbeforedue > 0,
CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END,
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END)) > 0";
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(supptrans.trandate),paymentterms.dayinfollowingmonth)) >= " . $_SESSION['PastDueDays1'] . " THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END)) > 0";
}
@@ -167,17 +167,17 @@
CASE WHEN paymentterms.daysbeforedue > 0 THEN
CASE WHEN (TO_DAYS(Now()) - TO_DAYS(supptrans.trandate)) >= paymentterms.daysbeforedue THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
ELSE
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= 0 THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(supptrans.trandate),paymentterms.dayinfollowingmonth)) >= 0 THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
END AS due,
CASE WHEN paymentterms.daysbeforedue > 0 THEN
CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1','MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(supptrans.trandate), paymentterms.dayinfollowingmonth)) >= " . $_SESSION['PastDueDays1'] . " THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
END AS overdue1,
CASE WHEN paymentterms.daysbeforedue > 0 THEN
CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1','MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(supptrans.trandate),paymentterms.dayinfollowingmonth)) >= " . $_SESSION['PastDueDays2'] . " THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
END AS overdue2
FROM suppliers
LEFT JOIN paymentterms
@@ -332,4 +332,4 @@
include('includes/footer.inc');
} /*end of else not PrintPDF */
-?>
\ No newline at end of file
+?>
Modified: trunk/CustomerInquiry.php
===================================================================
--- trunk/CustomerInquiry.php 2016-06-13 15:30:45 UTC (rev 7555)
+++ trunk/CustomerInquiry.php 2016-06-16 11:11:45 UTC (rev 7556)
@@ -77,14 +77,14 @@
CASE WHEN (TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate)) >= paymentterms.daysbeforedue
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
ELSE
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))', 'DAY') . ")) >= 0 THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate),paymentterms.dayinfollowingmonth)) >= 0 THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
END) AS due,
SUM(CASE WHEN (paymentterms.daysbeforedue > 0) THEN
CASE WHEN TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) > paymentterms.daysbeforedue
AND TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ")
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ")
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate),paymentterms.dayinfollowingmonth)) >= " . $_SESSION['PastDueDays1'] . "
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount
- debtortrans.alloc ELSE 0 END
END) AS overdue1,
@@ -92,7 +92,7 @@
CASE WHEN TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) > paymentterms.daysbeforedue
AND TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays2'] . ") THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays2'] . ") THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate),paymentterms.dayinfollowingmonth)) >= " . $_SESSION['PastDueDays2'] . " THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
END) AS overdue2
FROM debtorsmaster,
paymentterms,
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2016-06-13 15:30:45 UTC (rev 7555)
+++ trunk/CustomerReceipt.php 2016-06-16 11:11:45 UTC (rev 7556)
@@ -689,17 +689,17 @@
SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN
CASE WHEN (TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate)) >= paymentterms.daysbeforedue THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
ELSE
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1','MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))','DAY') . ")) >= 0 THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate), paymentterms.dayinfollowingmonth)) >= 0 THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
END) AS due,
SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN
CASE WHEN TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ") THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight - debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1', 'MONTH') ."), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ") THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate), paymentterms.dayinfollowingmonth)) >= " . $_SESSION['PastDueDays1'] . " THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
END) AS overdue1,
SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN
CASE WHEN TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays2'] . ") THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1','MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))','DAY') . ")) >= " . $_SESSION['PastDueDays2'] . ") THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate), paymentterms.dayinfollowingmonth)) >= " . $_SESSION['PastDueDays2'] . " THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
END) AS overdue2
FROM debtorsmaster INNER JOIN paymentterms
ON debtorsmaster.paymentterms = paymentterms.termsindicator
Modified: trunk/Dashboard.php
===================================================================
--- trunk/Dashboard.php 2016-06-13 15:30:45 UTC (rev 7555)
+++ trunk/Dashboard.php 2016-06-16 11:11:45 UTC (rev 7556)
@@ -92,7 +92,7 @@
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
ELSE 0 END
ELSE
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))', 'DAY') .")) >= 0
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate), paymentterms.dayinfollowingmonth)) >= 0
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
END
) AS due,
@@ -102,7 +102,7 @@
CASE WHEN (TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate)) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ")
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
ELSE
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL ('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . "
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate), paymentterms.dayinfollowingmonth)) >= " . $_SESSION['PastDueDays1'] . "
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
ELSE 0 END
END
@@ -113,7 +113,7 @@
CASE WHEN (TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate)) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays2'] . ")
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + ...
[truncated message content] |
|
From: <ex...@us...> - 2016-07-07 11:11:37
|
Revision: 7565
http://sourceforge.net/p/web-erp/reponame/7565
Author: exsonqu
Date: 2016-07-07 11:11:34 +0000 (Thu, 07 Jul 2016)
Log Message:
-----------
07/07/16: Exson: Fixed the bug of wrong original amount of payments to another bank accounts in GLAccountInquiry.php and wrong transaction link in DailyBankTransactions.php and add payment transaction no in bank transaction ref to make it traceable.
Modified Paths:
--------------
trunk/DailyBankTransactions.php
trunk/GLAccountInquiry.php
trunk/Payments.php
Modified: trunk/DailyBankTransactions.php
===================================================================
--- trunk/DailyBankTransactions.php 2016-07-03 06:58:29 UTC (rev 7564)
+++ trunk/DailyBankTransactions.php 2016-07-07 11:11:34 UTC (rev 7565)
@@ -194,6 +194,10 @@
$k = 0;
}
//check the GL narrative
+ if ($myrow['type'] == 2) {
+ $myrow['typeid'] = 1;
+ $myrow['transno'] = substr($myrow['ref'],1,strpos($myrow['ref'],' ')-1);
+ }
$sql = "SELECT narrative FROM gltrans WHERE type='" . $myrow['typeid'] . "' AND typeno='" . $myrow['transno'] . "'";
$ErrMsg = _('Failed to retrieve gl narrative');
$glresult = DB_query($sql,$ErrMsg);
Modified: trunk/GLAccountInquiry.php
===================================================================
--- trunk/GLAccountInquiry.php 2016-07-03 06:58:29 UTC (rev 7564)
+++ trunk/GLAccountInquiry.php 2016-07-07 11:11:34 UTC (rev 7565)
@@ -165,7 +165,6 @@
}
$sql = $sql . " ORDER BY periodno, gltrans.trandate, counterindex";
-
$namesql = "SELECT accountname FROM chartmaster WHERE accountcode='" . $SelectedAccount . "'";
$nameresult = DB_query($namesql);
$namerow=DB_fetch_array($nameresult);
@@ -296,6 +295,29 @@
$BankRef = $bankrow['ref'];
$OrgAmt = $bankrow['amount'];
$Currency = $bankrow['currcode'];
+ } elseif ($myrow['type'] == 1) {
+ //We should find out when transaction happens between bank accounts;
+ $bankreceivesql = "SELECT ref,type,transno,currcode,amount FROM banktrans
+ WHERE ref LIKE '@%' AND transdate='" . $myrow['trandate'] . "' AND bankact='" . $SelectedAccount . "'";
+ $ErrMsg = _('Failed to retrieve bank receive data');
+ $bankresult = DB_query($bankreceivesql,$ErrMsg);
+ if (DB_num_rows($bankresult)>0) {
+ while ($bankrow = DB_fetch_array($bankresult)) {
+ if (substr($bankrow['ref'],1,strpos($bankrow['ref'],' ')-1) == $myrow['typeno']) {
+ $BankRef = $bankrow['ref'];
+ $OrgAmt = $bankrow['amount'];
+ $Currency = $bankrow['currcode'];
+ $BankReceipt = true;
+ break;
+ }
+ }
+ }
+ if (!isset($BankReceipt)) {
+ $BankRef = '';
+ $OrgAmt = $myrow['amount'];
+ $Currency = $_SESSION['CompanyRecord']['currencydefault'];
+ }
+
} elseif(isset($BankAccount)){
$BankRef = '';
$OrgAmt = $myrow['amount'];
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2016-07-03 06:58:29 UTC (rev 7564)
+++ trunk/Payments.php 2016-07-07 11:11:34 UTC (rev 7565)
@@ -460,7 +460,7 @@
$ReceiptTransNo . "',
2,'" .
$PaymentItem->GLCode . "','" .
- _('Act Transfer From ') . $_SESSION['PaymentDetail'.$identifier]->Account . ' - ' . $PaymentItem->Narrative . "','" .
+ '@' . $TransNo . ' ' . _('Act Transfer From ') . $_SESSION['PaymentDetail'.$identifier]->Account . ' - ' . $PaymentItem->Narrative . "','" .
(($_SESSION['PaymentDetail'.$identifier]->ExRate * $_SESSION['PaymentDetail'.$identifier]->FunctionalExRate)/$TrfToBankExRate). "','" .
$TrfToBankExRate . "','" .
FormatDateForSQL($_SESSION['PaymentDetail'.$identifier]->DatePaid) . "','" .
|
|
From: <ex...@us...> - 2016-07-08 08:17:13
|
Revision: 7567
http://sourceforge.net/p/web-erp/reponame/7567
Author: exsonqu
Date: 2016-07-08 08:17:10 +0000 (Fri, 08 Jul 2016)
Log Message:
-----------
08/07/16 Exson: Fixed the bug that when bank account or currency changes the functional rate or exrate unchanged with suggested rate in Payments.php.
Modified Paths:
--------------
trunk/Payments.php
trunk/doc/Change.log
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2016-07-07 11:12:58 UTC (rev 7566)
+++ trunk/Payments.php 2016-07-08 08:17:10 UTC (rev 7567)
@@ -899,10 +899,8 @@
$_POST['FunctionalExRate']=1;
}
if($_SESSION['PaymentDetail'.$identifier]->AccountCurrency != $_SESSION['PaymentDetail'.$identifier]->Currency AND isset($_SESSION['PaymentDetail'.$identifier]->AccountCurrency)) {
- if($_POST['ExRate']==1 AND isset($SuggestedExRate)) {
+ 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,8);
- } elseif($_POST['Currency'] != $_POST['PreviousCurrency'] AND isset($SuggestedExRate)) {
- $_POST['ExRate'] = locale_number_format($SuggestedExRate,8);
}
if(isset($SuggestedExRate)) {
@@ -917,9 +915,9 @@
}
if($_SESSION['PaymentDetail'.$identifier]->AccountCurrency != $_SESSION['CompanyRecord']['currencydefault'] AND isset($_SESSION['PaymentDetail'.$identifier]->AccountCurrency)) {
- if($_POST['FunctionalExRate']==1 AND isset($SuggestedFunctionalExRate)) {
+ 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>';
@@ -979,6 +977,7 @@
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 name="UpdateHeader" type="submit" value="', _('Update'), '" />
</div></td>
</tr>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-07-07 11:12:58 UTC (rev 7566)
+++ trunk/doc/Change.log 2016-07-08 08:17:10 UTC (rev 7567)
@@ -1,5 +1,6 @@
webERP Change Log
+08/07/16 Exson: Fixed the bug that when bank account or currency changes the functional rate or exrate unchanged with suggested rate in Payments.php.
07/07/16: Exson: Fixed the bug of wrong original amount of payments to another bank accounts in GLAccountInquiry.php and wrong transaction link in DailyBankTransactions.php and add payment transaction no in bank transaction ref to make it traceable.
29/06/16 Exson: add identifier to avoid SESSION overwritten in CustomerReceipt.php.
29/06/16 Exson: Fixed the wrong balance of amount in bank account currency in DailyBankTransactions.php.
|
|
From: <ex...@us...> - 2016-07-08 10:08:48
|
Revision: 7568
http://sourceforge.net/p/web-erp/reponame/7568
Author: exsonqu
Date: 2016-07-08 10:08:45 +0000 (Fri, 08 Jul 2016)
Log Message:
-----------
08/07/16 Exson: Fixed the transaction atomicity failure bug by change table lock to row lock in SQL_CommonFunctions.inc.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/SQL_CommonFunctions.inc
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-07-08 08:17:10 UTC (rev 7567)
+++ trunk/doc/Change.log 2016-07-08 10:08:45 UTC (rev 7568)
@@ -1,5 +1,6 @@
webERP Change Log
+08/07/16 Exson: Fixed the transaction atomicity bug by change table lock to row lock in SQL_CommonFunctions.inc.
08/07/16 Exson: Fixed the bug that when bank account or currency changes the functional rate or exrate unchanged with suggested rate in Payments.php.
07/07/16: Exson: Fixed the bug of wrong original amount of payments to another bank accounts in GLAccountInquiry.php and wrong transaction link in DailyBankTransactions.php and add payment transaction no in bank transaction ref to make it traceable.
29/06/16 Exson: add identifier to avoid SESSION overwritten in CustomerReceipt.php.
Modified: trunk/includes/SQL_CommonFunctions.inc
===================================================================
--- trunk/includes/SQL_CommonFunctions.inc 2016-07-08 08:17:10 UTC (rev 7567)
+++ trunk/includes/SQL_CommonFunctions.inc 2016-07-08 10:08:45 UTC (rev 7568)
@@ -16,25 +16,18 @@
etc
*
*/
-
- DB_query("LOCK TABLES systypes WRITE");
-
- $SQL = "SELECT typeno FROM systypes WHERE typeid = '" . $TransType . "'";
-
+ DB_query("SELECT typeno FROM systypes WHERE typeid='" . $TransType ."' FOR UPDATE");
+ $SQL = "UPDATE systypes SET typeno = typeno + 1 WHERE typeid = '" . $TransType . "'";
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The transaction number could not be incremented');
+ $DbgMsg = _('The following SQL to increment the transaction number was used');
+ $UpdTransNoResult = DB_query($SQL,$ErrMsg,$DbgMsg);
+ $SQL = "SELECT typeno FROM systypes WHERE typeid= '" . $TransType . "'";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': <BR>' . _('The next transaction number could not be retrieved from the database because');
$DbgMsg = _('The following SQL to retrieve the transaction number was used');
$GetTransNoResult = DB_query($SQL,$ErrMsg,$DbgMsg);
-
$myrow = DB_fetch_row($GetTransNoResult);
-
- $SQL = "UPDATE systypes SET typeno = '" . ($myrow[0] + 1) . "' WHERE typeid = '" . $TransType . "'";
- $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The transaction number could not be incremented');
- $DbgMsg = _('The following SQL to increment the transaction number was used');
- $UpdTransNoResult = DB_query($SQL,$ErrMsg,$DbgMsg);
-
- DB_query("UNLOCK TABLES");
-
- return $myrow[0] + 1;
+ return $myrow[0];
+
}
@@ -512,4 +505,4 @@
} //$myrow[0]>0
}
-?>
\ No newline at end of file
+?>
|
|
From: <ex...@us...> - 2016-07-09 03:18:02
|
Revision: 7569
http://sourceforge.net/p/web-erp/reponame/7569
Author: exsonqu
Date: 2016-07-09 03:17:59 +0000 (Sat, 09 Jul 2016)
Log Message:
-----------
09/07/16 Exson: Fixed the utf8 character print incorrect of pdf file in class.pdf.php.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/class.pdf.php
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-07-08 10:08:45 UTC (rev 7568)
+++ trunk/doc/Change.log 2016-07-09 03:17:59 UTC (rev 7569)
@@ -1,5 +1,5 @@
webERP Change Log
-
+09/07/16 Exson: Fixed the utf8 character print incorrect of pdf file in class.pdf.php.
08/07/16 Exson: Fixed the transaction atomicity bug by change table lock to row lock in SQL_CommonFunctions.inc.
08/07/16 Exson: Fixed the bug that when bank account or currency changes the functional rate or exrate unchanged with suggested rate in Payments.php.
07/07/16: Exson: Fixed the bug of wrong original amount of payments to another bank accounts in GLAccountInquiry.php and wrong transaction link in DailyBankTransactions.php and add payment transaction no in bank transaction ref to make it traceable.
Modified: trunk/includes/class.pdf.php
===================================================================
--- trunk/includes/class.pdf.php 2016-07-08 10:08:45 UTC (rev 7568)
+++ trunk/includes/class.pdf.php 2016-07-09 03:17:59 UTC (rev 7569)
@@ -109,7 +109,7 @@
case 'full':
$Align = 'J'; break;
default:
- $Align = 'L'; break;
+ $Align = 'L';
}
$this->SetFontSize($Height);// Public function SetFontSize() in ~/includes/tcpdf/tcpdf.php.
@@ -177,9 +177,9 @@
}
}
- $this->Cell($Width, $Height, mb_substr($s,0,$sep), $b, 2, $Align, $fill);
+ $this->Cell($Width,$Height,mb_substr($s,0,$sep,'UTF-8'),$b,2,$Align,$fill);
$this->x=$this->lMargin;
- return mb_substr($s, $sep);
+ return mb_substr($s, $sep,null,'UTF-8');
}// End function addTextWrap.
function addInfo($label, $value) {
|
|
From: <ex...@us...> - 2016-07-22 00:46:53
|
Revision: 7570
http://sourceforge.net/p/web-erp/reponame/7570
Author: exsonqu
Date: 2016-07-22 00:46:50 +0000 (Fri, 22 Jul 2016)
Log Message:
-----------
22/07/16 Exson: Add empty check for internal request to avoid empty request creating in InternalStockRequest.php.
Modified Paths:
--------------
trunk/InternalStockRequest.php
trunk/doc/Change.log
Modified: trunk/InternalStockRequest.php
===================================================================
--- trunk/InternalStockRequest.php 2016-07-09 03:17:59 UTC (rev 7569)
+++ trunk/InternalStockRequest.php 2016-07-22 00:46:50 UTC (rev 7570)
@@ -59,7 +59,8 @@
}
}
-if (isset($_POST['Submit'])) {
+if (isset($_POST['Submit']) AND (!empty($_SESSION['Request']->LineItems))) {
+
DB_Txn_Begin();
$InputError=0;
if ($_SESSION['Request']->Department=='') {
@@ -133,6 +134,8 @@
include('includes/footer.inc');
unset($_SESSION['Request']);
exit;
+} elseif(isset($_POST['Submit'])) {
+ prnMsg(_('There are no items added to this request'),'error');
}
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/supplier.png" title="' . _('Dispatch') .
@@ -275,24 +278,24 @@
</tr>';
$k=0;
-
-foreach ($_SESSION['Request']->LineItems as $LineItems) {
-
- if ($k==1){
- echo '<tr class="EvenTableRows">';
- $k=0;
- } else {
- echo '<tr class="OddTableRows">';
- $k++;
+if (isset($_SESSION['Request']->LineItems)) {
+ foreach ($_SESSION['Request']->LineItems as $LineItems) {
+ if ($k==1){
+ echo '<tr class="EvenTableRows">';
+ $k=0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k++;
+ }
+ echo '<td>' . $LineItems->LineNumber . '</td>
+ <td>' . $LineItems->StockID . '</td>
+ <td>' . $LineItems->ItemDescription . '</td>
+ <td class="number">' . locale_number_format($LineItems->Quantity, $LineItems->DecimalPlaces) . '</td>
+ <td>' . $LineItems->UOM . '</td>
+ <td><a href="'. htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?Edit='.$LineItems->LineNumber.'">' . _('Edit') . '</a></td>
+ <td><a href="'. htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?Delete='.$LineItems->LineNumber.'">' . _('Delete') . '</a></td>
+ </tr>';
}
- echo '<td>' . $LineItems->LineNumber . '</td>
- <td>' . $LineItems->StockID . '</td>
- <td>' . $LineItems->ItemDescription . '</td>
- <td class="number">' . locale_number_format($LineItems->Quantity, $LineItems->DecimalPlaces) . '</td>
- <td>' . $LineItems->UOM . '</td>
- <td><a href="'. htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?Edit='.$LineItems->LineNumber.'">' . _('Edit') . '</a></td>
- <td><a href="'. htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?Delete='.$LineItems->LineNumber.'">' . _('Delete') . '</a></td>
- </tr>';
}
echo '</table>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-07-09 03:17:59 UTC (rev 7569)
+++ trunk/doc/Change.log 2016-07-22 00:46:50 UTC (rev 7570)
@@ -1,4 +1,5 @@
webERP Change Log
+22/07/16 Exson: Add empty check for internal request to avoid empty request creating in InternalStockRequest.php.
09/07/16 Exson: Fixed the utf8 character print incorrect of pdf file in class.pdf.php.
08/07/16 Exson: Fixed the transaction atomicity bug by change table lock to row lock in SQL_CommonFunctions.inc.
08/07/16 Exson: Fixed the bug that when bank account or currency changes the functional rate or exrate unchanged with suggested rate in Payments.php.
|
|
From: <ex...@us...> - 2016-07-22 05:00:50
|
Revision: 7571
http://sourceforge.net/p/web-erp/reponame/7571
Author: exsonqu
Date: 2016-07-22 05:00:47 +0000 (Fri, 22 Jul 2016)
Log Message:
-----------
22/07/16 Exson: Make items search limited to the sales orders and if search result is 1 show the result immediately in SelectSalesOrder.php
Modified Paths:
--------------
trunk/SelectSalesOrder.php
trunk/doc/Change.log
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2016-07-22 00:46:50 UTC (rev 7570)
+++ trunk/SelectSalesOrder.php 2016-07-22 05:00:47 UTC (rev 7571)
@@ -530,6 +530,7 @@
<tr>
<td>' . _('Select a stock category') . ':
<select name="StockCat">';
+ echo '<option value="All">' . _('All') . '</option>';
while ($myrow1 = DB_fetch_array($result1)) {
echo '<option value="'. $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
@@ -552,7 +553,7 @@
<br />';
if (isset($StockItemsResult)
- AND DB_num_rows($StockItemsResult)>0) {
+ AND DB_num_rows($StockItemsResult)>1) {
echo '<table cellpadding="2" class="selection">';
echo '<tr>
@@ -592,6 +593,10 @@
}
//end if stock search results to show
else {
+ if (isset($StockItemsResult) AND DB_num_rows($StockItemsResult) == 1) {
+ $mystkrow = DB_fetch_array($StockItemsResult);
+ $SelectedStockItem = $mystkrow['stockid'];
+ }
//figure out the SQL required from the inputs available
if (isset($_POST['Quotations']) AND $_POST['Quotations']=='Orders_Only'){
@@ -880,9 +885,12 @@
stockmaster.decimalplaces,
SUM(locstock.quantity) AS qoh,
stockmaster.units
- FROM stockmaster INNER JOIN locstock
+ FROM salesorderdetails INNER JOIN stockmaster
+ ON salesorderdetails.stkcode = stockmaster.stockid AND completed=0
+ INNER JOIN locstock
ON stockmaster.stockid=locstock.stockid";
- if (isset($_POST['StockCat']) AND trim($_POST['StockCat'])==''){
+ if (isset($_POST['StockCat'])
+ AND ((trim($_POST['StockCat']) == '') OR $_POST['StockCat'] == 'All')){
$WhereStockCat = '';
} else {
$WhereStockCat = " AND stockmaster.categoryid='" . $_POST['StockCat'] . "' ";
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-07-22 00:46:50 UTC (rev 7570)
+++ trunk/doc/Change.log 2016-07-22 05:00:47 UTC (rev 7571)
@@ -1,4 +1,6 @@
webERP Change Log
+
+22/07/16 Exson: Make items search limited to the sales orders and if search result is 1 show the result immediately in SelectSalesOrder.php
22/07/16 Exson: Add empty check for internal request to avoid empty request creating in InternalStockRequest.php.
09/07/16 Exson: Fixed the utf8 character print incorrect of pdf file in class.pdf.php.
08/07/16 Exson: Fixed the transaction atomicity bug by change table lock to row lock in SQL_CommonFunctions.inc.
|
|
From: <ex...@us...> - 2016-07-25 08:13:05
|
Revision: 7572
http://sourceforge.net/p/web-erp/reponame/7572
Author: exsonqu
Date: 2016-07-25 08:13:03 +0000 (Mon, 25 Jul 2016)
Log Message:
-----------
25/07/16 Exson: Add InternalStockRequestInquiry.php and add initiator for internal stock request.
Modified Paths:
--------------
trunk/InternalStockRequest.php
trunk/doc/Change.log
trunk/includes/MainMenuLinksArray.php
Added Paths:
-----------
trunk/InternalStockRequestInquiry.php
trunk/sql/mysql/upgrade4.13-4.13.1.sql
Modified: trunk/InternalStockRequest.php
===================================================================
--- trunk/InternalStockRequest.php 2016-07-22 05:00:47 UTC (rev 7571)
+++ trunk/InternalStockRequest.php 2016-07-25 08:13:03 UTC (rev 7572)
@@ -77,13 +77,15 @@
loccode,
departmentid,
despatchdate,
- narrative)
+ narrative,
+ initiator)
VALUES(
'" . $RequestNo . "',
'" . $_SESSION['Request']->Location . "',
'" . $_SESSION['Request']->Department . "',
'" . FormatDateForSQL($_SESSION['Request']->DispatchDate) . "',
- '" . $_SESSION['Request']->Narrative . "')";
+ '" . $_SESSION['Request']->Narrative . "',
+ '" . $_SESSION['UserID'] . "')";
$ErrMsg =_('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The request header record could not be inserted because');
$DbgMsg = _('The following SQL to insert the request header record was used');
$Result = DB_query($HeaderSQL,$ErrMsg,$DbgMsg,true);
Added: trunk/InternalStockRequestInquiry.php
===================================================================
--- trunk/InternalStockRequestInquiry.php (rev 0)
+++ trunk/InternalStockRequestInquiry.php 2016-07-25 08:13:03 UTC (rev 7572)
@@ -0,0 +1,554 @@
+<?php
+//Token 19 is used as the authority overwritten token to ensure that all internal request can be viewed.
+include('includes/session.inc');
+$Title = _('Internal Stock Request Inquiry');
+include('includes/header.inc');
+
+echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/transactions.png" title="' . $Title . '" alt="" />' . ' ' . $Title . '</p>';
+
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+echo '<div>';
+if (isset($_POST['ResetPart'])) {
+ unset($SelectedStockItem);
+}
+echo '<br/><div class="centre">';
+if (isset($_POST['RequestNo'])) {
+ $RequestNo = $_POST['RequestNo'];
+}
+if (isset($_POST['SearchPart'])) {
+ $StockItemsResult = GetSearchItems();
+}
+if (isset($_POST['StockID'])) {
+ $StockID = trim(mb_strtoupper($_POST['StockID']));
+}
+if (isset($_POST['SelectedStockItem'])) {
+ $StockID = $_POST['SelectedStockItem'];
+}
+
+if (!isset($StockID) AND !isset($_POST['Search'])) {//The scripts is just opened or click a submit button
+ if (!isset($RequestNo) OR $RequestNo == '') {
+ echo '<table class="selection">
+ <tr>
+ <td>' . _('Request Number') . ':</td>
+ <td><input type="text" name="OrderNumber" maxlength="8" size="9" /></td>
+ <td>' . _('From Stock Location') . ':</td>
+ <td><select name="StockLocation">';
+ $sql = "SELECT locations.loccode, locationname, canview FROM locations
+ INNER JOIN locationusers
+ ON locationusers.loccode=locations.loccode
+ AND locationusers.userid='" . $_SESSION['UserID'] . "'
+ AND locationusers.canview=1
+ AND locations.internalrequest=1";
+ $locresult = DB_query($sql);
+ $LocationCounter = DB_num_rows($locresult);
+ $locallctr = 0;//location all counter
+ $locctr = 0;//location counter
+ $Locations = array();
+ if ($LocationCounter>0) {
+ while ($myrow = DB_fetch_array($locresult)) {
+ $Locations[] = $myrow['loccode'];
+ if (isset($_POST['StockLocation'])){
+ if ($_POST['StockLocation'] == 'All' AND $locallctr == 0) {
+ $locallctr = 1;
+ echo '<option value="All" selected="selected">' . _('All') . '</option>';
+ } elseif ($myrow['loccode'] == $_POST['StockLocation']) {
+ echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ }
+ } else {
+ if ($LocationCounter>1 AND $locctr == 0) {//we show All only when it is necessary
+ echo '<option value="All">' . _('All') . '</option>';
+ $loctr = 1;
+ }
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ }
+ }
+ echo '<select></td>';
+ } else {//there are possiblity that the user is the authorization person,lets figure things out
+
+ $sql = "SELECT stockrequest.loccode,locations.locationname FROM stockrequest INNER JOIN locations ON stockrequest.loccode=locations.loccode
+ INNER JOIN department ON stockrequest.departmentid=department.departmentid WHERE department.authoriser='" . $_SESSION['UserID'] . "'";
+ $authresult = DB_query($sql);
+ $LocationCounter = DB_num_rows($authresult);
+ if ($LocationCounter>0) {
+ $Authorizer = true;
+
+ while ($myrow = DB_fetch_array($authresult)) {
+ $Locations[] = $myrow['loccode'];
+ if (isset($_POST['StockLocation'])) {
+ if ($_POST['StockLocation'] == 'All' AND $locallctr==0) {
+ echo '<option value="All" selected="selected">' . _('All') . '</option>';
+ $locallctr = 1;
+ } elseif ($myrow['loccode'] == $_POST['StockLocation']) {
+ echo '<option value="' . $myrow['loccode'] . '" selected="selected">' . $myrow['locationname'] . '</option>';
+ }
+ } else {
+ if ($LocationCounter>1 AND $locctr == 0) {
+ $locctr = 1;
+ echo '<option value="All">' . _('All') . '</option>';
+ }
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] .'</option>';
+ }
+ }
+ echo '</select></td>';
+
+
+ } else {
+ prnMsg(_('You have no authority to do the internal request inquiry'),'error');
+ include('includes/footer.inc');
+ exit;
+ }
+ }
+ echo '<input type="hidden" name="Locations" value="' . serialize($Locations) . '" />';//store the locations for later using;
+ if (!isset($_POST['Authorized'])) {
+ $_POST['Authorized'] = 'All';
+ }
+ echo '<td>' . _('Authorisation status') . '</td>
+ <td><select name="Authorized">';
+ $Auth = array('All'=>_('All'),0=>_('Unauthorized'),1=>_('Authorized'));
+ foreach ($Auth as $key=>$value) {
+ if ($_POST['Authorized'] == $value) {
+ echo '<option selected="selected" value="' . $key . '">' . $value . '</option>';
+ } else {
+ echo '<option value="' . $key . '">' . $value . '</option>';
+ }
+ }
+ echo '</select></td></tr>';
+ }
+ //add the department, sometime we need to check each departments' internal request
+ if (!isset($_POST['Department'])) {
+ $_POST['Department'] = '';
+ }
+
+ echo '<td>' . _('Department') . '</td>
+ <td><select name="Department">';
+ //now lets retrieve those deparment available for this user;
+ $sql = "SELECT departments.departmentid,
+ departments.description
+ FROM departments LEFT JOIN stockrequest
+ ON departments.departmentid = stockrequest.departmentid
+ AND (departments.authoriser = '" . $_SESSION['UserID'] . "' OR stockrequest.initiator = '" . $_SESSION['UserID'] . "')
+ WHERE stockrequest.dispatchid IS NOT NULL
+ GROUP BY stockrequest.departmentid";//if a full request is need, the users must have all of those departments' authority
+ $depresult = DB_query($sql);
+ if (DB_num_rows($depresult)>0) {
+ $Departments = array();
+ if (isset($_POST['Department']) AND $_POST['Department'] == 'All') {
+ echo '<option selected="selected" value="All">' . _('All') . '</option>';
+ } else {
+ echo '<option value="All">' . _('All') . '</option>';
+ }
+ while ($myrow = DB_fetch_array($depresult)) {
+ $Departments[] = $myrow['departmentid'];
+ if (isset($_POST['Department']) AND ($_POST['Department'] == $myrow['departmentid'])) {
+ echo '<option selected="selected" value="' . $myrow['departmentid'] . '">' . $myrow['description'] . '</option>';
+ } else {
+ echo '<option value="' . $myrow['departmentid'] . '">' . $myrow['description'] . '</option>';
+ }
+ }
+ echo '</select></td>';
+ echo '<input type="hidden" name="Departments" value="' . base64_encode(serialize($Departments)) . '" />';
+ } else {
+ prnMsg(_('There are no internal request result available for your or your department'),'error');
+ include('includes/footer.inc');
+ exit;
+ }
+
+ //now lets add the time period option
+ if (!isset($_POST['ToDate'])) {
+ $_POST['ToDate'] = '';
+ }
+ if (!isset($_POST['FromDate'])) {
+ $_POST['FromDate'] = '';
+ }
+ echo '<td>' . _('Date From') . '</td>
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="FromDate" maxlength="10" size="11" vaue="' . $_POST['FromDate'] .'" /></td>
+ <td>' . _('Date To') . '</td>
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="ToDate" maxlength="10" size="11" value="' . $_POST['ToDate'] . '" /></td>
+ <td><input type="submit" name="Search" value="' ._('Search') . '" /></td></tr></table>
+
+ ';
+ if (!isset($_POST['ShowDetails'])) {
+ $_POST['ShowDetails'] = 1;
+ }
+ $Checked = ($_POST['ShowDetails'] == 1)?'checked="checked"':'';
+ echo '<td>' . _('Show Details') . '
+ <input type="checkbox" ' . $Checked . ' name="ShowDetails" /> </td>';
+ //following is the item search parts which belong to the existed internal request, we should not search it generally, it'll be rediculous
+ //hereby if the authorizer is login, we only show all category available, even if there is problem, it'll be correceted later when items selected -:)
+ if (isset($Authorizer)) {
+ $WhereAuthorizer = '';
+ } else {
+ $WhereAuthorizer = " AND internalstockcatrole.secroleid = '" . $_SESSION['AccessLevel'] . "' ";
+ }
+
+ $SQL = "SELECT stockcategory.categoryid,
+ stockcategory.categorydescription
+ FROM stockcategory, internalstockcatrole
+ WHERE stockcategory.categoryid = internalstockcatrole.categoryid
+ " . $WhereAuthorizer . "
+ ORDER BY stockcategory.categorydescription";
+ $result1 = DB_query($SQL);
+ //first lets check that the category id is not zero
+ $Cats = DB_num_rows($result1);
+
+
+ if ($Cats >0) {
+
+ echo '<br /><table class="selection">
+ <tr>
+ <th colspan="6"><h3>' . _('To search for internal request for a specific part use the part selection facilities below') . '</h3></th>
+ </tr>
+ <tr>
+ <td>' . _('Stock Category') . '</td>
+ <td><select name="StockCat">';
+
+ if (!isset($_POST['StockCat'])) {
+ $_POST['StockCat'] = '';
+ }
+ if ($_POST['StockCat'] == 'All') {
+ echo '<option selected="selected" value="All">' . _('All Authorized') . '</option>';
+ } else {
+ echo '<option value="All">' . _('All Authorized') . '</option>';
+ }
+ while ($myrow1 = DB_fetch_array($result1)) {
+ if ($myrow1['categoryid'] == $_POST['StockCat']) {
+ echo '<option selected="selected" value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
+ } else {
+ echo '<option value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
+ }
+ }
+ echo '</selected></td>
+ <td>' . _('Enter partial') . ' <b>' . _('Description') . '</b>:</td>';
+ if (!isset($_POST['Keywords'])) {
+ $_POST['Keywords'] = '';
+ }
+ echo '<td><input type="text" name="Keywords" value="' . $_POST['Keywords'] . '" size="20" maxlength="25" /></td>';
+ echo '</tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td>' . _('OR') . ' ' . _('Enter partial') . ' <b>' . _('Stock Code') . '</b>:</td>';
+ if (!isset($_POST['StockCode'])) {
+ $_POST['StockCode'] = '';
+ }
+ echo '<td><input type="text" autofocus="autofocus" name="StockCode" value="' . $_POST['StockCode'] . '" size="15" maxlength="18" /></td>';
+
+ }
+ echo '</tr>
+ </table>
+ <br/>
+ <div class="centre">
+ <input type="submit" name="SearchPart" value="' . _('Search Now') . '" />
+ <input type="submit" name="ResetPart" value="' . _('Show All') . '" />
+ </div>
+ <br />
+ </div>
+ </form>';
+
+ if ($Cats == 0) {
+
+ echo '<p class="bad">' . _('Problem Report') . ':<br />' . _('There are no stock categories currently defined please use the link below to set them up') . '</p>';
+ echo '<br />
+ <a href="' . $RootPath . '/StockCategories.php">' . _('Define Stock Categories') . '</a>';
+ exit;
+ }
+
+
+}
+
+if(isset($StockItemsResult)){
+
+ if (isset($StockItemsResult)
+ AND DB_num_rows($StockItemsResult)>1) {
+ echo '<a href="' . $RootPath . '/InternalStockRequestInquiry.php">' . _('Return') . '</a>';
+ echo '<table cellpadding="2" class="selection">';
+ echo '<tr>
+ <th class="ascending" >' . _('Code') . '</th>
+ <th class="ascending" >' . _('Description') . '</th>
+ <th class="ascending" >' . _('Total Applied') . '</th>
+ <th>' . _('Units') . '</th>
+ </tr>';
+
+ $k=0; //row colour counter
+
+ while ($myrow=DB_fetch_array($StockItemsResult)) {
+
+ if ($k==1){
+ echo '<tr class="EvenTableRows">';
+ $k=0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k++;
+ }
+
+ printf('<td><input type="submit" name="SelectedStockItem" value="%s" /></td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td>%s</td>
+ </tr>',
+ $myrow['stockid'],
+ $myrow['description'],
+ locale_number_format($myrow['qoh'],$myrow['decimalplaces']),
+ $myrow['units']);
+//end of page full new headings if
+ }
+//end of while loop
+
+ echo '</table>';
+
+}
+
+} elseif(isset($_POST['Search']) OR isset($StockID)) {//lets show the search result here
+ if (isset($StockItemsResult) AND DB_num_rows($StockItemsResult) == 1) {
+ $StockID = DB_fetch_array($StockItemsResult);
+ $StockID = $StockID[0];
+ }
+
+ if (isset($_POST['ShowDetails']) OR isset($StockID)) {
+ $SQL = "SELECT stockrequest.dispatchid,
+ stockrequest.loccode,
+ stockrequest.departmentid,
+ departments.description,
+ locations.locationname,
+ despatchdate,
+ authorised,
+ closed,
+ narrative,
+ initiator,
+ stockrequestitems.stockid,
+ stockmaster.description as stkdescription,
+ quantity,
+ stockrequestitems.decimalplaces,
+ uom,
+ completed
+ FROM stockrequest INNER JOIN stockrequestitems ON stockrequest.dispatchid=stockrequestitems.dispatchid
+ INNER JOIN departments ON stockrequest.departmentid=departments.departmentid
+ INNER JOIN locations ON locations.loccode=stockrequest.loccode
+ INNER JOIN stockmaster ON stockrequestitems.stockid=stockmaster.stockid
+ ";
+ } else {
+ $SQL = "SELECT stockrequest.dispatchid,
+ stockrequest.loccode,
+ stockrequest.departmentid,
+ departments.description,
+ locations.locationname,
+ despatchdate,
+ authorised,
+ closed,
+ narrative,
+ initiator
+ FROM stockrequest INNER JOIN departments ON stockrequest.departmentid=departments.departmentid
+ INNER JOIN locations ON locations.loccode=stockrequest.loccode ";
+ }
+ //lets add the condition selected by users
+ if (isset($_POST['RequestNo'])) {
+ $SQL .= "WHERE stockrequest.dispatchid = '" . $_POST['RequsetNo'] . "'";
+ } else {
+ //first the constraint of locations;
+ if ($_POST['StockLocation'] != 'All') {//retrieve the location data from current code
+ $SQL .= "WHERE stockrequest.loccode='" . $_POST['StockLocation'] . "'";
+ } else {//retrieve the location data from serialzed data
+ if (!in_array(19,$_SESSION['AllowedPageSecurityTokens'])) {
+ $Locations = unserialize($_POST['Locations']);
+ $Locations = implode("','",$Locations);
+ $SQL .= "WHERE stockrequest.loccode in ('" . $Locations . "')";
+ }
+ }
+ //the authorization status
+ if ($_POST['Authorized'] != 'All') {//no bothering for all
+ $SQL .= " AND authorised = '" . $_POST['Authorized'] . "'";
+ }
+ //the department: if the department is all, no bothering for this since user has no relation ship with department; but consider the efficency, we should use the departments to filter those no needed out
+ if ($_POST['Department'] == 'All') {
+ if (!in_array(19,$_SESSION['AllowedPageSecurityTokens'])) {
+
+ if (isset($_POST['Departments'])) {
+ $Departments = unserialize(base64_decode($_POST['Departments']));
+ $Departments = implode("','", $Departments);
+ $SQL .= " AND stockrequest.departmentid IN ('" . $Departments . "')";
+
+ } //IF there are no departments set,so forgot it
+
+ }
+ } else {
+ $SQL .= " AND stockrequest.departmentid='" . $_POST['Department'] . "'";
+ }
+ //Date from
+ if (isset($_POST['DateFrom']) AND is_date($_POST['DateFrom'])) {
+ $SQL .= " AND despatchdate>='" . $_POST['DateFrom'] . "'";
+ }
+ if (isset($_POST['DateTo']) AND is_date($_POST['DateTo'])) {
+ $SQL .= " AND despatchdate<='" . $_POST['DateTo'] . "'";
+ }
+ //item selected
+ if (isset($StockID)) {
+ $SQL .= " AND stockrequestitems.stockid='" . $StockID . "'";
+ }
+ }//end of no request no selected
+ //the user or authority contraint
+ if (!in_array(19,$_SESSION['AllowedPageSecurityTokens'])) {
+ $SQL .= " AND (authoriser='" . $_SESSION['UserID'] . "' OR initiator='" . $_SESSION['UserID'] . "')";
+ }
+ $result = DB_query($SQL);
+ if (DB_num_rows($result)>0) {
+ $Html = '';
+ if (isset($_POST['ShowDetails']) OR isset($StockID)) {
+ $Html .= '<table>
+ <tr>
+ <th>' . _('ID') . '</th>
+ <th>' . _('Locations') . '</th>
+ <th>' . _('Department') . '</th>
+ <th>' . _('Authorization') . '</th>
+ <th>' . _('Dispatch Date') . '</th>
+ <th>' . _('Stock ID') . '</th>
+ <th>' . _('Description') . '</th>
+ <th>' . _('Quantity') . '</th>
+ <th>' . _('Units') . '</th>
+ <th>' . _('Completed') . '</th>
+ </tr>';
+ } else {
+ $Html .= '<table>
+ <tr>
+ <th>' . _('ID') . '</th>
+ <th>' . _('Locations') . '</th>
+ <th>' . _('Department') . '</th>
+ <th>' . _('Authorization') . '</th>
+ <th>' . _('Dispatch Date') . '</th>
+ </tr>';
+ }
+
+ if (isset($_POST['ShowDetails']) OR isset($StockID)) {
+ $ID = '';//mark the ID change of the internal request
+ }
+ $i = 0;
+ //There are items without details AND with it
+ while ($myrow = DB_fetch_array($result)) {
+ if ($i == 0) {
+ $Html .= "<tr class=\"EvenTableRows\">";
+ $i = 1;
+ } elseif ($i == 1) {
+ $Html .= "<tr class=\"OddTableRows\">";
+ $i = 0;
+ }
+ if ($myrow['authorised'] == 0) {
+ $Auth = _('No');
+ } else {
+ $Auth = _('Yes');
+ }
+ if ($myrow['despatchdate'] == '0000-00-00') {
+ $Disp = _('Not yet');
+ } else {
+ $Disp = ConvertSQLDate($myrow['despatchdate']);
+ }
+ if (isset($ID)) {
+ if ($myrow['completed'] == 0) {
+ $Comp = _('No');
+ } else {
+ $Comp = _('Yes');
+ }
+ }
+ if (isset($ID) AND ($ID != $myrow['dispatchid'])) {
+ $ID = $myrow['dispatchid'];
+ $Html .= '<td>' . $myrow['dispatchid'] . '</td>
+ <td>' . $myrow['locationname'] . '</td>
+ <td>' . $myrow['description'] . '</td>
+ <td>' . $Auth . '</td>
+ <td>' . $Disp . '</td>
+ <td>' . $myrow['stockid'] . '</td>
+ <td>' . $myrow['stkdescription'] . '</td>
+ <td>' . locale_number_format($myrow['quantity'],$myrow['decimalplaces']) . '</td>
+ <td>' . $myrow['uom'] . '</td>
+ <td>' . $Comp . '</td>';
+
+ } elseif (isset($ID) AND ($ID == $myrow['dispatchid'])) {
+ $Html .= '<td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td>' . $myrow['stockid'] . '</td>
+ <td>' . $myrow['stkdescription'] . '</td>
+ <td>' . locale_number_format($myrow['quantity'],$myrow['decimalplaces']) . '</td>
+ <td>' . $myrow['uom'] . '</td>
+ <td>' . $Comp . '</td>';
+ } elseif(!isset($ID)) {
+ $Html .= '<td>' . $myrow['dispatchid'] . '</td>
+ <td>' . $myrow['locationname'] . '</td>
+ <td>' . $myrow['description'] . '</td>
+ <td>' . $Auth . '</td>
+ <td>' . $Disp . '</td>';
+ }
+ $Html .= '</tr>';
+ }//end of while loop;
+ $Html .= '</table>';
+ echo '<a href="' . $RootPath . '/InternalStockRequestInquiry.php">' . _('Select Others') . '</a>';
+
+ echo $Html;
+ } else {
+ prnMsg(_('There are no stock request available'),'warn');
+ }
+
+
+
+
+
+
+
+
+
+
+}
+
+include('includes/footer.inc');
+exit;
+
+function GetSearchItems ($SQLConstraint='') {
+ global $db;
+ if ($_POST['Keywords'] AND $_POST['StockCode']) {
+ echo _('Stock description keywords have been used in preference to the Stock code extract entered');
+ }
+ $SQL = "SELECT stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.decimalplaces,
+ SUM(stockrequestitems.quantity) AS qoh,
+ stockmaster.units
+ FROM stockrequestitems INNER JOIN stockrequest ON stockrequestitems.dispatchid=stockrequest.dispatchid
+ INNER JOIN departments ON stockrequest.departmentid = departments.departmentid
+
+ INNER JOIN stockmaster ON stockrequestitems.stockid = stockmaster.stockid";
+ if (isset($_POST['StockCat'])
+ AND ((trim($_POST['StockCat']) == '') OR $_POST['StockCat'] == 'All')){
+ $WhereStockCat = '';
+ } else {
+ $WhereStockCat = " AND stockmaster.categoryid='" . $_POST['StockCat'] . "' ";
+ }
+ if ($_POST['Keywords']) {
+ //insert wildcard characters in spaces
+ $SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
+
+ $SQL .= " WHERE stockmaster.description " . LIKE . " '" . $SearchString . "'
+ " . $WhereStockCat ;
+
+
+ } elseif (isset($_POST['StockCode'])){
+ $SQL .= " WHERE stockmaster.stockid " . LIKE . " '%" . $_POST['StockCode'] . "%'" . $WhereStockCat;
+
+ } elseif (!isset($_POST['StockCode']) AND !isset($_POST['Keywords'])) {
+ $SQL .= " WHERE stockmaster.categoryid='" . $_POST['StockCat'] ."'";
+
+ }
+ $SQL .= ' AND (departments.authoriser="' . $_SESSION['UserID'] . '" OR initiator="' . $_SESSION['UserID'] . '") ';
+ $SQL .= $SQLConstraint;
+ $SQL .= " GROUP BY stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.decimalplaces,
+ stockmaster.units
+ ORDER BY stockmaster.stockid";
+ $ErrMsg = _('No stock items were returned by the SQL because');
+ $DbgMsg = _('The SQL used to retrieve the searched parts was');
+ $StockItemsResult = DB_query($SQL,$ErrMsg,$DbgMsg);
+ return $StockItemsResult;
+
+ }
+?>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-07-22 05:00:47 UTC (rev 7571)
+++ trunk/doc/Change.log 2016-07-25 08:13:03 UTC (rev 7572)
@@ -1,5 +1,5 @@
webERP Change Log
-
+25/07/16 Exson: Add InternalStockRequestInquiry.php script.
22/07/16 Exson: Make items search limited to the sales orders and if search result is 1 show the result immediately in SelectSalesOrder.php
22/07/16 Exson: Add empty check for internal request to avoid empty request creating in InternalStockRequest.php.
09/07/16 Exson: Fixed the utf8 character print incorrect of pdf file in class.pdf.php.
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2016-07-22 05:00:47 UTC (rev 7571)
+++ trunk/includes/MainMenuLinksArray.php 2016-07-25 08:13:03 UTC (rev 7572)
@@ -244,7 +244,8 @@
_('List Negative Stocks'),
_('Period Stock Transaction Listing'),
_('Stock Transfer Note'),
- _('Aged Controlled Stock Report'));
+ _('Aged Controlled Stock Report'),
+ _('Internal stock request inquiry'));
$MenuItems['stock']['Reports']['URL'] = array( '/StockSerialItemResearch.php',
'/PDFPrintLabel.php',
@@ -268,7 +269,8 @@
'/PDFStockNegatives.php',
'/PDFPeriodStockTransListing.php',
'/PDFStockTransfer.php',
- '/AgedControlledInventory.php');
+ '/AgedControlledInventory.php',
+ '/InternalStockRequestInquiry.php');
$MenuItems['stock']['Maintenance']['Caption'] = array( _('Add A New Item'),
_('Select An Item'),
Added: trunk/sql/mysql/upgrade4.13-4.13.1.sql
===================================================================
--- trunk/sql/mysql/upgrade4.13-4.13.1.sql (rev 0)
+++ trunk/sql/mysql/upgrade4.13-4.13.1.sql 2016-07-25 08:13:03 UTC (rev 7572)
@@ -0,0 +1,5 @@
+INSERT INTO scripts VALUES ('InternalStockRequestInquiry.php',1,'Internal Stock Request inquiry');
+ALTER table stockrequest ADD initiator varchar(20) NOT NULL DEFAULT '';
+INSERT INTO securitytokens VALUES (19,'Internal stock request fully access authority');
+
+
|
|
From: <ex...@us...> - 2016-07-27 07:03:30
|
Revision: 7573
http://sourceforge.net/p/web-erp/reponame/7573
Author: exsonqu
Date: 2016-07-27 07:03:27 +0000 (Wed, 27 Jul 2016)
Log Message:
-----------
27/07/16 Exson: Add error proof to avoid a blank credit note issued without any items credited or freight charge input in Credit_Invoice.php.
Modified Paths:
--------------
trunk/Credit_Invoice.php
trunk/doc/Change.log
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2016-07-25 08:13:03 UTC (rev 7572)
+++ trunk/Credit_Invoice.php 2016-07-27 07:03:27 UTC (rev 7573)
@@ -219,14 +219,24 @@
$myrow = DB_fetch_array($NewDispatchTaxProvResult);
$_SESSION['CreditItems' . $identifier]->DispatchTaxProvince = $myrow['taxprovinceid'];
+
+ $TotalQtyCredited = 0;
foreach($_SESSION['CreditItems' . $identifier]->LineItems as $LineItem) {
$_SESSION['CreditItems' . $identifier]->GetTaxes($LineItem->LineNumber);
+ $TotalQtyCredited += $LineItem->QtyDispatched;
}
}
if(isset($_POST['ChargeFreightCost'])) {
$_SESSION['CreditItems' . $identifier]->FreightCost = filter_number_format($_POST['ChargeFreightCost']);
+ if (($TotalQtyCredit + abs($_POST['ChargeFreightCost']))<=0) {
+ prnMsg(_('There are no item quantity or freight charge input'),'error');
+ if (isset($_POST['ProcessCredit'])) {
+ unset($_POST['ProcessCredit']);
+ }
+ }
+
}
if($_SESSION['SalesmanLogin'] == '') {
if(isset($_POST['SalesPerson'])) {
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-07-25 08:13:03 UTC (rev 7572)
+++ trunk/doc/Change.log 2016-07-27 07:03:27 UTC (rev 7573)
@@ -1,4 +1,6 @@
webERP Change Log
+
+27/07/16 Exson: Add error proof to avoid a blank credit note issued without any items credited or freight charge input in Credit_Invoice.php.
25/07/16 Exson: Add InternalStockRequestInquiry.php script.
22/07/16 Exson: Make items search limited to the sales orders and if search result is 1 show the result immediately in SelectSalesOrder.php
22/07/16 Exson: Add empty check for internal request to avoid empty request creating in InternalStockRequest.php.
|
Thanks for helping keep SourceForge clean.
X