From: <rc...@us...> - 2014-09-11 13:20:35
|
Revision: 6877 http://sourceforge.net/p/web-erp/reponame/6877 Author: rchacon Date: 2014-09-11 13:20:27 +0000 (Thu, 11 Sep 2014) Log Message: ----------- Adds gettext() to line 402 of CustomerAllocations.php. Reported by Harald. Modified Paths: -------------- trunk/CustomerAllocations.php trunk/doc/Change.log Modified: trunk/CustomerAllocations.php =================================================================== --- trunk/CustomerAllocations.php 2014-09-11 09:39:28 UTC (rev 6876) +++ trunk/CustomerAllocations.php 2014-09-11 13:20:27 UTC (rev 6877) @@ -7,7 +7,7 @@ 3. No parameters to show all outstanding credits and receipts yet to be allocated. */ -include('includes/DefineCustAllocsClass.php');// Before includes/session.inc ********** +include('includes/DefineCustAllocsClass.php');// Before includes/session.inc ******* include('includes/session.inc'); $Title = _('Customer Receipt') . '/' . _('Credit Note Allocations'); @@ -399,7 +399,7 @@ $curTrans = " "; } - echo '<td>' . $AllocnItem->TransType . '</td> + echo '<td>' . _($AllocnItem->TransType) . '</td> <td class="number">' . $AllocnItem->TypeNo . '</td> <td>' . $AllocnItem->TransDate . '</td> <td class="number">' . locale_number_format($AllocnItem->TransAmount,$_SESSION['Alloc']->CurrDecimalPlaces) . '</td> @@ -413,7 +413,7 @@ </tr>'; } else { echo '<td class="number"><input type="hidden" name="YetToAlloc' . $Counter . '" value="' . round($YetToAlloc,$_SESSION['Alloc']->CurrDecimalPlaces) . '" />'; - echo '<input tabindex="' . $j .'" type="checkbox" title="' . _('Check this box to allocate the entire amouunt of this transaction. Just enter the amount without ticking this check box for a partial allocation') . '" name="All' . $Counter . '"'; + echo '<input tabindex="' . $j .'" type="checkbox" title="' . _('Check this box to allocate the entire amouunt of this transaction. Just enter the amount without ticking this check box for a partial allocation') . '" name="All' . $Counter . '"';// NewText: _('Check this box to allocate the entire amount of this transaction. Just enter the amount without ticking this check box for a partial allocation') if (ABS($AllocnItem->AllocAmt-$YetToAlloc) < 0.01) { echo ' checked="checked" />'; Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2014-09-11 09:39:28 UTC (rev 6876) +++ trunk/doc/Change.log 2014-09-11 13:20:27 UTC (rev 6877) @@ -1,4 +1,5 @@ webERP Change Log +11/09/14 RChacon: Adds gettext() to line 402 of CustomerAllocations.php. Reported by Harald. 11/09/14 Exson: Code tidy up to make it meet coding guidance in CustomerInquiry.php. 11/09/14: Exson: Fixed the prnMsg bug in CustomerReceipt.php and add an inquiry link in it and make a status selectable in Customer inquiry and removed those rowstring definition which caused printf parameters missing. 31/8/14 RChacon: In general: Replaces code to determine background colour with TableRows(). Adds comments to ManualNewScripts.html. Fixes manual.css format. In GLTransInquiry.php: Adds $ViewTopic and $BookMark and sorts columns, and minor improvements. Minor translation improvements. |
From: <rc...@us...> - 2014-09-11 15:03:10
|
Revision: 6878 http://sourceforge.net/p/web-erp/reponame/6878 Author: rchacon Date: 2014-09-11 15:03:03 +0000 (Thu, 11 Sep 2014) Log Message: ----------- Fixes word "amount". Modified Paths: -------------- trunk/CustomerAllocations.php trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo trunk/locale/en_US.utf8/LC_MESSAGES/messages.po trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po Modified: trunk/CustomerAllocations.php =================================================================== --- trunk/CustomerAllocations.php 2014-09-11 13:20:27 UTC (rev 6877) +++ trunk/CustomerAllocations.php 2014-09-11 15:03:03 UTC (rev 6878) @@ -413,7 +413,7 @@ </tr>'; } else { echo '<td class="number"><input type="hidden" name="YetToAlloc' . $Counter . '" value="' . round($YetToAlloc,$_SESSION['Alloc']->CurrDecimalPlaces) . '" />'; - echo '<input tabindex="' . $j .'" type="checkbox" title="' . _('Check this box to allocate the entire amouunt of this transaction. Just enter the amount without ticking this check box for a partial allocation') . '" name="All' . $Counter . '"';// NewText: _('Check this box to allocate the entire amount of this transaction. Just enter the amount without ticking this check box for a partial allocation') + echo '<input tabindex="' . $j .'" type="checkbox" title="' . _('Check this box to allocate the entire amount of this transaction. Just enter the amount without ticking this check box for a partial allocation') . '" name="All' . $Counter . '"';// NewText: _('Check this box to allocate the entire amount of this transaction. Just enter the amount without ticking this check box for a partial allocation') if (ABS($AllocnItem->AllocAmt-$YetToAlloc) < 0.01) { echo ' checked="checked" />'; 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 2014-09-11 13:20:27 UTC (rev 6877) +++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2014-09-11 15:03:03 UTC (rev 6878) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: web-erp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-18 13:21-0600\n" +"POT-Creation-Date: 2014-09-11 08:16-0600\n" "PO-Revision-Date: 2013-06-01 11:19-0600\n" "Last-Translator: Rafael Chacon <raf...@gm...>\n" "Language-Team: Arabic <ar...@li...>\n" @@ -18,7 +18,7 @@ "X-Generator: Poedit 1.5.4\n" "X-Launchpad-Export-Date: 2012-03-07 23:01+0000\n" -#: AccountGroups.php:7 includes/MainMenuLinksArray.php:372 +#: AccountGroups.php:7 includes/MainMenuLinksArray.php:374 msgid "Account Groups" msgstr "مجموعات العضوية" @@ -73,7 +73,7 @@ msgid "The account group name cannot contain the character" msgstr "لا يمكن وضع هذا الحرف في اسم المجموعة" -#: AccountGroups.php:87 Departments.php:30 TaxCategories.php:31 +#: AccountGroups.php:87 Departments.php:30 TaxCategories.php:32 msgid "or the character" msgstr "او الحرف" @@ -163,9 +163,9 @@ #: CustomerTypes.php:156 Customers.php:296 Customers.php:305 Customers.php:313 #: Customers.php:324 Customers.php:334 Departments.php:141 Factors.php:134 #: FixedAssetCategories.php:137 GLAccounts.php:80 GLAccounts.php:96 -#: Locations.php:267 Locations.php:275 Locations.php:286 Locations.php:295 -#: Locations.php:304 Locations.php:313 Locations.php:322 Locations.php:331 -#: Locations.php:339 MRPDemandTypes.php:87 Manufacturers.php:154 +#: Locations.php:279 Locations.php:287 Locations.php:298 Locations.php:307 +#: Locations.php:316 Locations.php:325 Locations.php:334 Locations.php:343 +#: Locations.php:351 MRPDemandTypes.php:87 Manufacturers.php:154 #: PaymentMethods.php:142 PaymentTerms.php:146 PaymentTerms.php:153 #: PcExpenses.php:161 SalesCategories.php:128 SalesCategories.php:135 #: SalesPeople.php:150 SalesPeople.php:157 SalesPeople.php:163 @@ -173,7 +173,7 @@ #: StockCategories.php:209 Stocks.php:738 Stocks.php:747 Stocks.php:755 #: Stocks.php:763 Stocks.php:771 Stocks.php:779 Stocks.php:787 Stocks.php:795 #: SupplierTypes.php:126 Suppliers.php:647 Suppliers.php:656 Suppliers.php:664 -#: TaxCategories.php:131 TaxGroups.php:132 TaxGroups.php:140 +#: TaxCategories.php:132 TaxGroups.php:134 TaxGroups.php:142 #: TaxProvinces.php:129 UnitsOfMeasure.php:135 WWW_Access.php:86 #: WorkCentres.php:89 WorkCentres.php:95 msgid "There are" @@ -230,7 +230,7 @@ #: AddCustomerTypeNotes.php:94 AgedDebtors.php:454 AgedSuppliers.php:276 #: Areas.php:144 AuditTrail.php:11 BOMExtendedQty.php:256 BOMIndented.php:248 #: BOMIndentedReverse.php:236 BOMInquiry.php:188 BOMListing.php:110 -#: BOMs.php:234 BOMs.php:877 BankReconciliation.php:17 COGSGLPostings.php:19 +#: BOMs.php:237 BOMs.php:881 BankReconciliation.php:17 COGSGLPostings.php:19 #: CompanyPreferences.php:102 CounterReturns.php:1623 CounterSales.php:2108 #: CounterSales.php:2231 CreditStatus.php:21 Credit_Invoice.php:276 #: Currencies.php:30 CustEDISetup.php:17 CustItem.php:120 CustItem.php:210 @@ -258,7 +258,7 @@ #: SelectCustomer.php:265 SelectGLAccount.php:65 SelectOrderItems.php:559 #: SelectOrderItems.php:1444 SelectOrderItems.php:1572 SelectProduct.php:534 #: SelectSalesOrder.php:508 SelectSupplier.php:14 SelectSupplier.php:220 -#: SelectWorkOrder.php:9 SelectWorkOrder.php:170 SellThroughSupport.php:229 +#: SelectWorkOrder.php:9 SelectWorkOrder.php:174 SellThroughSupport.php:229 #: ShipmentCosting.php:11 Shipments.php:17 Shippers.php:123 Shippers.php:160 #: Shipt_Select.php:8 StockLocMovements.php:14 StockLocStatus.php:29 #: StockSerialItemResearch.php:30 SupplierPriceList.php:14 @@ -267,11 +267,10 @@ #: SupplierPriceList.php:499 SupplierTenderCreate.php:556 #: SupplierTenderCreate.php:664 SupplierTenders.php:322 #: SupplierTenders.php:388 SupplierTransInquiry.php:10 Suppliers.php:305 -#: TaxGroups.php:15 TaxProvinces.php:11 TopItems.php:115 UnitsOfMeasure.php:10 -#: WWW_Access.php:11 WWW_Users.php:36 WhereUsedInquiry.php:18 -#: WorkCentres.php:111 WorkCentres.php:163 WorkOrderCosting.php:22 -#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:31 -#: WorkOrderStatus.php:59 Z_BottomUpCosts.php:57 +#: TopItems.php:115 UnitsOfMeasure.php:10 WWW_Access.php:11 WWW_Users.php:36 +#: WhereUsedInquiry.php:18 WorkCentres.php:111 WorkCentres.php:163 +#: WorkOrderCosting.php:22 WorkOrderEntry.php:11 WorkOrderIssue.php:22 +#: WorkOrderReceive.php:31 WorkOrderStatus.php:59 Z_BottomUpCosts.php:57 #: ../webSHOP/includes/header.php:251 msgid "Search" msgstr "إبحث" @@ -295,7 +294,7 @@ msgstr "" #: AccountGroups.php:310 AccountGroups.php:313 AccountGroups.php:448 -#: AccountGroups.php:450 BOMs.php:125 BOMs.php:789 BOMs.php:791 +#: AccountGroups.php:450 BOMs.php:126 BOMs.php:793 BOMs.php:795 #: CompanyPreferences.php:427 CompanyPreferences.php:429 #: CompanyPreferences.php:442 CompanyPreferences.php:444 #: CompanyPreferences.php:457 CompanyPreferences.php:459 @@ -304,9 +303,10 @@ #: Customers.php:1049 Customers.php:1055 Customers.php:1058 #: DailyBankTransactions.php:148 DeliveryDetails.php:1148 #: DeliveryDetails.php:1191 DeliveryDetails.php:1194 FormDesigner.php:101 -#: GLTransInquiry.php:69 Labels.php:603 Labels.php:605 Labels.php:630 -#: Locations.php:646 Locations.php:648 MRP.php:542 MRP.php:546 MRP.php:550 -#: MRP.php:554 MRPCalendar.php:224 PDFChequeListing.php:65 PDFDIFOT.php:80 +#: GLTransInquiry.php:74 Labels.php:603 Labels.php:605 Labels.php:630 +#: Locations.php:660 Locations.php:662 Locations.php:675 Locations.php:677 +#: MRP.php:546 MRP.php:550 MRP.php:554 MRP.php:558 MRP.php:562 +#: MRPCalendar.php:224 PDFChequeListing.php:65 PDFDIFOT.php:80 #: PDFDeliveryDifferences.php:76 PDFWOPrint.php:601 PDFWOPrint.php:605 #: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139 #: PO_Header.php:804 PO_PDFPurchOrder.php:413 PO_PDFPurchOrder.php:416 @@ -335,15 +335,15 @@ #: SystemParameters.php:1006 SystemParameters.php:1016 #: SystemParameters.php:1018 SystemParameters.php:1072 #: SystemParameters.php:1084 SystemParameters.php:1086 -#: SystemParameters.php:1124 SystemParameters.php:1126 TaxGroups.php:311 -#: TaxGroups.php:314 TaxGroups.php:371 WWW_Users.php:505 WWW_Users.php:507 +#: SystemParameters.php:1124 SystemParameters.php:1126 TaxGroups.php:310 +#: TaxGroups.php:313 TaxGroups.php:364 WWW_Users.php:505 WWW_Users.php:507 #: WWW_Users.php:678 WWW_Users.php:680 #: reportwriter/languages/en_US/reports.php:114 msgid "Yes" msgstr "موافق" #: AccountGroups.php:316 AccountGroups.php:453 AccountGroups.php:455 -#: BOMs.php:127 BOMs.php:788 BOMs.php:792 BankAccounts.php:210 +#: BOMs.php:128 BOMs.php:792 BOMs.php:796 BankAccounts.php:210 #: BankAccounts.php:379 BankAccounts.php:381 BankAccounts.php:385 #: BankAccounts.php:393 CompanyPreferences.php:426 CompanyPreferences.php:430 #: CompanyPreferences.php:441 CompanyPreferences.php:445 @@ -353,11 +353,12 @@ #: Customers.php:1047 Customers.php:1054 Customers.php:1057 #: DailyBankTransactions.php:150 DeliveryDetails.php:1149 #: DeliveryDetails.php:1192 DeliveryDetails.php:1195 FormDesigner.php:99 -#: GLTransInquiry.php:88 Labels.php:602 Labels.php:606 Labels.php:631 -#: Locations.php:651 Locations.php:653 MRP.php:540 MRP.php:544 MRP.php:548 -#: MRP.php:552 MRPCalendar.php:226 NoSalesItems.php:191 -#: PDFChequeListing.php:64 PDFDIFOT.php:79 PDFDeliveryDifferences.php:75 -#: PDFWOPrint.php:602 PDFWOPrint.php:606 PO_AuthorisationLevels.php:136 +#: GLTransInquiry.php:93 Labels.php:602 Labels.php:606 Labels.php:631 +#: Locations.php:665 Locations.php:667 Locations.php:680 Locations.php:682 +#: MRP.php:544 MRP.php:548 MRP.php:552 MRP.php:556 MRP.php:560 +#: MRPCalendar.php:226 NoSalesItems.php:191 PDFChequeListing.php:64 +#: PDFDIFOT.php:79 PDFDeliveryDifferences.php:75 PDFWOPrint.php:602 +#: PDFWOPrint.php:606 PO_AuthorisationLevels.php:136 #: PO_AuthorisationLevels.php:141 PO_Header.php:803 PO_PDFPurchOrder.php:414 #: PO_PDFPurchOrder.php:417 PaymentMethods.php:204 PaymentMethods.php:205 #: PaymentMethods.php:206 PaymentMethods.php:207 PaymentMethods.php:274 @@ -384,17 +385,16 @@ #: SystemParameters.php:1007 SystemParameters.php:1015 #: SystemParameters.php:1019 SystemParameters.php:1073 #: SystemParameters.php:1083 SystemParameters.php:1087 -#: SystemParameters.php:1123 SystemParameters.php:1127 TaxGroups.php:312 -#: TaxGroups.php:315 TaxGroups.php:373 WWW_Users.php:504 WWW_Users.php:508 +#: SystemParameters.php:1123 SystemParameters.php:1127 TaxGroups.php:311 +#: TaxGroups.php:314 TaxGroups.php:366 WWW_Users.php:504 WWW_Users.php:508 #: WWW_Users.php:677 WWW_Users.php:681 includes/PDFLowGPPageHeader.inc:44 -#: includes/PDFTaxPageHeader.inc:35 #: reportwriter/languages/en_US/reports.php:82 msgid "No" msgstr "ﻻ" #: AccountGroups.php:325 AccountSections.php:193 AddCustomerContacts.php:148 #: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164 -#: BOMs.php:153 BankAccounts.php:223 COGSGLPostings.php:112 +#: BOMs.php:155 BankAccounts.php:223 COGSGLPostings.php:112 #: COGSGLPostings.php:216 CreditStatus.php:175 Currencies.php:362 #: Currencies.php:379 CustItem.php:166 CustomerBranches.php:455 #: CustomerTypes.php:205 Customers.php:1132 Customers.php:1166 @@ -402,7 +402,7 @@ #: FixedAssetCategories.php:190 FixedAssetLocations.php:111 #: FreightCosts.php:253 GLAccounts.php:317 GLTags.php:96 GeocodeSetup.php:173 #: ImportBankTransAnalysis.php:224 InternalStockRequest.php:293 Labels.php:335 -#: Labels.php:360 Locations.php:422 MRPDemandTypes.php:120 MRPDemands.php:309 +#: Labels.php:360 Locations.php:434 MRPDemandTypes.php:120 MRPDemands.php:309 #: MailingGroupMaintenance.php:178 MaintenanceTasks.php:118 #: Manufacturers.php:217 PO_AuthorisationLevels.php:151 PaymentMethods.php:208 #: PaymentTerms.php:205 PcAssignCashToTab.php:277 @@ -416,8 +416,8 @@ #: SelectGLAccount.php:132 SellThroughSupport.php:298 Shippers.php:144 #: StockCategories.php:289 SuppTransGLAnalysis.php:125 #: SupplierContacts.php:165 SupplierTenderCreate.php:157 SupplierTypes.php:170 -#: TaxAuthorities.php:174 TaxCategories.php:182 TaxGroups.php:188 -#: TaxProvinces.php:180 UnitsOfMeasure.php:185 WWW_Access.php:126 +#: TaxAuthorities.php:172 TaxCategories.php:184 TaxGroups.php:190 +#: TaxProvinces.php:179 UnitsOfMeasure.php:185 WWW_Access.php:126 #: WWW_Users.php:341 WorkCentres.php:142 includes/InputSerialItems.php:110 #: includes/OutputSerialItems.php:20 #: reportwriter/languages/en_US/reports.php:143 @@ -431,17 +431,17 @@ #: AccountGroups.php:326 AccountSections.php:197 AddCustomerContacts.php:149 #: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165 -#: BOMs.php:155 BankAccounts.php:224 COGSGLPostings.php:113 +#: BOMs.php:157 BankAccounts.php:224 COGSGLPostings.php:113 #: COGSGLPostings.php:217 ContractBOM.php:272 ContractOtherReqts.php:124 #: CounterReturns.php:740 CounterSales.php:836 CreditStatus.php:176 #: Credit_Invoice.php:404 Currencies.php:365 CustItem.php:167 -#: CustomerReceipt.php:987 CustomerTypes.php:206 Customers.php:1167 +#: CustomerReceipt.php:989 CustomerTypes.php:206 Customers.php:1167 #: Departments.php:187 DiscountCategories.php:238 DiscountMatrix.php:183 #: EDIMessageFormat.php:151 FixedAssetCategories.php:191 FreightCosts.php:254 #: GLAccounts.php:318 GLJournal.php:430 GLTags.php:97 GeocodeSetup.php:174 #: ImportBankTransAnalysis.php:225 InternalStockCategoriesByRole.php:184 #: InternalStockRequest.php:294 Labels.php:336 Labels.php:361 Labels.php:609 -#: Locations.php:423 MRPDemandTypes.php:121 MRPDemands.php:310 +#: Locations.php:435 MRPDemandTypes.php:121 MRPDemands.php:310 #: MailingGroupMaintenance.php:179 MaintenanceTasks.php:119 #: Manufacturers.php:218 PO_AuthorisationLevels.php:153 PO_Items.php:768 #: PaymentMethods.php:209 PaymentTerms.php:206 Payments.php:1104 @@ -460,8 +460,8 @@ #: SuppContractChgs.php:99 SuppCreditGRNs.php:117 SuppFixedAssetChgs.php:90 #: SuppInvGRNs.php:147 SuppShiptChgs.php:90 SuppTransGLAnalysis.php:126 #: SupplierContacts.php:166 SupplierTenderCreate.php:422 -#: SupplierTenderCreate.php:452 SupplierTypes.php:172 TaxAuthorities.php:175 -#: TaxCategories.php:183 TaxGroups.php:189 TaxProvinces.php:181 +#: SupplierTenderCreate.php:452 SupplierTypes.php:172 TaxAuthorities.php:173 +#: TaxCategories.php:186 TaxGroups.php:191 TaxProvinces.php:180 #: UnitsOfMeasure.php:186 WOSerialNos.php:327 WWW_Access.php:127 #: WWW_Users.php:342 WorkCentres.php:143 includes/InputSerialItemsKeyed.php:60 #: includes/OutputSerialItems.php:99 @@ -530,24 +530,24 @@ #: AccountGroups.php:465 AccountSections.php:264 AddCustomerContacts.php:260 #: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229 -#: BOMs.php:805 BankAccounts.php:399 COGSGLPostings.php:365 +#: BOMs.php:809 BankAccounts.php:399 COGSGLPostings.php:365 #: CreditStatus.php:259 Currencies.php:522 CustLoginSetup.php:273 #: Departments.php:258 DiscountMatrix.php:142 EDIMessageFormat.php:248 #: FixedAssetCategories.php:350 FixedAssetLocations.php:161 #: FreightCosts.php:371 GLAccounts.php:266 GeocodeSetup.php:271 Labels.php:643 -#: Locations.php:664 MRPDemandTypes.php:188 MRPDemands.php:424 +#: Locations.php:694 MRPDemandTypes.php:188 MRPDemands.php:424 #: Manufacturers.php:312 OffersReceived.php:57 OffersReceived.php:146 #: PO_AuthorisationLevels.php:264 PaymentMethods.php:300 PaymentTerms.php:310 #: PriceMatrix.php:230 Prices_Customer.php:369 SalesAnalReptCols.php:552 #: SalesAnalRepts.php:519 SalesGLPostings.php:425 SalesPeople.php:373 #: Shippers.php:203 StockCategories.php:646 SuppLoginSetup.php:292 -#: SupplierContacts.php:284 TaxAuthorities.php:329 TaxCategories.php:241 -#: TaxProvinces.php:235 UnitsOfMeasure.php:241 WWW_Users.php:749 +#: SupplierContacts.php:284 TaxAuthorities.php:327 TaxCategories.php:244 +#: TaxProvinces.php:234 UnitsOfMeasure.php:241 WWW_Users.php:749 #: WorkCentres.php:283 msgid "Enter Information" msgstr "أدخل المعلومات" -#: AccountSections.php:7 includes/MainMenuLinksArray.php:371 +#: AccountSections.php:7 includes/MainMenuLinksArray.php:373 msgid "Account Sections" msgstr "أعدادات العضو" @@ -660,10 +660,11 @@ #: AddCustomerContacts.php:126 CompanyPreferences.php:173 #: CustomerBranches.php:408 Customers.php:1119 Customers.php:1127 -#: ImportBankTransAnalysis.php:207 SalesPeople.php:200 SelectCustomer.php:609 -#: StockDispatch.php:275 StockDispatch.php:286 StockDispatch.php:297 -#: SuppTransGLAnalysis.php:108 SupplierContacts.php:152 -#: includes/PDFTaxPageHeader.inc:37 includes/InputSerialItemsFile.php:92 +#: ImportBankTransAnalysis.php:207 PrintWOItemSlip.php:185 +#: PrintWOItemSlip.php:196 PrintWOItemSlip.php:207 SalesPeople.php:200 +#: SelectCustomer.php:609 StockDispatch.php:275 StockDispatch.php:286 +#: StockDispatch.php:297 SuppTransGLAnalysis.php:108 SupplierContacts.php:152 +#: Tax.php:411 includes/InputSerialItemsFile.php:92 #: includes/InputSerialItemsFile.php:144 msgid "Name" msgstr "" @@ -679,11 +680,11 @@ msgstr "" #: AddCustomerContacts.php:129 AddCustomerContacts.php:241 -#: CustomerBranches.php:414 CustomerBranches.php:849 CustomerInquiry.php:281 -#: CustomerInquiry.php:291 Customers.php:1122 Customers.php:1130 -#: EmailCustTrans.php:15 EmailCustTrans.php:64 Factors.php:246 Factors.php:297 -#: Locations.php:616 OrderDetails.php:115 PDFRemittanceAdvice.php:251 -#: PDFWOPrint.php:592 PDFWOPrint.php:595 PDFWOPrint.php:675 PDFWOPrint.php:678 +#: CustomerBranches.php:414 CustomerBranches.php:849 CustomerInquiry.php:313 +#: Customers.php:1122 Customers.php:1130 EmailCustTrans.php:15 +#: EmailCustTrans.php:64 Factors.php:246 Factors.php:297 Locations.php:630 +#: OrderDetails.php:115 PDFRemittanceAdvice.php:251 PDFWOPrint.php:592 +#: PDFWOPrint.php:595 PDFWOPrint.php:675 PDFWOPrint.php:678 #: PO_PDFPurchOrder.php:400 PO_PDFPurchOrder.php:403 PrintCustTrans.php:750 #: PrintCustTrans.php:981 PrintCustTrans.php:1030 #: PrintCustTransPortrait.php:793 PrintCustTransPortrait.php:1039 @@ -774,22 +775,23 @@ #: AgedControlledInventory.php:47 BankMatching.php:282 #: BankReconciliation.php:217 BankReconciliation.php:294 #: ContractCosting.php:177 CustomerAllocations.php:348 -#: CustomerAllocations.php:378 CustomerInquiry.php:215 +#: CustomerAllocations.php:378 CustomerInquiry.php:256 #: CustomerTransInquiry.php:106 GLAccountInquiry.php:174 -#: GLAccountReport.php:343 GLTransInquiry.php:42 MRPCalendar.php:219 +#: GLAccountReport.php:343 GLTransInquiry.php:47 MRPCalendar.php:219 #: PDFRemittanceAdvice.php:308 PaymentAllocations.php:66 #: PcAssignCashToTab.php:238 PcAuthorizeExpenses.php:93 PrintCustTrans.php:858 -#: PrintCustTransPortrait.php:907 ReverseGRN.php:396 SelectCustomer.php:659 -#: SelectCustomer.php:701 ShipmentCosting.php:538 ShipmentCosting.php:615 -#: Shipments.php:491 StockDispatch.php:277 StockDispatch.php:288 -#: StockDispatch.php:299 StockLocMovements.php:92 StockMovements.php:99 -#: StockSerialItemResearch.php:82 SupplierAllocations.php:456 -#: SupplierAllocations.php:569 SupplierAllocations.php:644 -#: SupplierInquiry.php:209 SupplierTransInquiry.php:105 +#: PrintCustTransPortrait.php:907 PrintWOItemSlip.php:187 +#: PrintWOItemSlip.php:198 PrintWOItemSlip.php:209 ReverseGRN.php:396 +#: SelectCustomer.php:659 SelectCustomer.php:701 ShipmentCosting.php:538 +#: ShipmentCosting.php:615 Shipments.php:491 StockDispatch.php:277 +#: StockDispatch.php:288 StockDispatch.php:299 StockLocMovements.php:92 +#: StockMovements.php:99 StockSerialItemResearch.php:82 +#: SupplierAllocations.php:456 SupplierAllocations.php:569 +#: SupplierAllocations.php:644 SupplierInquiry.php:209 +#: SupplierTransInquiry.php:105 Tax.php:408 #: includes/PDFQuotationPageHeader.inc:23 #: includes/PDFQuotationPortraitPageHeader.inc:80 -#: includes/PDFStatementPageHeader.inc:169 includes/PDFTaxPageHeader.inc:36 -#: includes/PDFTransPageHeader.inc:51 +#: includes/PDFStatementPageHeader.inc:169 includes/PDFTransPageHeader.inc:51 #: includes/PDFTransPageHeaderPortrait.inc:63 #: reportwriter/languages/en_US/reports.php:64 msgid "Date" @@ -893,8 +895,8 @@ msgstr "" #: AgedControlledInventory.php:12 InventoryQuantities.php:155 -#: InventoryValuation.php:230 Locations.php:394 Locations.php:455 MRP.php:530 -#: MRPCalendar.php:21 MRPCreateDemands.php:196 MRPDemandTypes.php:17 +#: InventoryValuation.php:231 Locations.php:406 Locations.php:467 MRP.php:534 +#: MRPCalendar.php:21 MRPCreateDemands.php:197 MRPDemandTypes.php:17 #: MRPDemands.php:27 MRPPlannedPurchaseOrders.php:265 #: MRPPlannedWorkOrders.php:247 MRPPlannedWorkOrders.php:321 #: PricesByCost.php:8 ReorderLevel.php:194 ReorderLevelLocation.php:12 @@ -919,7 +921,7 @@ #: AgedControlledInventory.php:43 BOMIndented.php:314 #: BOMIndentedReverse.php:293 BOMInquiry.php:109 BOMInquiry.php:200 -#: BOMs.php:562 BOMs.php:901 ContractBOM.php:242 ContractBOM.php:354 +#: BOMs.php:565 BOMs.php:905 ContractBOM.php:242 ContractBOM.php:354 #: ContractOtherReqts.php:98 CounterReturns.php:1686 CounterSales.php:2113 #: CounterSales.php:2294 CreditStatus.php:152 CreditStatus.php:243 #: CustomerPurchases.php:76 EmailConfirmation.php:219 @@ -927,7 +929,7 @@ #: FixedAssetDepreciation.php:91 FixedAssetRegister.php:87 #: FixedAssetRegister.php:388 FixedAssetTransfer.php:60 #: FixedAssetTransfer.php:162 GLTags.php:63 GLTags.php:82 -#: GLTransInquiry.php:47 GoodsReceived.php:101 +#: GLTransInquiry.php:49 GoodsReceived.php:101 #: InternalStockCategoriesByRole.php:168 InternalStockRequest.php:345 #: InternalStockRequest.php:559 InternalStockRequest.php:629 #: InventoryQuantities.php:246 InventoryValuation.php:207 Labels.php:292 @@ -945,7 +947,7 @@ #: SelectAsset.php:264 SelectCompletedOrder.php:505 SelectContract.php:147 #: SelectCreditItems.php:1021 SelectOrderItems.php:1454 #: SelectOrderItems.php:1644 SelectProduct.php:554 SelectProduct.php:780 -#: SelectSalesOrder.php:556 SelectWorkOrder.php:215 Shipt_Select.php:191 +#: SelectSalesOrder.php:556 SelectWorkOrder.php:219 Shipt_Select.php:191 #: StockClone.php:665 StockCounts.php:142 StockDispatch.php:504 #: StockLocStatus.php:173 StockQuantityByDate.php:109 Stocks.php:988 #: SuppCreditGRNs.php:92 SuppCreditGRNs.php:192 SuppFixedAssetChgs.php:78 @@ -955,11 +957,10 @@ #: SupplierPriceList.php:533 SupplierTenderCreate.php:434 #: SupplierTenderCreate.php:695 SupplierTenderCreate.php:853 #: SupplierTenders.php:326 SupplierTenders.php:421 SupplierTenders.php:687 -#: TaxAuthorities.php:147 TopItems.php:167 WorkCentres.php:128 -#: WorkOrderCosting.php:100 WorkOrderCosting.php:132 WorkOrderEntry.php:733 -#: WorkOrderIssue.php:755 Z_ItemsWithoutPicture.php:33 -#: api/api_xml-rpc.php:3489 includes/PDFGrnHeader.inc:29 -#: includes/PDFInventoryPlanPageHeader.inc:51 +#: TopItems.php:167 WorkCentres.php:128 WorkOrderCosting.php:100 +#: WorkOrderCosting.php:132 WorkOrderEntry.php:739 WorkOrderIssue.php:759 +#: Z_ItemsWithoutPicture.php:33 api/api_xml-rpc.php:3489 +#: includes/PDFGrnHeader.inc:29 includes/PDFInventoryPlanPageHeader.inc:51 #: includes/PDFOstdgGRNsPageHeader.inc:38 #: includes/PDFStockLocTransferHeader.inc:65 #: includes/PDFStockTransferHeader.inc:36 includes/PDFTopItemsHeader.inc:50 @@ -991,10 +992,10 @@ #: CounterReturns.php:756 CounterSales.php:759 CounterSales.php:853 #: CounterSales.php:855 Credit_Invoice.php:298 Credit_Invoice.php:302 #: CustomerAllocations.php:349 CustomerAllocations.php:379 -#: CustomerInquiry.php:222 DeliveryDetails.php:876 DeliveryDetails.php:945 +#: CustomerInquiry.php:261 DeliveryDetails.php:876 DeliveryDetails.php:945 #: GLBalanceSheet.php:191 GLBalanceSheet.php:203 GLBalanceSheet.php:293 #: GLBalanceSheet.php:302 GLBudgets.php:213 GLJournal.php:435 -#: GLTransInquiry.php:189 GLTrialBalance.php:225 GLTrialBalance.php:245 +#: GLTransInquiry.php:195 GLTrialBalance.php:225 GLTrialBalance.php:245 #: GLTrialBalance.php:266 GLTrialBalance.php:362 GLTrialBalance.php:495 #: GLTrialBalance.php:515 GLTrialBalance.php:539 GLTrialBalance.php:651 #: GLTrialBalance.php:671 GLTrialBalance.php:695 InventoryValuation.php:207 @@ -1009,7 +1010,7 @@ #: SuppContractChgs.php:107 SuppFixedAssetChgs.php:97 SuppShiptChgs.php:97 #: SuppTransGLAnalysis.php:139 SupplierAllocations.php:458 #: SupplierAllocations.php:570 SupplierAllocations.php:645 -#: SupplierCredit.php:407 SupplierInquiry.php:214 +#: SupplierCredit.php:407 SupplierInquiry.php:214 Tax.php:250 #: Z_CheckDebtorsControl.php:149 api/api_debtortransactions.php:1271 #: api/api_debtortransactions.php:1284 api/api_debtortransactions.php:1581 #: includes/PDFQuotationPageHeader.inc:109 @@ -1064,7 +1065,7 @@ msgid "Problem Report" msgstr "" -#: AgedDebtors.php:269 CustomerInquiry.php:91 CustomerInquiry.php:116 +#: AgedDebtors.php:269 CustomerInquiry.php:106 CustomerInquiry.php:131 #: CustomerPurchases.php:25 Dashboard.php:142 DebtorsAtPeriodEnd.php:59 msgid "The customer details could not be retrieved by the SQL because" msgstr "" @@ -1095,23 +1096,23 @@ #: MailInventoryValuation.php:242 MailInventoryValuation.php:250 #: OutstandingGRNs.php:49 OutstandingGRNs.php:62 PDFCustomerList.php:235 #: PDFCustomerList.php:247 PDFFGLabel.php:217 PDFGLJournal.php:100 -#: PDFGrn.php:176 PDFLowGP.php:59 PDFLowGP.php:71 PDFPriceList.php:143 +#: PDFGrn.php:176 PDFLowGP.php:59 PDFLowGP.php:71 PDFPriceList.php:147 #: PDFPrintLabel.php:45 PDFQALabel.php:116 PDFQuotation.php:276 #: PDFQuotationPortrait.php:268 PDFRemittanceAdvice.php:83 #: PDFSellThroughSupportClaim.php:74 PDFSellThroughSupportClaim.php:86 #: PDFStockCheckComparison.php:37 PDFStockCheckComparison.php:63 #: PDFStockCheckComparison.php:269 PDFWOPrint.php:109 PO_PDFPurchOrder.php:31 #: PO_PDFPurchOrder.php:156 PrintCustOrder.php:238 -#: PrintCustOrder_generic.php:254 PurchaseByPrefSupplier.php:402 -#: PurchaseByPrefSupplier.php:450 PurchaseByPrefSupplier.php:474 -#: PurchaseByPrefSupplier.php:503 PurchaseByPrefSupplier.php:534 -#: ReorderLevel.php:63 ReorderLevel.php:182 SalesAnalysis_UserDefined.php:28 -#: SelectCreditItems.php:32 StockCheck.php:46 StockCheck.php:68 -#: StockCheck.php:99 StockCheck.php:142 StockCheck.php:153 StockCheck.php:195 -#: StockDispatch.php:128 StockDispatch.php:141 SuppPaymentRun.php:112 -#: SuppPaymentRun.php:122 SuppPaymentRun.php:186 SuppPaymentRun.php:217 -#: SuppPriceList.php:142 SupplierBalsAtPeriodEnd.php:54 -#: SupplierBalsAtPeriodEnd.php:65 Tax.php:64 Tax.php:169 Tax.php:278 +#: PrintCustOrder_generic.php:254 PrintWOItemSlip.php:123 +#: PurchaseByPrefSupplier.php:402 PurchaseByPrefSupplier.php:450 +#: PurchaseByPrefSupplier.php:474 PurchaseByPrefSupplier.php:503 +#: PurchaseByPrefSupplier.php:534 ReorderLevel.php:63 ReorderLevel.php:182 +#: SalesAnalysis_UserDefined.php:28 SelectCreditItems.php:32 StockCheck.php:46 +#: StockCheck.php:68 StockCheck.php:99 StockCheck.php:142 StockCheck.php:153 +#: StockCheck.php:195 StockDispatch.php:128 StockDispatch.php:141 +#: SuppPaymentRun.php:112 SuppPaymentRun.php:122 SuppPaymentRun.php:186 +#: SuppPaymentRun.php:217 SuppPriceList.php:142 SupplierBalsAtPeriodEnd.php:54 +#: SupplierBalsAtPeriodEnd.php:65 Tax.php:57 Tax.php:171 Tax.php:310 #: Z_DataExport.php:72 Z_DataExport.php:168 Z_DataExport.php:259 #: Z_DataExport.php:308 Z_DataExport.php:347 Z_DataExport.php:383 #: Z_DataExport.php:419 Z_DataExport.php:471 Z_poRebuildDefault.php:41 @@ -1147,7 +1148,7 @@ #: CounterReturns.php:1038 CounterSales.php:1442 CounterSales.php:1456 #: Credit_Invoice.php:747 Credit_Invoice.php:768 CustItem.php:73 #: CustItem.php:86 CustItem.php:197 CustomerReceipt.php:574 -#: CustomerReceipt.php:724 CustomerReceipt.php:752 CustomerTransInquiry.php:97 +#: CustomerReceipt.php:726 CustomerReceipt.php:754 CustomerTransInquiry.php:97 #: Dashboard.php:256 Dashboard.php:427 DeliveryDetails.php:409 #: GLProfit_Loss.php:609 GLTagProfit_Loss.php:515 PDFRemittanceAdvice.php:85 #: Payments.php:362 PurchData.php:114 PurchData.php:132 PurchData.php:360 @@ -1235,11 +1236,11 @@ msgid "Summary or detailed report" msgstr "" -#: AgedDebtors.php:519 AgedSuppliers.php:320 InventoryValuation.php:288 +#: AgedDebtors.php:519 AgedSuppliers.php:320 InventoryValuation.php:289 msgid "Summary Report" msgstr "" -#: AgedDebtors.php:520 AgedSuppliers.php:321 InventoryValuation.php:289 +#: AgedDebtors.php:520 AgedSuppliers.php:321 InventoryValuation.php:290 msgid "Detailed Report" msgstr "" @@ -1247,13 +1248,13 @@ #: BOMIndented.php:277 BOMIndentedReverse.php:255 BOMListing.php:131 #: DebtorsAtPeriodEnd.php:168 InventoryPlanning.php:460 #: InventoryPlanningPrefSupplier.php:530 InventoryQuantities.php:210 -#: InventoryValuation.php:295 MRPPlannedPurchaseOrders.php:294 +#: InventoryValuation.php:296 MRPPlannedPurchaseOrders.php:294 #: MRPPlannedWorkOrders.php:348 MRPReschedules.php:153 MRPShortages.php:303 #: OutstandingGRNs.php:277 PDFCustomerList.php:421 PDFLowGP.php:146 -#: PDFPriceList.php:326 PDFRemittanceAdvice.php:175 +#: PDFPriceList.php:340 PDFRemittanceAdvice.php:175 #: PDFStockCheckComparison.php:371 PrintCustTrans.php:572 #: PrintCustTransPortrait.php:614 ReorderLevel.php:259 StockDispatch.php:447 -#: SuppPriceList.php:263 SupplierBalsAtPeriodEnd.php:159 Tax.php:353 +#: SuppPriceList.php:263 SupplierBalsAtPeriodEnd.php:159 Tax.php:385 msgid "Print PDF" msgstr "" @@ -1317,7 +1318,7 @@ msgid "For suppliers trading in" msgstr "" -#: AgedSuppliers.php:318 InventoryValuation.php:286 +#: AgedSuppliers.php:318 InventoryValuation.php:287 msgid "Summary or Detailed Report" msgstr "" @@ -1387,7 +1388,7 @@ #: Areas.php:131 CustomerTypes.php:167 Factors.php:140 #: FixedAssetCategories.php:142 GLAccounts.php:197 -#: InternalStockCategoriesByRole.php:102 Locations.php:368 MRPDemands.php:250 +#: InternalStockCategoriesByRole.php:102 Locations.php:380 MRPDemands.php:250 #: Manufacturers.php:163 PcAssignCashToTab.php:138 #: PcClaimExpensesFromTab.php:130 PcExpenses.php:169 PcExpensesTypeTab.php:101 #: PcTabs.php:168 PcTypeTabs.php:143 SalesAnalReptCols.php:215 @@ -1437,20 +1438,20 @@ #: AuditTrail.php:53 PO_AuthorisationLevels.php:124 #: PO_AuthorisationLevels.php:173 PO_AuthorisationLevels.php:176 -#: UserSettings.php:112 includes/UserLogin.php:135 +#: UserSettings.php:112 includes/UserLogin.php:173 msgid "User ID" msgstr "" #: AuditTrail.php:55 AuditTrail.php:69 ContractBOM.php:306 #: CounterReturns.php:1631 CounterReturns.php:1634 CounterSales.php:2239 -#: CounterSales.php:2242 CustomerTransInquiry.php:36 -#: DailyBankTransactions.php:75 DailySalesInquiry.php:52 -#: DailySalesInquiry.php:54 FixedAssetRegister.php:59 +#: CounterSales.php:2242 CustomerInquiry.php:191 CustomerInquiry.php:200 +#: CustomerTransInquiry.php:36 DailyBankTransactions.php:75 +#: DailySalesInquiry.php:52 DailySalesInquiry.php:54 FixedAssetRegister.php:59 #: FixedAssetRegister.php:68 InventoryQuantities.php:168 -#: InventoryQuantities.php:194 InventoryQuantities.php:196 MRP.php:599 +#: InventoryQuantities.php:194 InventoryQuantities.php:196 MRP.php:611 #: MRPReport.php:524 MRPReport.php:526 MRPReschedules.php:145 #: NoSalesItems.php:22 NoSalesItems.php:50 NoSalesItems.php:70 -#: NoSalesItems.php:72 PDFPeriodStockTransListing.php:58 PDFPriceList.php:218 +#: NoSalesItems.php:72 PDFPeriodStockTransListing.php:58 PDFPriceList.php:225 #: POReport.php:1586 PO_Items.php:1125 ReorderLevel.php:212 #: ReorderLevel.php:214 ReorderLevel.php:244 ReorderLevel.php:246 #: SalesGraph.php:102 SalesGraph.php:104 SalesGraph.php:124 SalesGraph.php:126 @@ -1467,8 +1468,8 @@ #: SystemParameters.php:1035 SystemParameters.php:1041 #: SystemParameters.php:1047 SystemParameters.php:1053 #: SystemParameters.php:1059 TopItems.php:30 TopItems.php:46 TopItems.php:68 -#: TopItems.php:70 WorkOrderEntry.php:675 WorkOrderEntry.php:678 -#: WorkOrderIssue.php:710 WorkOrderIssue.php:713 +#: TopItems.php:70 WorkOrderEntry.php:681 WorkOrderEntry.php:684 +#: WorkOrderIssue.php:714 WorkOrderIssue.php:717 #: reportwriter/languages/en_US/reports.php:54 msgid "All" msgstr "" @@ -1499,18 +1500,17 @@ #: AuditTrail.php:177 BankReconciliation.php:218 BankReconciliation.php:295 #: CustWhereAlloc.php:21 CustWhereAlloc.php:111 CustomerAllocations.php:376 -#: CustomerInquiry.php:216 CustomerPurchases.php:77 +#: CustomerInquiry.php:254 CustomerPurchases.php:77 #: CustomerTransInquiry.php:25 CustomerTransInquiry.php:104 #: DailyBankTransactions.php:130 GLAccountInquiry.php:172 #: GLAccountReport.php:341 GLJournal.php:266 MRPReschedules.php:194 #: SalesByTypePeriodInquiry.php:356 SelectCustomer.php:424 #: ShipmentCosting.php:536 ShipmentCosting.php:613 StockLocMovements.php:90 #: StockMovements.php:97 SupplierAllocations.php:454 SupplierInquiry.php:210 -#: SupplierTransInquiry.php:20 SupplierTransInquiry.php:102 +#: SupplierTransInquiry.php:20 SupplierTransInquiry.php:102 Tax.php:409 #: Z_CheckAllocationsFrom.php:32 Z_CheckAllocationsFrom.php:57 #: Z_CheckAllocs.php:62 Z_CheckGLTransBalance.php:11 -#: includes/PDFTaxPageHeader.inc:34 includes/InputSerialItemsFile.php:94 -#: includes/InputSerialItemsFile.php:152 +#: includes/InputSerialItemsFile.php:94 includes/InputSerialItemsFile.php:152 #: reportwriter/languages/en_US/reports.php:111 msgid "Type" msgstr "" @@ -1570,7 +1570,7 @@ #: BOMExtendedQty.php:267 BOMExtendedQty.php:334 BOMExtendedQty.php:335 #: BOMExtendedQty.php:336 BOMExtendedQty.php:337 BOMIndented.php:317 -#: BOMIndentedReverse.php:296 BOMInquiry.php:201 BOMs.php:565 BOMs.php:751 +#: BOMIndentedReverse.php:296 BOMInquiry.php:201 BOMs.php:568 BOMs.php:755 #: ContractBOM.php:243 ContractBOM.php:357 ContractCosting.php:81 #: ContractCosting.php:87 ContractCosting.php:152 ContractOtherReqts.php:99 #: Contracts.php:994 Contracts.php:1030 CounterReturns.php:669 @@ -1588,24 +1588,25 @@ #: PDFOrdersInvoiced.php:377 POReport.php:762 POReport.php:1449 #: PrintCustTrans.php:898 PrintCustTrans.php:987 PrintCustTrans.php:1036 #: PrintCustTransPortrait.php:949 PrintCustTransPortrait.php:1047 -#: PrintCustTransPortrait.php:1103 RecurringSalesOrders.php:331 -#: ReorderLevel.php:300 ReverseGRN.php:397 ReverseGRN.php:398 -#: SalesAnalReptCols.php:16 SalesAnalReptCols.php:18 SalesGraph.php:193 -#: SalesGraph.php:276 SalesInquiry.php:997 SalesTopCustomersInquiry.php:218 -#: SalesTopItemsInquiry.php:225 SelectCreditItems.php:687 -#: SelectCreditItems.php:1067 SelectOrderItems.php:1292 -#: SelectOrderItems.php:1460 SelectOrderItems.php:1651 -#: SelectOrderItems.php:1785 ShipmentCosting.php:149 ShipmentCosting.php:150 -#: Shipments.php:401 Shipments.php:403 Shipments.php:404 Shipments.php:488 -#: Shipments.php:490 SpecialOrder.php:629 StockCounts.php:143 -#: StockCounts.php:168 StockLocMovements.php:94 StockLocTransfer.php:309 -#: StockMovements.php:102 StockStatus.php:363 StockUsageGraph.php:12 -#: SuppCreditGRNs.php:291 SuppCreditGRNs.php:292 SupplierCredit.php:318 -#: SupplierTenderCreate.php:435 SupplierTenderCreate.php:856 -#: SupplierTenders.php:124 SupplierTenders.php:327 SupplierTenders.php:531 -#: SupplierTenders.php:534 SupplierTenders.php:690 WOSerialNos.php:263 -#: WOSerialNos.php:269 WOSerialNos.php:303 WorkOrderReceive.php:956 -#: api/api_xml-rpc.php:2533 api/api_xml-rpc.php:2579 api/api_xml-rpc.php:2775 +#: PrintCustTransPortrait.php:1103 PrintWOItemSlip.php:156 +#: RecurringSalesOrders.php:331 ReorderLevel.php:300 ReverseGRN.php:397 +#: ReverseGRN.php:398 SalesAnalReptCols.php:16 SalesAnalReptCols.php:18 +#: SalesGraph.php:193 SalesGraph.php:276 SalesInquiry.php:997 +#: SalesTopCustomersInquiry.php:218 SalesTopItemsInquiry.php:225 +#: SelectCreditItems.php:687 SelectCreditItems.php:1067 +#: SelectOrderItems.php:1292 SelectOrderItems.php:1460 +#: SelectOrderItems.php:1651 SelectOrderItems.php:1785 ShipmentCosting.php:149 +#: ShipmentCosting.php:150 Shipments.php:401 Shipments.php:403 +#: Shipments.php:404 Shipments.php:488 Shipments.php:490 SpecialOrder.php:629 +#: StockCounts.php:143 StockCounts.php:168 StockLocMovements.php:94 +#: StockLocTransfer.php:309 StockMovements.php:102 StockStatus.php:363 +#: StockUsageGraph.php:12 SuppCreditGRNs.php:291 SuppCreditGRNs.php:292 +#: SupplierCredit.php:318 SupplierTenderCreate.php:435 +#: SupplierTenderCreate.php:856 SupplierTenders.php:124 +#: SupplierTenders.php:327 SupplierTenders.php:531 SupplierTenders.php:534 +#: SupplierTenders.php:690 Tax.php:247 WOSerialNos.php:263 WOSerialNos.php:269 +#: WOSerialNos.php:303 WorkOrderReceive.php:961 api/api_xml-rpc.php:2533 +#: api/api_xml-rpc.php:2579 api/api_xml-rpc.php:2775 #: includes/PDFBOMListingPageHeader.inc:44 includes/PDFDIFOTPageHeader.inc:42 #: includes/PDFDeliveryDifferencesPageHeader.inc:43 #: includes/PDFInventoryValnPageHeader.inc:33 @@ -1666,10 +1667,11 @@ #: GLAccountReport.php:327 InventoryPlanningPrefSupplier.php:58 #: InventoryQuantities.php:234 MRPPlannedPurchaseOrders.php:320 #: MRPPlannedWorkOrders.php:374 MRPReport.php:817 MRPReschedules.php:180 -#: MRPShortages.php:334 PDFOrderStatus.php:323 PDFPriceList.php:357 +#: MRPShortages.php:334 PDFOrderStatus.php:323 PDFPriceList.php:384 #: PDFReceipt.php:34 PO_Header.php:845 PO_PDFPurchOrder.php:64 -#: PO_SelectOSPurchOrder.php:547 ReorderLevel.php:283 StockDispatch.php:477 -#: SuppPriceList.php:292 Tax.php:244 includes/PDFAgedDebtorsPageHeader.inc:34 +#: PO_SelectOSPurchOrder.php:547 PrintWOItemSlip.php:143 ReorderLevel.php:283 +#: StockDispatch.php:477 SuppPriceList.php:292 +#: includes/PDFAgedDebtorsPageHeader.inc:34 #: includes/PDFAgedSuppliersPageHeader.inc:21 #: includes/PDFBOMListingPageHeader.inc:26 #: includes/PDFBalanceSheetPageHeader.inc:25 @@ -1694,7 +1696,7 @@ #: includes/PDFSupplierBalsPageHeader.inc:20 #: includes/PDFTabReportHeader.inc:15 #: includes/PDFTagProfitAndLossPageHeader.inc:29 -#: includes/PDFTaxPageHeader.inc:21 includes/PDFTopItemsHeader.inc:34 +#: includes/PDFTaxPageHeader.inc:27 includes/PDFTopItemsHeader.inc:34 #: includes/PDFTrialBalancePageHeader.inc:18 #: reportwriter/languages/en_US/reports.php:88 msgid "Printed" @@ -1705,12 +1707,12 @@ #: InventoryPlanningPrefSupplier.php:58 InventoryQuantities.php:235 #: MRPPlannedPurchaseOrders.php:321 MRPPlannedWorkOrders.php:375 #: MRPReport.php:818 MRPReschedules.php:181 MRPShortages.php:335 -#: PDFPriceList.php:357 PDFReceipt.php:34 PDFRemittanceAdvice.php:218 +#: PDFPriceList.php:374 PDFReceipt.php:34 PDFRemittanceAdvice.php:218 #: PrintCustOrder.php:175 PrintCustTrans.php:773 PrintCustTrans.php:982 #: PrintCustTrans.php:1031 PrintCustTransPortrait.php:818 #: PrintCustTransPortrait.php:1040 PrintCustTransPortrait.php:1096 -#: ReorderLevel.php:284 StockDispatch.php:478 SuppPriceList.php:293 -#: Tax.php:244 includes/PDFAgedDebtorsPageHeader.inc:34 +#: PrintWOItemSlip.php:144 ReorderLevel.php:284 StockDispatch.php:478 +#: SuppPriceList.php:293 includes/PDFAgedDebtorsPageHeader.inc:34 #: includes/PDFAgedSuppliersPageHeader.inc:21 #: includes/PDFBOMListingPageHeader.inc:26 #: includes/PDFBalanceSheetPageHeader.inc:26 @@ -1765,13 +1767,13 @@ msgid "Build" msgstr "" -#: BOMExtendedQty.php:327 BOMInquiry.php:110 BOMs.php:902 +#: BOMExtendedQty.php:327 BOMInquiry.php:110 BOMs.php:906 #: CounterReturns.php:1688 CounterSales.php:2115 CounterSales.php:2296 #: InternalStockRequest.php:631 PO_SelectOSPurchOrder.php:264 #: PO_SelectPurchOrder.php:215 PurchaseByPrefSupplier.php:415 #: ReorderLevelLocation.php:75 ReorderLevelLocation.php:76 #: SelectCompletedOrder.php:506 SelectOrderItems.php:1456 -#: SelectOrderItems.php:1647 SelectSalesOrder.php:557 SelectWorkOrder.php:216 +#: SelectOrderItems.php:1647 SelectSalesOrder.php:557 SelectWorkOrder.php:220 #: Shipt_Select.php:192 TopItems.php:171 includes/PDFTopItemsHeader.inc:54 msgid "On Hand" msgstr "" @@ -1878,11 +1880,11 @@ msgid "Costed Bill Of Material" msgstr "" -#: BOMInquiry.php:20 BOMs.php:879 +#: BOMInquiry.php:20 BOMs.php:883 msgid "Select a manufactured part" msgstr "" -#: BOMInquiry.php:20 BOMs.php:879 +#: BOMInquiry.php:20 BOMs.php:883 msgid "or Assembly or Kit part" msgstr "" @@ -1890,35 +1892,35 @@ msgid "to view the costed bill of materials" msgstr "" -#: BOMInquiry.php:21 BOMs.php:879 +#: BOMInquiry.php:21 BOMs.php:883 msgid "Parts must be defined in the stock item entry" msgstr "" -#: BOMInquiry.php:21 BOMs.php:879 +#: BOMInquiry.php:21 BOMs.php:883 msgid "modification screen as manufactured" msgstr "" -#: BOMInquiry.php:21 BOMs.php:879 +#: BOMInquiry.php:21 BOMs.php:883 msgid "" "kits or assemblies to be available for construction of a bill of material" msgstr "" -#: BOMInquiry.php:26 BOMs.php:883 MRPDemands.php:336 +#: BOMInquiry.php:26 BOMs.php:887 MRPDemands.php:336 #: PO_SelectOSPurchOrder.php:241 PO_SelectPurchOrder.php:190 -#: Shipt_Select.php:169 WorkOrderEntry.php:699 WorkOrderIssue.php:726 +#: Shipt_Select.php:169 WorkOrderEntry.php:705 WorkOrderIssue.php:730 msgid "Enter text extracts in the" msgstr "" -#: BOMInquiry.php:26 BOMs.php:883 MRPDemands.php:336 +#: BOMInquiry.php:26 BOMs.php:887 MRPDemands.php:336 #: PO_SelectOSPurchOrder.php:241 PO_SelectPurchOrder.php:190 -#: Shipt_Select.php:169 WorkOrderEntry.php:699 WorkOrderIssue.php:726 +#: Shipt_Select.php:169 WorkOrderEntry.php:705 WorkOrderIssue.php:730 msgid "description" msgstr "" -#: BOMInquiry.php:28 BOMs.php:885 ContractBOM.php:332 ContractBOM.php:337 +#: BOMInquiry.php:28 BOMs.php:889 ContractBOM.php:332 ContractBOM.php:337 #: Contracts.php:759 Contracts.php:762 CounterReturns.php:1656 -#: CounterSales.php:2263 CustItem.php:220 CustomerReceipt.php:1175 -#: CustomerReceipt.php:1178 DiscountCategories.php:121 +#: CounterSales.php:2263 CustItem.php:220 CustomerReceipt.php:1179 +#: CustomerReceipt.php:1182 DiscountCategories.php:121 #: DiscountCategories.php:123 DiscountCategories.php:127 #: DiscountCategories.php:129 FixedAssetTransfer.php:94 #: InternalStockRequest.php:354 MRPDemands.php:338 MRPDemands.php:341 @@ -1929,21 +1931,21 @@ #: SelectCustomer.php:293 SelectCustomer.php:303 SelectCustomer.php:350 #: SelectGLAccount.php:79 SelectOrderItems.php:569 SelectOrderItems.php:572 #: SelectOrderItems.php:1608 SelectProduct.php:561 SelectSalesOrder.php:540 -#: SelectSupplier.php:231 SelectWorkOrder.php:202 SellThroughSupport.php:202 +#: SelectSupplier.php:231 SelectWorkOrder.php:206 SellThroughSupport.php:202 #: Shipt_Select.php:174 SuppFixedAssetChgs.php:126 SupplierPriceList.php:49 #: SupplierPriceList.php:406 SupplierTenderCreate.php:566 -#: SupplierTenderCreate.php:706 SupplierTenders.php:433 WorkOrderEntry.php:704 -#: WorkOrderIssue.php:731 +#: SupplierTenderCreate.php:706 SupplierTenders.php:433 WorkOrderEntry.php:710 +#: WorkOrderIssue.php:735 msgid "OR" msgstr "" -#: BOMInquiry.php:29 BOMs.php:886 MRPDemands.php:339 +#: BOMInquiry.php:29 BOMs.php:890 MRPDemands.php:339 #: PO_SelectOSPurchOrder.php:245 PO_SelectPurchOrder.php:195 -#: Shipt_Select.php:174 WorkOrderEntry.php:704 WorkOrderIssue.php:731 +#: Shipt_Select.php:174 WorkOrderEntry.php:710 WorkOrderIssue.php:735 msgid "Enter extract of the" msgstr "" -#: BOMInquiry.php:29 BOMs.php:886 EmailConfirmation.php:218 +#: BOMInquiry.php:29 BOMs.php:890 EmailConfirmation.php:218 #: EmailConfirmation.php:348 InternalStockRequest.php:154 #: InternalStockRequest.php:354 MRPDemands.php:339 MRPReport.php:546 #: PO_SelectOSPurchOrder.php:245 PO_SelectPurchOrder.php:195 @@ -1955,13 +1957,13 @@ #: StockCounts.php:213 StockMovements.php:36 StockReorderLevel.php:51 #: StockStatus.php:62 StockTransfers.php:48 StockTransfers.php:471 #: StockUsage.php:64 SupplierPriceList.php:49 SupplierTenderCreate.php:706 -#: SupplierTenders.php:433 WorkOrderEntry.php:704 WorkOrderIssue.php:731 +#: SupplierTenders.php:433 WorkOrderEntry.php:710 WorkOrderIssue.php:735 #: Z_ChangeStockCode.php:189 ../webSHOP/includes/PlaceOrder.php:235 msgid "Stock Code" msgstr "" -#: BOMInquiry.php:35 BOMs.php:890 ContractBOM.php:342 Contracts.php:769 -#: CounterReturns.php:1660 CounterSales.php:2269 CustomerReceipt.php:1185 +#: BOMInquiry.php:35 BOMs.php:894 ContractBOM.php:342 Contracts.php:769 +#: CounterReturns.php:1660 CounterSales.php:2269 CustomerReceipt.php:1189 #: FixedAssetTransfer.php:107 InternalStockRequest.php:365 MRPDemands.php:343 #: MRPReport.php:558 PO_Header.php:551 PO_Items.php:1162 SelectAsset.php:116 #: SelectCreditItems.php:234 SelectCreditItems.php:1011 SelectCustomer.php:375 @@ -1969,11 +1971,11 @@ #: SelectProduct.php:569 SelectSupplier.php:241 SelectSupplier.php:274 #: SupplierPriceList.php:61 SupplierTenderCreate.php:572 #: SupplierTenderCreate.php:611 SupplierTenderCreate.php:717 -#: SupplierTenders.php:445 WorkOrderEntry.php:710 WorkOrderIssue.php:738 +#: SupplierTenders.php:445 WorkOrderEntry.php:716 WorkOrderIssue.php:742 msgid "Search Now" msgstr "" -#: BOMInquiry.php:47 BOMs.php:820 ContractBOM.php:52 MRPDemands.php:56 +#: BOMInquiry.php:47 BOMs.php:824 ContractBOM.php:52 MRPDemands.php:56 #: MRPReport.php:578 PO_Items.php:853 PO_SelectOSPurchOrder.php:65 #: PO_SelectPurchOrder.php:48 SelectCompletedOrder.php:97 #: SelectCreditItems.php:301 SelectProduct.php:582 SelectSalesOrder.php:872 @@ -1985,20 +1987,20 @@ "extract entered" msgstr "" -#: BOMInquiry.php:50 BOMs.php:823 MRPDemands.php:59 +#: BOMInquiry.php:50 BOMs.php:827 MRPDemands.php:59 msgid "" "At least one stock description keyword or an extract of a stock code must be " "entered for the search" msgstr "" -#: BOMInquiry.php:95 BOMs.php:869 MRPCalendar.php:213 MRPDemands.php:80 +#: BOMInquiry.php:95 BOMs.php:873 MRPCalendar.php:213 MRPDemands.php:80 #: MRPDemands.php:289 POReport.php:481 POReport.php:1256 SalesInquiry.php:758 msgid "The SQL to find the parts selected failed with the message" msgstr "" -#: BOMInquiry.php:108 BOMs.php:561 BOMs.php:900 ContractBOM.php:353 +#: BOMInquiry.php:108 BOMs.php:564 BOMs.php:904 ContractBOM.php:353 #: CounterReturns.php:1685 CounterSales.php:2112 CounterSales.php:2293 -#: CustItem.php:297 CustomerBranches.php:407 CustomerReceipt.php:1196 +#: CustItem.php:297 CustomerBranches.php:407 CustomerReceipt.php:1200 #: GLCodesInquiry.php:26 InternalStockRequest.php:558 #: InternalStockRequest.php:628 MRPDemands.php:91 MRPPlannedWorkOrders.php:257 #: MRPReport.php:749 MaterialsNotUsed.php:34 NoSalesItems.php:193 @@ -2009,18 +2011,17 @@ #: SelectCompletedOrder.php:504 SelectCreditItems.php:1020 #: SelectCustomer.php:420 SelectGLAccount.php:112 SelectOrderItems.php:1453 #: SelectOrderItems.php:1643 SelectProduct.php:779 SelectSalesOrder.php:555 -#: SelectSupplier.php:280 SelectWorkOrder.php:214 SellThroughSupport.php:159 +#: SelectSupplier.php:280 SelectWorkOrder.php:218 SellThroughSupport.php:159 #: Shipt_Select.php:190 SpecialOrder.php:149 StockCategories.php:256 #: SuppPriceList.php:308 SupplierPriceList.php:270 SupplierPriceList.php:455 #: SupplierTenderCreate.php:617 SupplierTenderCreate.php:852 -#: SupplierTenders.php:686 TopItems.php:166 WorkOrderEntry.php:732 -#: WorkOrderIssue.php:754 includes/PDFTaxPageHeader.inc:38 -#: includes/PDFTopItemsHeader.inc:49 includes/PO_PDFOrderPageHeader.inc:75 -#: ../webSHOP/ItemDetails.php:72 +#: SupplierTenders.php:686 TopItems.php:166 WorkOrderEntry.php:738 +#: WorkOrderIssue.php:758 includes/PDFTopItemsHeader.inc:49 +#: includes/PO_PDFOrderPageHeader.inc:75 ../webSHOP/ItemDetails.php:72 msgid "Code" msgstr "" -#: BOMInquiry.php:111 BOMs.php:903 ConfirmDispatch_Invoice.php:300 +#: BOMInquiry.php:111 BOMs.php:907 ConfirmDispatch_Invoice.php:300 #: ContractBOM.php:355 CounterReturns.php:1687 CounterSales.php:2114 #: CounterSales.php:2295 Credit_Invoice.php:294 GoodsReceived.php:103 #: GoodsReceived.php:107 InternalStockRequest.php:561 @@ -2030,17 +2031,17 @@ #: PO_Items.php:1191 PO_SelectOSPurchOrder.php:266 PO_SelectPurchOrder.php:217 #: SelectCompletedOrder.php:509 SelectCreditItems.php:1022 #: SelectOrderItems.php:1455 SelectOrderItems.php:1646 SelectProduct.php:130 -#: SelectProduct.php:782 SelectSalesOrder.php:558 SelectWorkOrder.php:217 +#: SelectProduct.php:782 SelectSalesOrder.php:558 SelectWorkOrder.php:221 #: Shipments.php:402 Shipments.php:489 Shipt_Select.php:194 #: StockLocTransferReceive.php:459 SupplierPriceList.php:272 #: SupplierTenderCreate.php:854 SupplierTenders.php:688 TopItems.php:169 -#: WorkOrderCosting.php:102 WorkOrderEntry.php:734 WorkOrderIssue.php:756 -#: WorkOrderIssue.php:826 includes/PDFInventoryValnPageHeader.inc:34 +#: WorkOrderCosting.php:102 WorkOrderEntry.php:740 WorkOrderIssue.php:760 +#: WorkOrderIssue.php:830 includes/PDFInventoryValnPageHeader.inc:34 #: includes/DefineLabelClass.php:21 msgid "Units" msgstr "" -#: BOMInquiry.php:180 +#: BOMInquiry.php:180 PrintWOItemSlip.php:79 WOCanBeProducedNow.php:112 msgid "The bill of material could not be retrieved because" msgstr "" @@ -2060,8 +2061,8 @@ msgid "per" msgstr "" -#: BOMInquiry.php:199 BOMs.php:638 WorkOrderReceive.php:185 -#: WorkOrderReceive.php:405 Z_BottomUpCosts.php:33 +#: BOMInquiry.php:199 BOMs.php:642 WOCanBeProducedNow.php:48 +#: WorkOrderReceive.php:185 WorkOrderReceive.php:405 Z_BottomUpCosts.php:33 msgid "Component" msgstr "" @@ -2153,23 +2154,23 @@ "in the process was" msgstr "" -#: BOMs.php:100 +#: BOMs.php:101 msgid "Could not retrieve the BOM components because" msgstr "" -#: BOMs.php:101 +#: BOMs.php:102 msgid "The SQL used to retrieve the components was" msgstr "" -#: BOMs.php:115 +#: BOMs.php:116 msgid "No lower levels" msgstr "" -#: BOMs.php:118 +#: BOMs.php:119 msgid "Drill Down" msgstr "" -#: BOMs.php:123 BOMs.php:129 BOMs.php:137 BOMs.php:919 +#: BOMs.php:124 BOMs.php:130 BOMs.php:138 BOMs.php:923 #: InternalStockRequest.php:579 OrderDetails.php:192 #: PO_SelectOSPurchOrder.php:552 PaymentTerms.php:190 PaymentTerms.php:196 #: SalesAnalReptCols.php:285 SelectProduct.php:128 SelectProduct.php:175 @@ -2178,54 +2179,54 @@ msgid "N/A" msgstr "" -#: BOMs.php:155 +#: BOMs.php:157 #, php-format msgid "" "Are you sure you wish to delete this component from the bill of material?" msgstr "" -#: BOMs.php:245 +#: BOMs.php:248 msgid "The effective after date field must be a date in the format" msgstr "" -#: BOMs.php:251 +#: BOMs.php:254 msgid "The effective to date field must be a date in the format" msgstr "" -#: BOMs.php:257 StockAdjustments.php:165 StockTransfers.php:173 -#: WorkOrderEntry.php:338 +#: BOMs.php:260 StockAdjustments.php:165 StockTransfers.php:173 +#: WorkOrderEntry.php:340 msgid "The quantity entered must be numeric" msgstr "" -#: BOMs.php:263 StockAdjustments.php:171 +#: BOMs.php:266 StockAdjustments.php:171 msgid "The quantity entered cannot be zero" msgstr "" -#: BOMs.php:269 +#: BOMs.php:272 msgid "The effective to date must be a date after the effective after date" msgstr "" -#: BOMs.php:269 +#: BOMs.php:272 msgid "The effective to date is" msgstr "" -#: BOMs.php:269 +#: BOMs.php:272 msgid "days before the effective after date" msgstr "" -#: BOMs.php:269 +#: BOMs.php:272 msgid "No updates have been performed" msgstr "" -#: BOMs.php:269 +#: BOMs.php:272 msgid "Effective after was" msgstr "" -#: BOMs.php:269 +#: BOMs.php:272 msgid "and effective to was" msgstr "" -#: BOMs.php:280 +#: BOMs.php:283 msgid "" "Only non-serialised or non-lot controlled items can be set to auto issue. " "These items require the lot/serial numbers of items issued to the works " @@ -2233,87 +2234,87 @@ "automatically set to off for this component" msgstr "" -#: BOMs.php:305 +#: BOMs.php:308 msgid "Could not update this BOM component because" msgstr "" -#: BOMs.php:306 +#: BOMs.php:309 msgid "The SQL used to update the component was" msgstr "" -#: BOMs.php:309 +#: BOMs.php:312 msgid "Details for" msgstr "" -#: BOMs.php:309 +#: BOMs.php:312 msgid "have been updated" msgstr "" -#: BOMs.php:328 +#: BOMs.php:331 msgid "An error occurred in checking the component is not already on the BOM" msgstr "" -#: BOMs.php:329 +#: BOMs.php:332 msgid "" "The SQL that was used to check the component was not already on the BOM and " "that failed in the process was" msgstr "" -#: BOMs.php:354 +#: BOMs.php:357 msgid "Could not insert the BOM component because" msgstr "" -#: BOMs.php:355 +#: BOMs.php:358 msgid "The SQL used to insert the component was" msgstr "" -#: BOMs.php:360 +#: BOMs.php:363 msgid "A new component part" msgstr "" -#: BOMs.php:360 +#: BOMs.php:363 msgid "has been added to the bill of material for part" msgstr "" -#: BOMs.php:366 +#: BOMs.php:369 msgid "The component" msgstr "" -#: BOMs.php:366 +#: BOMs.php:369 msgid "is already recorded as a component of" msgstr "" -#: BOMs.php:366 +#: BOMs.php:369 msgid "" "Whilst the quantity of the component required can be modified it is " "inappropriate for a component to appear more than once in a bill of material" msgstr "" -#: BOMs.php:387 +#: BOMs.php:390 msgid "Could not delete this BOM components because" msgstr "" -#: BOMs.php:388 +#: BOMs.php:391 msgid "The SQL used to delete the BOM was" msgstr "" -#: BOMs.php:398 +#: BOMs.php:401 msgid "The component part" msgstr "" -#: BOMs.php:398 +#: BOMs.php:401 msgid "has been deleted from this BOM" msgstr "" -#: BOMs.php:421 BOMs.php:457 BOMs.php:481 BOMs.php:506 BOMs.php:530 +#: BOMs.php:424 BOMs.php:460 BOMs.php:484 BOMs.php:509 BOMs.php:533 msgid "Could not retrieve the description of the parent part because" msgstr "" -#: BOMs.php:422 BOMs.php:458 BOMs.php:482 BOMs.php:507 BOMs.php:531 +#: BOMs.php:425 BOMs.php:461 BOMs.php:485 BOMs.php:510 BOMs.php:534 msgid "The SQL used to retrieve description of the parent part was" msgstr "" -#: BOMs.php:431 ConfirmDispatch_Invoice.php:1052 CounterReturns.php:1072 +#: BOMs.php:434 ConfirmDispatch_Invoice.php:1052 CounterReturns.php:1072 #: CounterSales.php:1489 Credit_Invoice.php:803 Credit_Invoice.php:831 #: SelectCreditItems.php:1486 StockClone.php:832 StockClone.php:834 #: Stocks.php:1141 Stocks.php:1143 api/api_debtortransactions.php:753 @@ -2321,57 +2322,57 @@ msgid "Assembly" msgstr "" -#: BOMs.php:434 FixedAssetRegister.php:390 StockClone.php:852 +#: BOMs.php:437 FixedAssetRegister.php:390 StockClone.php:852 #: StockClone.php:854 Stocks.php:1161 Stocks.php:1163 msgid "Purchased" msgstr "" -#: BOMs.php:437 StockClone.php:842 StockClone.php:844 Stocks.php:1151 +#: BOMs.php:440 StockClone.php:842 StockClone.php:844 Stocks.php:1151 #: Stocks.php:1153 msgid "Manufactured" msgstr "" -#: BOMs.php:440 +#: BOMs.php:443 msgid "Kit Set" msgstr "" -#: BOMs.php:443 BOMs.php:536 StockClone.php:847 StockClone.php:849 +#: BOMs.php:446 BOMs.php:539 StockClone.php:847 StockClone.php:849 #: Stocks.php:1156 Stocks.php:1158 msgid "Phantom" msgstr "" -#: BOMs.php:447 +#: BOMs.php:450 msgid "Select a Different BOM" msgstr "" -#: BOMs.php:463 +#: BOMs.php:466 msgid "Manufactured parent items" msgstr "" -#: BOMs.php:486 +#: BOMs.php:489 msgid "Assembly parent items" msgstr "" -#: BOMs.php:511 +#: BOMs.php:514 msgid "Kit sets" msgstr "" -#: BOMs.php:559 InventoryQuantities.php:251 ReorderLevel.php:305 +#: BOMs.php:562 InventoryQuantities.php:251 ReorderLevel.php:305 msgid "Level" msgstr "" -#: BOMs.php:560 EDIMessageFormat.php:130 SuppInvGRNs.php:118 +#: BOMs.php:563 EDIMessageFormat.php:130 SuppInvGRNs.php:118 #: SuppInvGRNs.php:254 reportwriter/languages/en_US/reports.php:98 msgid "Sequence" msgstr "" -#: BOMs.php:563 BOMs.php:701 Contracts.php:876 FixedAssetRegister.php:89 -#: InventoryQuantities.php:247 LocationUsers.php:153 Locations.php:368 -#: MRP.php:564 MRP.php:597 NoSalesItems.php:192 PDFOrderStatus.php:296 +#: BOMs.php:566 BOMs.php:705 Contracts.php:876 FixedAssetRegister.php:89 +#: InventoryQuantities.php:247 LocationUsers.php:153 Locations.php:380 +#: MRP.php:572 MRP.php:609 NoSalesItems.php:192 PDFOrderStatus.php:296 #: PDFOrdersInvoiced.php:296 ReorderLevel.php:290 ReorderLevel.php:299 #: ReorderLevelLocation.php:164 StockCounts.php:214 StockReorderLevel.php:58 #: StockSerialItemResearch.php:81 StockStatus.php:88 StockStatus.php:93 -#: SupplierTenderCreate.php:137 WhereUsedInquiry.php:71 WorkCentres.php:129 +#: SupplierTenderCreate.php:137 WhereUsedInquiry.php:74 WorkCentres.php:129 #: WorkCentres.php:226 api/api_xml-rpc.php:2531 api/api_xml-rpc.php:2577 #: api/api_xml-rpc.php:2773 #: includes/PDFPeriodStockTransListingPageHeader.inc:51 @@ -2379,85 +2380,93 @@ msgid "Location" msgstr "" -#: BOMs.php:564 WhereUsedInquiry.php:70 includes/MainMenuLinksArray.php:317 +#: BOMs.php:567 WhereUsedInquiry.php:73 includes/MainMenuLinksArray.php:319 msgid "Work Centre" msgstr "" -#: BOMs.php:566 BOMs.php:770 WhereUsedInquiry.php:73 +#: BOMs.php:569 ContractBOM.php:244 InternalStockRequest.php:274 +#: SupplierTenderCreate.php:436 SupplierTenders.php:328 +#: WOCanBeProducedNow.php:47 WOCanBeProducedNow.php:52 +#: includes/PDFTransPageHeader.inc:214 +#: includes/PDFTransPageHeaderPortrait.inc:270 +msgid "UOM" +msgstr "" + +#: BOMs.php:570 BOMs.php:774 WhereUsedInquiry.php:76 #: includes/PDFBOMListingPageHeader.inc:40 msgid "Effective After" msgstr "" -#: BOMs.php:567 BOMs.php:774 PurchData.php:703 SellThroughSupport.php:267 -#: WhereUsedInquiry.php:74 includes/PDFBOMListingPageHeader.inc:41 +#: BOMs.php:571 BOMs.php:778 PurchData.php:703 SellThroughSupport.php:267 +#: WhereUsedInquiry.php:77 includes/PDFBOMListingPageHeader.inc:41 msgid "Effective To" msgstr "" -#: BOMs.php:568 WorkOrderIssue.php:658 WorkOrderStatus.php:130 +#: BOMs.php:572 WorkOr... [truncated message content] |
From: <rc...@us...> - 2014-09-11 16:27:02
|
Revision: 6879 http://sourceforge.net/p/web-erp/reponame/6879 Author: rchacon Date: 2014-09-11 16:26:54 +0000 (Thu, 11 Sep 2014) Log Message: ----------- Fixes text replacing with other. Spanish translation improvements. Modified Paths: -------------- trunk/Suppliers.php trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po Modified: trunk/Suppliers.php =================================================================== --- trunk/Suppliers.php 2014-09-11 15:03:03 UTC (rev 6878) +++ trunk/Suppliers.php 2014-09-11 16:26:54 UTC (rev 6879) @@ -1,14 +1,13 @@ <?php - /* $Id$ */ include('includes/session.inc'); - $Title = _('Supplier Maintenance'); /* webERP manual links before header.inc */ $ViewTopic= 'AccountsPayable'; $BookMark = 'NewSupplier'; include('includes/header.inc'); + include('includes/SQL_CommonFunctions.inc'); include('includes/CountriesArray.php'); @@ -50,7 +49,7 @@ } break; case '03': - if (!(($BranchNumber >= 1 and $BranchNumber <= 999) or ($BranchNumber >= 1300 and $BranchNumber <= 1399))) { + if (!(($BranchNumber >= 1 and $BranchNumber <= 999) or ($BranchNumber >= 1300 and $BranchNumber <= 1399))) { echo _('Westpac Trust branches must be between 0001 and 0999 or between 1300 and 1399') . '. ' . _('The branch number used is invalid'); return False; exit; @@ -83,7 +82,7 @@ //"13" "14" "15", "16", "17", "18", "19", "20", "21", "22", "23", "24": - if (!($BranchNumber >= 3000 and $BranchNumber <= 4999)){ + if (!($BranchNumber >= 3000 and $BranchNumber <= 4999)) { echo _('Trust Bank and Regional Bank branches must be between 3000 and 4999') . '. ' . _('The branch number used is invalid'); return False; exit; @@ -91,7 +90,7 @@ break; case '11': - if (!($BranchNumber >= 5000 and $BranchNumber <= 6499)){ + if (!($BranchNumber >= 5000 and $BranchNumber <= 6499)) { echo _('Post Office Bank branches must be between 5000 and 6499') . '. ' . _('The branch number used is invalid'); return False; exit; @@ -99,14 +98,14 @@ break; case '25': - if (!($BranchNumber >= 2500 and $BranchNumber <= 2599)){ + if (!($BranchNumber >= 2500 and $BranchNumber <= 2599)) { echo _('Countrywide Bank branches must be between 2500 and 2599') . '. ' . _('The branch number used is invalid'); return False; exit; } break; case '29': - if (!($BranchNumber >= 2150 and $BranchNumber <= 2299)){ + if (!($BranchNumber >= 2150 and $BranchNumber <= 2299)) { echo _('United Bank branches must be between 2150 and 2299') . '. ' . _('The branch number used is invalid'); return False; exit; @@ -114,7 +113,7 @@ break; case '30': - if (!($BranchNumber >= 2900 and $BranchNumber <= 2949)){ + if (!($BranchNumber >= 2900 and $BranchNumber <= 2949)) { echo _('Hong Kong and Shanghai branches must be between 2900 and 2949') . '. ' . _('The branch number used is invalid'); return False; exit; @@ -122,7 +121,7 @@ break; case '31': - if (!($BranchNumber >= 2800 and $BranchNumber <= 2849)){ + if (!($BranchNumber >= 2800 and $BranchNumber <= 2849)) { echo _('Citibank NA branches must be between 2800 and 2849') . '. ' . _('The branch number used is invalid'); return False; exit; @@ -130,7 +129,7 @@ break; case '33': - if (!($BranchNumber >= 6700 and $BranchNumber <= 6799)){ + if (!($BranchNumber >= 6700 and $BranchNumber <= 6799)) { echo _('Rural Bank branches must be between 6700 and 6799') . '. ' . _('The branch number used is invalid'); return False; exit; @@ -151,7 +150,7 @@ switch ($i) { case 3: - if ($BankPrefix == '08' or $BankPrefix == '09' or $BankPrefix == '25' or $BankPrefix == '33'){ + if ($BankPrefix == '08' or $BankPrefix == '09' or $BankPrefix == '25' or $BankPrefix == '33') { $CheckSum = 0; } else { $CheckSum = $CheckSum + ($DigitVal * 6); @@ -159,7 +158,7 @@ break; case 4: - if ($BankPrefix == '08' or $BankPrefix == '09' or $BankPrefix == '25' or $BankPrefix == '33'){ + if ($BankPrefix == '08' or $BankPrefix == '09' or $BankPrefix == '25' or $BankPrefix == '33') { $CheckSum = 0; } else { $CheckSum = $CheckSum + ($DigitVal * 3); @@ -167,7 +166,7 @@ break; case 5: - if ($BankPrefix == '08' or $BankPrefix == '09' or $BankPrefix == '25' or $BankPrefix == '33'){ + if ($BankPrefix == '08' or $BankPrefix == '09' or $BankPrefix == '25' or $BankPrefix == '33') { $CheckSum = 0; } else { $CheckSum = $CheckSum + ($DigitVal * 7); @@ -175,7 +174,7 @@ break; case 6: - if ($BankPrefix == '08' or $BankPrefix == '09' or $BankPrefix == '25' or $BankPrefix == '33'){ + if ($BankPrefix == '08' or $BankPrefix == '09' or $BankPrefix == '25' or $BankPrefix == '33') { $CheckSum = 0; } else { $CheckSum = $CheckSum + ($DigitVal * 9); @@ -185,13 +184,13 @@ case 7: if ($BankPrefix == '08') { $CheckSum = $CheckSum + $DigitVal * 7; - } elseif ($BankPrefix == '25' Or $BankPrefix == '33'){ + } elseif ($BankPrefix == '25' Or $BankPrefix == '33') { $CheckSum = $CheckSum + $DigitVal * 1; } break; case 8: - if ($BankPrefix == '08'){ + if ($BankPrefix == '08') { $CheckSum = $CheckSum + ($DigitVal * 6); } elseif ($BankPrefix == '09') { $CheckSum = 0; @@ -203,9 +202,9 @@ break; case 9: - if ($BankPrefix == '09'){ + if ($BankPrefix == '09') { $CheckSum = 0; - } elseif ($BankPrefix == '25' or $BankPrefix == '33'){ + } elseif ($BankPrefix == '25' or $BankPrefix == '33') { $CheckSum = $CheckSum + $DigitVal * 3; } else { $CheckSum = $CheckSum + $DigitVal * 5; @@ -213,7 +212,7 @@ break; case 10: - if ($BankPrefix == '08'){ + if ($BankPrefix == '08') { $CheckSum = $CheckSum + $DigitVal * 4; } elseif ($BankPrefix == '09') { If (($DigitVal * 5) > 9) { @@ -229,9 +228,9 @@ break; case 11: - if ($BankPrefix == '08'){ + if ($BankPrefix == '08') { $CheckSum = $CheckSum + $DigitVal * 3; - } elseif ($BankPrefix == '09'){ + } elseif ($BankPrefix == '09') { if (($DigitVal * 4) > 9) { $CheckSum = $CheckSum + (int) mb_substr(($DigitVal * 4),0,1) + (int)mb_substr(($DigitVal * 4),mb_strlen($DigitVal * 4)-1, 1); } else { @@ -294,9 +293,9 @@ } //End Function -if (isset($_GET['SupplierID'])){ +if (isset($_GET['SupplierID'])) { $SupplierID = mb_strtoupper($_GET['SupplierID']); -} elseif (isset($_POST['SupplierID'])){ +} elseif (isset($_POST['SupplierID'])) { $SupplierID = mb_strtoupper($_POST['SupplierID']); } else { unset($SupplierID); @@ -304,7 +303,7 @@ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/supplier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Suppliers') . '</p>'; if (isset($SupplierID)) { - echo '<p> + echo '<p> <a href="' . $RootPath . '/SupplierContacts.php?SupplierID=' . $SupplierID . '">' . _('Review Supplier Contact Details') . '</a> </p>'; } @@ -403,13 +402,13 @@ } */ - if ($InputError != 1){ + if ($InputError != 1) { $SQL_SupplierSince = FormatDateForSQL($_POST['SupplierSince']); $latitude = 0; $longitude = 0; - if ($_SESSION['geocode_integration']==1 ){ + if ($_SESSION['geocode_integration']==1 ) { // Get the lat/long from our geocoding host $sql = "SELECT * FROM geocode_param WHERE 1"; $ErrMsg = _('An error occurred in retrieving the information'); @@ -595,10 +594,10 @@ prnMsg(_('A new supplier for') . ' ' . $_POST['SuppName'] . ' ' . _('has been added to the database'),'success'); echo '<p> - <a href="' . $RootPath . '/SupplierContacts.php?SupplierID=' . $SupplierID . '">' . _('Review Supplier Contact Details') . '</a> - </p>'; - - unset($SupplierID); + <a href="' . $RootPath . '/SupplierContacts.php?SupplierID=' . $SupplierID . '">' . _('Review Supplier Contact Details') . '</a> + </p>'; + + unset($SupplierID); unset($_POST['SuppName']); unset($_POST['Address1']); unset($_POST['Address2']); @@ -682,7 +681,7 @@ /*If the page was called without $SupplierID passed to page then assume a new supplier is to be entered show a form with a Supplier Code field other wise the form showing the fields with the existing entries against the supplier will show for editing with only a hidden SupplierID field*/ echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; - echo '<div>'; + echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<input type="hidden" name="New" value="Yes" />'; @@ -690,22 +689,22 @@ echo '<table class="selection">'; /* if $AutoSupplierNo is off (not 0) then provide an input box for the SupplierID to manually assigned */ - if ($_SESSION['AutoSupplierNo']== 0 ) { + if ($_SESSION['AutoSupplierNo']== 0 ) { echo '<tr><td>' . _('Supplier Code') . ':</td> <td><input type="text" data-type="no-illegal-chars" title="'._('The supplier id should not be within 10 legal characters and cannot be blank').'" required="required" name="SupplierID" placeholder="'._('within 10 characters').'" size="11" maxlength="10" /></td> </tr>'; } echo '<tr> <td>' . _('Supplier Name') . ':</td> - <td><input type="text" pattern="(?!^\s+$)[^<>+]{1,40}" required="required" title="'._('The supplier name should not be blank and should be less than 40 legal characters').'" name="SuppName" size="42" placeholder="'._('Within 40 legal characters').'" maxlength="40" /></td> + <td><input type="text" pattern="(?!^\s+$)[^<>+] {1,40}" required="required" title="'._('The supplier name should not be blank and should be less than 40 legal characters').'" name="SuppName" size="42" placeholder="'._('Within 40 legal characters').'" maxlength="40" /></td> </tr> <tr> <td>' . _('Address Line 1 (Street)') . ':</td> - <td><input type="text" pattern=".{1,40}" title="'._('The input should be less than 40 characters').'" placeholder="'._('Less than 40 characters').'" name="Address1" size="42" maxlength="40" /></td> + <td><input type="text" pattern=". {1,40}" title="'._('The input should be less than 40 characters').'" placeholder="'._('Less than 40 characters').'" name="Address1" size="42" maxlength="40" /></td> </tr> <tr> <td>' . _('Address Line 2 (Street)') . ':</td> - <td><input type="text" name="Address2" pattern=".{1,40}" title="'._('The input should be less than 40 characters').'" placeholder="'._('Less than 40 characters').'" size="42" maxlength="40" /></td> + <td><input type="text" name="Address2" pattern=". {1,40}" title="'._('The input should be less than 40 characters').'" placeholder="'._('Less than 40 characters').'" size="42" maxlength="40" /></td> </tr> <tr> <td>' . _('Address Line 3 (Suburb/City)') . ':</td> @@ -722,28 +721,28 @@ <tr> <td>' . _('Country') . ':</td> <td><select name="Address6">'; - foreach ($CountriesArray as $CountryEntry => $CountryName){ - if (isset($_POST['Address6']) AND ($_POST['Address6'] == $CountryName)){ - echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>'; + foreach ($CountriesArray as $CountryEntry => $CountryName) { + if (isset($_POST['Address6']) AND ($_POST['Address6'] == $CountryName)) { + echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>'; }elseif (!isset($_POST['Address6']) AND $CountryName == "") { - echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>'; + echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>'; } else { - echo '<option value="' . $CountryName . '">' . $CountryName . '</option>'; + echo '<option value="' . $CountryName . '">' . $CountryName . '</option>'; } } echo '</select></td> </tr> <tr> <td>' . _('Telephone') . ':</td> - <td><input type="tel" pattern="[\s\d+)(-]{1,40}" title="'._('The input should be phone number').'" placeholder="'._('only number + - ( and ) allowed').'" name="Phone" size="30" maxlength="40" /></td> + <td><input type="tel" pattern="[\s\d+)(-] {1,40}" title="'._('The input should be phone number').'" placeholder="'._('only number + - ( and ) allowed').'" name="Phone" size="30" maxlength="40" /></td> </tr> <tr> <td>' . _('Facsimile') . ':</td> - <td><input type="tel" pattern="[\s\d+)(-]{1,40}" title="'._('The input should be fax number').'" placeholder="'._('only number + - ( and ) allowed').'" name="Fax" size="30" maxlength="40" /></td> + <td><input type="tel" pattern="[\s\d+)(-] {1,40}" title="'._('The input should be fax number').'" placeholder="'._('only number + - ( and ) allowed').'" name="Fax" size="30" maxlength="40" /></td> </tr> <tr> <td>' . _('Email Address') . ':</td> - <td><input type="email" name="Email" title="'._('Only email address are allowed').'" placeholder="'._('email format such as xx...@ma...').'" size="30" maxlength="50" pattern="[a-z0-9!#$%&\'*+/=?^_`{|}~.-]+@[a-z0-9-]+(\.[a-z0-9-]+)*" /></td> + <td><input type="email" name="Email" title="'._('Only email address are allowed').'" placeholder="'._('email format such as xx...@ma...').'" size="30" maxlength="50" pattern="[a-z0-9!#$%&\'*+/=?^_` {|}~.-]+@[a-z0-9-]+(\.[a-z0-9-]+)*" /></td> </tr> <tr> <td>' . _('URL') . ':</td> @@ -754,7 +753,7 @@ <td><select name="SupplierType">'; $result=DB_query("SELECT typeid, typename FROM suppliertype", $db); while ($myrow = DB_fetch_array($result)) { - echo '<option value="' . $myrow['typeid'] . '">' . $myrow['typename'] . '</option>'; + echo '<option value="' . $myrow['typeid'] . '">' . $myrow['typename'] . '</option>'; } //end while loop echo '</select></td> </tr>'; @@ -783,10 +782,10 @@ <td><select name="PaymentTerms">'; while ($myrow = DB_fetch_array($result)) { - echo '<option value="'. $myrow['termsindicator'] . '">' . $myrow['terms'] . '</option>'; + echo '<option value="'. $myrow['termsindicator'] . '">' . $myrow['terms'] . '</option>'; } //end while loop DB_data_seek($result, 0); - echo '</select></td></tr>'; + echo '</select></td></tr>'; $result=DB_query("SELECT id, coyname FROM factorcompanies", $db); @@ -795,10 +794,10 @@ <td><select name="FactorID">'; echo '<option value="0">' . _('None') . '</option>'; while ($myrow = DB_fetch_array($result)) { - if (isset($_POST['FactorID']) AND $_POST['FactorID'] == $myrow['id']){ - echo '<option selected="selected" value="' . $myrow['id'] . '">' . $myrow['coyname'] . '</option>'; + if (isset($_POST['FactorID']) AND $_POST['FactorID'] == $myrow['id']) { + echo '<option selected="selected" value="' . $myrow['id'] . '">' . $myrow['coyname'] . '</option>'; } else { - echo '<option value="' . $myrow['id'] . '">' . $myrow['coyname'] . '</option>'; + echo '<option value="' . $myrow['id'] . '">' . $myrow['coyname'] . '</option>'; } } //end while loop DB_data_seek($result, 0); @@ -809,7 +808,7 @@ <td><input type="text" name="TaxRef" placehoder="'._('Within 20 characters').'" size="21" maxlength="20" /></td></tr>'; $result=DB_query("SELECT currency, currabrev FROM currencies", $db); - if (!isset($_POST['CurrCode'])){ + if (!isset($_POST['CurrCode'])) { $CurrResult = DB_query("SELECT currencydefault FROM companies WHERE coycode=1", $db); $myrow = DB_fetch_row($CurrResult); $_POST['CurrCode'] = $myrow[0]; @@ -819,7 +818,7 @@ <td>' . _('Supplier Currency') . ':</td> <td><select name="CurrCode">'; while ($myrow = DB_fetch_array($result)) { - if ($_POST['CurrCode'] == $myrow['currabrev']){ + if ($_POST['CurrCode'] == $myrow['currabrev']) { echo '<option selected="selected" value="' . $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>'; } else { echo '<option value="' . $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>'; @@ -846,7 +845,7 @@ $result = DB_query($sql, $db); while ($myrow = DB_fetch_array($result)) { - if (isset($_POST['TaxGroup']) and $_POST['TaxGroup'] == $myrow['taxgroupid']){ + if (isset($_POST['TaxGroup']) and $_POST['TaxGroup'] == $myrow['taxgroupid']) { echo '<option selected="selected" value="' . $myrow['taxgroupid'] . '">' . $myrow['taxgroupdescription'] . '</option>'; } else { echo '<option value="' . $myrow['taxgroupid'] . '">' . $myrow['taxgroupdescription'] . '</option>'; @@ -857,9 +856,9 @@ </tr> </table> <br /> - <div class="centre"><input type="submit" name="submit" value="' . _('Insert New Supplier') . '" /></div>'; + <div class="centre"><input type="submit" name="submit" value="' . _('Insert New Supplier') . '" /></div>'; echo '</div> - </form>'; + </form>'; } else { @@ -867,7 +866,7 @@ //SupplierID exists - either passed when calling the form or from the form itself echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; - echo '<div>'; + echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<table class="selection">'; @@ -902,24 +901,24 @@ $myrow = DB_fetch_array($result); $_POST['SuppName'] = stripcslashes($myrow['suppname']); - $_POST['Address1'] = stripcslashes($myrow['address1']); - $_POST['Address2'] = stripcslashes($myrow['address2']); - $_POST['Address3'] = stripcslashes($myrow['address3']); - $_POST['Address4'] = stripcslashes($myrow['address4']); - $_POST['Address5'] = stripcslashes($myrow['address5']); - $_POST['Address6'] = stripcslashes($myrow['address6']); - $_POST['CurrCode'] = stripcslashes($myrow['currcode']); + $_POST['Address1'] = stripcslashes($myrow['address1']); + $_POST['Address2'] = stripcslashes($myrow['address2']); + $_POST['Address3'] = stripcslashes($myrow['address3']); + $_POST['Address4'] = stripcslashes($myrow['address4']); + $_POST['Address5'] = stripcslashes($myrow['address5']); + $_POST['Address6'] = stripcslashes($myrow['address6']); + $_POST['CurrCode'] = stripcslashes($myrow['currcode']); $_POST['Phone'] = $myrow['telephone']; $_POST['Fax'] = $myrow['fax']; $_POST['Email'] = $myrow['email']; $_POST['URL'] = $myrow['url']; $_POST['SupplierType'] = $myrow['supptype']; - $_POST['SupplierSince'] = ConvertSQLDate($myrow['suppliersince']); - $_POST['PaymentTerms'] = $myrow['paymentterms']; - $_POST['BankPartics'] = stripcslashes($myrow['bankpartics']); - $_POST['Remittance'] = $myrow['remittance']; - $_POST['BankRef'] = stripcslashes($myrow['bankref']); - $_POST['BankAct'] = $myrow['bankact']; + $_POST['SupplierSince'] = ConvertSQLDate($myrow['suppliersince']); + $_POST['PaymentTerms'] = $myrow['paymentterms']; + $_POST['BankPartics'] = stripcslashes($myrow['bankpartics']); + $_POST['Remittance'] = $myrow['remittance']; + $_POST['BankRef'] = stripcslashes($myrow['bankref']); + $_POST['BankAct'] = $myrow['bankact']; $_POST['TaxGroup'] = $myrow['taxgroupid']; $_POST['FactorID'] = $myrow['factorcompanyid']; $_POST['TaxRef'] = $myrow['taxref']; @@ -928,10 +927,10 @@ } else { // its a new supplier being added - + echo '<tr><td><input type="hidden" name="New" value="Yes" />'; /* if $AutoSupplierNo is off (i.e. 0) then provide an input box for the SupplierID to manually assigned */ - if ($_SESSION['AutoSupplierNo']== 0 ) { + if ($_SESSION['AutoSupplierNo']== 0 ) { echo _('Supplier Code') . ':</td> <td><input '.(in_array('ID',$Errors) ? 'class="inputerror"' : '').' type="text" name="SupplierID" value="' . $SupplierID . '" size="12" maxlength="10" /></td></tr>'; } @@ -943,7 +942,7 @@ </tr> <tr> <td>' . _('Address Line 1 (Street)') . ':</td> - <td><input type="text" name="Address1" value="' . $_POST['Address1'] . '" size="42" maxlength="40" /></td> + <td><input type="text" name="Address1" value="' . $_POST['Address1'] . '" size="42" maxlength="40" /></td> </tr> <tr> <td>' . _('Address Line 2 (Street)') . ':</td> @@ -959,19 +958,19 @@ </tr> <tr> <td>' . _('Address Line 5 (Postal Code)') . ':</td> - <td><input type="text" name="Address5" value="' . $_POST['Address5'] . '" size="42" placeholder="'._('Witin 40 characters').'" maxlength="40" /></td> + <td><input type="text" name="Address5" value="' . $_POST['Address5'] . '" size="42" placeholder="'._('Within 40 characters').'" maxlength="40" /></td> </tr> <tr> <td>' . _('Country') . ':</td> <td><select name="Address6">'; - - foreach ($CountriesArray as $CountryEntry => $CountryName){ - if (isset($_POST['Address6']) AND ($_POST['Address6'] == $CountryName)){ - echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>'; + + foreach ($CountriesArray as $CountryEntry => $CountryName) { + if (isset($_POST['Address6']) AND ($_POST['Address6'] == $CountryName)) { + echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>'; }elseif (!isset($_POST['Address6']) AND $CountryName == "") { - echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>'; + echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>'; } else { - echo '<option value="' . $CountryName . '">' . $CountryName . '</option>'; + echo '<option value="' . $CountryName . '">' . $CountryName . '</option>'; } } echo '</select></td> @@ -979,15 +978,15 @@ echo '<tr> <td>' . _('Telephone') . ':</td> - <td><input '.(in_array('Name',$Errors) ? 'class="inputerror"' : '').' type="tel" pattern="[\s\d+()-]{1,40}" placeholder="'._('Only digit blank ( ) and - allowed').'" name="Phone" value="' . $_POST['Phone'] . '" size="42" maxlength="40" /></td> + <td><input '.(in_array('Name',$Errors) ? 'class="inputerror"' : '').' type="tel" pattern="[\s\d+()-] {1,40}" placeholder="'._('Only digit blank ( ) and - allowed').'" name="Phone" value="' . $_POST['Phone'] . '" size="42" maxlength="40" /></td> </tr> <tr> <td>' . _('Facsimile') . ':</td> - <td><input '.(in_array('Name',$Errors) ? 'class="inputerror"' : '').' type="tel" pattern="[\s\d+()-]{1,40}" placeholder="'._('Only digit blank ( ) and - allowed').'" name="Fax" value="' . $_POST['Fax'] . '" size="42" maxlength="40" /></td> + <td><input '.(in_array('Name',$Errors) ? 'class="inputerror"' : '').' type="tel" pattern="[\s\d+()-] {1,40}" placeholder="'._('Only digit blank ( ) and - allowed').'" name="Fax" value="' . $_POST['Fax'] . '" size="42" maxlength="40" /></td> </tr> <tr> <td>' . _('Email Address') . ':</td> - <td><input '.(in_array('Name',$Errors) ? 'class="inputerror"' : '').' type="email" title="'._('The input must be in email format').'" name="Email" value="' . $_POST['Email'] . '" size="42" maxlength="40" placeholder="'._('email format such as xx...@ma...').'" pattern="[a-z0-9!#$%&\'*+/=?^_`{|}~.-]+@[a-z0-9-]+(\.[a-z0-9-]+)*" /></td> + <td><input '.(in_array('Name',$Errors) ? 'class="inputerror"' : '').' type="email" title="'._('The input must be in email format').'" name="Email" value="' . $_POST['Email'] . '" size="42" maxlength="40" placeholder="'._('email format such as xx...@ma...').'" pattern="[a-z0-9!#$%&\'*+/=?^_` {|}~.-]+@[a-z0-9-]+(\.[a-z0-9-]+)*" /></td> </tr> <tr> <td>' . _('URL') . ':</td> @@ -999,16 +998,16 @@ $result=DB_query("SELECT typeid, typename FROM suppliertype", $db); while ($myrow = DB_fetch_array($result)) { if ($_POST['SupplierType']==$myrow['typeid']) { - echo '<option selected="selected" value="'. $myrow['typeid'] . '">' . $myrow['typename'] . '</option>'; + echo '<option selected="selected" value="'. $myrow['typeid'] . '">' . $myrow['typename'] . '</option>'; } else { - echo '<option value="' . $myrow['typeid'] . '">' . $myrow['typename'] . '</option>'; + echo '<option value="' . $myrow['typeid'] . '">' . $myrow['typename'] . '</option>'; } } //end while loop echo '</select></td> </tr> <tr> <td>' . _('Supplier Since') . ' (' . $_SESSION['DefaultDateFormat'] .'):</td> - <td><input '.(in_array('SupplierSince',$Errors) ? 'class="inputerror"' : '').' size="12" maxlength="10" type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="SupplierSince" value="' . $_POST['SupplierSince'] . '" /></td> + <td><input '.(in_array('SupplierSince',$Errors) ? 'class="inputerror"' : '').' size="12" maxlength="10" type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="SupplierSince" value="' . $_POST['SupplierSince'] . '" /></td> </tr> <tr> <td>' . _('Bank Particulars') . ':</td> @@ -1016,7 +1015,7 @@ </tr> <tr> <td>' . _('Bank Reference') . ':</td> - <td><input '.(in_array('BankRef',$Errors) ? 'class="inputerror"' : '').' type="text" name="BankRef" size="13" maxlength="12" value="' . $_POST['BankRef'] . '" /></td> + <td><input '.(in_array('BankRef',$Errors) ? 'class="inputerror"' : '').' type="text" name="BankRef" size="13" maxlength="12" value="' . $_POST['BankRef'] . '" /></td> </tr> <tr> <td>' . _('Bank Account No') . ':</td> @@ -1030,14 +1029,14 @@ <td><select name="PaymentTerms">'; while ($myrow = DB_fetch_array($result)) { - if ($_POST['PaymentTerms'] == $myrow['termsindicator']){ - echo '<option selected="selected" value="' . $myrow['termsindicator'] . '">' . $myrow['terms'] . '</option>'; + if ($_POST['PaymentTerms'] == $myrow['termsindicator']) { + echo '<option selected="selected" value="' . $myrow['termsindicator'] . '">' . $myrow['terms'] . '</option>'; } else { - echo '<option value="' . $myrow['termsindicator'] . '">' . $myrow['terms'] . '</option>'; + echo '<option value="' . $myrow['termsindicator'] . '">' . $myrow['terms'] . '</option>'; } } //end while loop DB_data_seek($result, 0); - echo '</select></td></tr>'; + echo '</select></td></tr>'; $result=DB_query("SELECT id, coyname FROM factorcompanies", $db); @@ -1046,14 +1045,14 @@ <td><select name="FactorID">'; echo '<option value="0">' . _('None') . '</option>'; while ($myrow = DB_fetch_array($result)) { - if ($_POST['FactorID'] == $myrow['id']){ - echo '<option selected="selected" value="' . $myrow['id'] . '">' . $myrow['coyname'] . '</option>'; + if ($_POST['FactorID'] == $myrow['id']) { + echo '<option selected="selected" value="' . $myrow['id'] . '">' . $myrow['coyname'] . '</option>'; } else { - echo '<option value="' . $myrow['id'] . '">' . $myrow['coyname'] . '</option>'; + echo '<option value="' . $myrow['id'] . '">' . $myrow['coyname'] . '</option>'; } } //end while loop DB_data_seek($result, 0); - echo '</select></td></tr>'; + echo '</select></td></tr>'; echo '<tr> <td>' . _('Tax Reference') . ':</td> <td><input type="text" name="TaxRef" size="21" maxlength="20" value="' . $_POST['TaxRef'] .'" /></td> @@ -1065,10 +1064,10 @@ <td>' . _('Supplier Currency') . ':</td> <td><select name="CurrCode">'; while ($myrow = DB_fetch_array($result)) { - if ($_POST['CurrCode'] == $myrow['currabrev']){ - echo '<option selected="selected" value="' . $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>'; + if ($_POST['CurrCode'] == $myrow['currabrev']) { + echo '<option selected="selected" value="' . $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>'; } else { - echo '<option value="' . $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>'; + echo '<option value="' . $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>'; } } //end while loop DB_data_seek($result, 0); @@ -1079,12 +1078,12 @@ <td>' . _('Remittance Advice') . ':</td> <td><select name="Remittance">'; - if ($_POST['Remittance'] == 0){ - echo '<option selected="selected" value="0">' . _('Not Required') . '</option>'; - echo '<option value="1">' . _('Required') . '</option>'; + if ($_POST['Remittance'] == 0) { + echo '<option selected="selected" value="0">' . _('Not Required') . '</option>'; + echo '<option value="1">' . _('Required') . '</option>'; } else { - echo '<option value="0">' . _('Not Required') . '</option>'; - echo '<option selected="selected" value="1">' . _('Required') . '</option>'; + echo '<option value="0">' . _('Not Required') . '</option>'; + echo '<option selected="selected" value="1">' . _('Required') . '</option>'; } @@ -1114,9 +1113,9 @@ if (isset($_POST['New'])) { echo '<br /> - <div class="centre"> - <input type="submit" name="submit" value="' . _('Add These New Supplier Details') . '" /> - </div>'; + <div class="centre"> + <input type="submit" name="submit" value="' . _('Add These New Supplier Details') . '" /> + </div>'; } else { echo '<br /> <div class="centre"> @@ -1131,7 +1130,7 @@ </div>'; } echo '</div> - </form>'; + </form>'; } // end of main ifs include('includes/footer.inc'); 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 2014-09-11 15:03:03 UTC (rev 6878) +++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2014-09-11 16:26:54 UTC (rev 6879) @@ -8,7 +8,7 @@ "Project-Id-Version: webERP 4.11.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-09-11 08:16-0600\n" -"PO-Revision-Date: 2014-08-30 17:36-0600\n" +"PO-Revision-Date: 2014-09-11 10:07-0600\n" "Last-Translator: Rafael Chacon <raf...@gm...>\n" "Language-Team: TecnoSoluciones.com <web...@te...>\n" "Language: es_ES\n" @@ -7944,7 +7944,7 @@ #: CustItem.php:145 msgid "Customer Unit" -msgstr "" +msgstr "Unidad del cliente" #: CustItem.php:146 PurchData.php:274 SupplierPriceList.php:536 msgid "Conversion Factor" @@ -7952,11 +7952,11 @@ #: CustItem.php:147 SelectOrderItems.php:1645 msgid "Customer Item" -msgstr "" +msgstr "Artículo del cliente" #: CustItem.php:148 msgid "Customer Description" -msgstr "" +msgstr "Descripción del cliente" #: CustItem.php:167 #, php-format @@ -8062,7 +8062,7 @@ #: CustItem.php:425 msgid "Customer Unit of Measure" -msgstr "" +msgstr "Unidad de medida del cliente" #: CustItem.php:434 PurchData.php:639 msgid "Conversion Factor (to our UOM)" @@ -8070,11 +8070,11 @@ #: CustItem.php:438 msgid "Customer Stock Code" -msgstr "" +msgstr "Código de inventario del cliente" #: CustItem.php:442 msgid "Customer Stock Description" -msgstr "" +msgstr "Descricpción de inventario del cliente" #: CustItem.php:455 MailingGroupMaintenance.php:250 PurchData.php:763 #: SellThroughSupport.php:481 Shipments.php:523 StockAdjustments.php:485 @@ -8534,15 +8534,21 @@ #: CustomerAllocations.php:416 msgid "" -"Check this box to allocate the entire amount of this transaction. Just " -"enter the amount without ticking this check box for a partial allocation" +"Check this box to allocate the entire amount of this transaction. Just enter " +"the amount without ticking this check box for a partial allocation" msgstr "" +"Marque esta casilla para asignar la totalidad del monto de esta transacción. " +"Solo introduzca la cantidad sin marcar esta casilla para una asignación " +"parcial" #: CustomerAllocations.php:425 msgid "" "Enter the amount of this transaction to be allocated. Nothing should be " "entered here if the entire transaction is to be allocated, use the check box" msgstr "" +"Ingrese el monto de esta transacción a ser asignado. Nada debe ser " +"introducido aquí si toda la transacción es a ser asignada, para eso use la " +"casilla" #: CustomerAllocations.php:435 SupplierAllocations.php:506 msgid "Total Allocated" @@ -9173,7 +9179,7 @@ #: CustomerInquiry.php:305 msgid "Credit " -msgstr "" +msgstr "Crédito" #: CustomerInquiry.php:305 msgid "Click to credit the invoice" @@ -9181,7 +9187,7 @@ #: CustomerInquiry.php:307 CustomerInquiry.php:311 msgid "HTML " -msgstr "" +msgstr "HTML" #: CustomerInquiry.php:307 CustomerTransInquiry.php:146 #, php-format @@ -9190,7 +9196,7 @@ #: CustomerInquiry.php:308 CustomerInquiry.php:312 msgid "PDF " -msgstr "" +msgstr "PDF" #: CustomerInquiry.php:308 CustomerInquiry.php:312 SelectSalesOrder.php:768 #: SelectSalesOrder.php:795 @@ -9200,7 +9206,7 @@ #: CustomerInquiry.php:309 msgid "Email " -msgstr "" +msgstr "Correo-e" #: CustomerInquiry.php:309 msgid "Click to email the invoice" @@ -20804,7 +20810,7 @@ #: PO_Items.php:1175 PO_Items.php:1251 msgid "Order some" -msgstr "" +msgstr "Pedir algunos" #: PO_Items.php:1189 msgid "Our Units" @@ -23620,7 +23626,7 @@ #: PrintWOItemSlip.php:109 msgid "Item Produced By" -msgstr "" +msgstr "Artículo producido por" #: PrintWOItemSlip.php:109 msgid "Quality Control By" @@ -23640,7 +23646,7 @@ #: PrintWOItemSlip.php:150 WOCanBeProducedNow.php:42 msgid "WO" -msgstr "" +msgstr "Orden de trabajo" #: PrintWOItemSlip.php:168 msgid "Component Code" @@ -23652,7 +23658,7 @@ #: PrintWOItemSlip.php:171 msgid "Qty Needed" -msgstr "" +msgstr "Cantidad necesaria" #: PrintWOItemSlip.php:173 WOCanBeProducedNow.php:51 msgid "Shrinkage" @@ -30821,11 +30827,11 @@ #: StockLocTransferReceive.php:342 msgid "Qty received" -msgstr "" +msgstr "Cantidad recibida" #: StockLocTransferReceive.php:343 msgid "By user" -msgstr "" +msgstr "Por usuario" #: StockLocTransferReceive.php:344 msgid "At" @@ -32305,7 +32311,7 @@ #: SuppLoginSetup.php:146 msgid "email address format" -msgstr "" +msgstr "formato de dirección de correo-e" #: SuppLoginSetup.php:181 msgid "" @@ -34064,7 +34070,7 @@ #: SupplierTypes.php:230 msgid "less than 100 characters" -msgstr "" +msgstr "menos de 100 caracteres" #: Suppliers.php:18 msgid "NZ account numbers must have 16 numeric characters in it" @@ -34306,7 +34312,7 @@ #: Suppliers.php:695 msgid "within 10 characters" -msgstr "" +msgstr "Hasta 10 caracteres" #: Suppliers.php:700 msgid "" @@ -34384,7 +34390,7 @@ #: Suppliers.php:809 TaxAuthorities.php:257 msgid "Within 20 characters" -msgstr "" +msgstr "Hasta 20 caracteres" #: Suppliers.php:835 Suppliers.php:1083 Suppliers.php:1086 msgid "Not Required" @@ -34396,11 +34402,11 @@ #: Suppliers.php:954 Suppliers.php:958 msgid "Within 40 characters" -msgstr "" +msgstr "Hasta 40 caracteres" #: Suppliers.php:962 msgid "Witin 40 characters" -msgstr "" +msgstr "Hasta 40 caracteres" #: Suppliers.php:982 Suppliers.php:986 msgid "Only digit blank ( ) and - allowed" @@ -36112,11 +36118,11 @@ #: TaxCategories.php:237 msgid "Tax Category Name" -msgstr "Nombre de la Clase de Impuesto" +msgstr "Nombre de la clase de impuesto" #: TaxCategories.php:238 msgid "No more than 30 characters" -msgstr "" +msgstr "No más de 30 caracteres" #: TaxCategories.php:238 msgid "No illegal characters allowed and cannot be blank" @@ -36129,7 +36135,7 @@ #: TaxGroups.php:5 msgid "Tax Groups" -msgstr "Grupos de Impuestos" +msgstr "Grupos de impuestos" #: TaxGroups.php:30 msgid "The Group description entered must be at least 4 characters long" @@ -36253,11 +36259,11 @@ #: TaxGroups.php:285 TaxGroups.php:338 msgid "Calculation Order" -msgstr "Orden de Cálculo" +msgstr "Orden de cálculo" #: TaxGroups.php:290 msgid "Tax on Prior Taxes" -msgstr "Impuesto sobre Impuesto Anterior" +msgstr "Impuesto sobre impuestos anteriores" #: TaxGroups.php:307 msgid "The input must be positive integer and less than 5" @@ -36396,7 +36402,7 @@ #: TaxProvinces.php:227 msgid "Tax Province Name" -msgstr "Nombre de La Jurisdicción Fiscal" +msgstr "Nombre de la jurisdicción fiscal" #: TaxProvinces.php:228 msgid "The tax province cannot be left blank and includes illegal characters" @@ -47844,7 +47850,7 @@ #: includes/MainMenuLinksArray.php:378 msgid "Bank Accounts" -msgstr "Cuentas Bancarias" +msgstr "Cuentas bancarias" #: includes/MainMenuLinksArray.php:389 msgid "Add a new Asset" @@ -50500,7 +50506,7 @@ #: ../webSHOP/includes/Functions.php:474 msgid "web" -msgstr "" +msgstr "web" #: ../webSHOP/includes/Functions.php:487 msgid "payment for order" |
From: <te...@us...> - 2014-09-12 00:40:04
|
Revision: 6880 http://sourceforge.net/p/web-erp/reponame/6880 Author: tehonu Date: 2014-09-12 00:40:01 +0000 (Fri, 12 Sep 2014) Log Message: ----------- HTML and improvements suggested by Tim Modified Paths: -------------- trunk/Locations.php trunk/WOCanBeProducedNow.php Modified: trunk/Locations.php =================================================================== --- trunk/Locations.php 2014-09-11 16:26:54 UTC (rev 6879) +++ trunk/Locations.php 2014-09-12 00:40:01 UTC (rev 6880) @@ -111,20 +111,6 @@ $_POST['Managed'] = 0; } - /* Set the InternalRequest field to 1 if it is checked, otherwise 0 */ - if($_POST['InternalRequest'] == 'Yes') { - $_POST['InternalRequest'] = 1; - } else { - $_POST['InternalRequest'] = 0; - } - - /* Set the usedToWO field to 1 if it is checked, otherwise 0 */ - if($_POST['UsedForWO'] == 'Yes') { - $_POST['UsedForWO'] = 1; - } else { - $_POST['UsedForWO'] = 0; - } - /*SelectedLocation is null cos no item selected on first time round so must be adding a record must be submitting new entries in the new Location form */ $sql = "INSERT INTO locations (loccode, @@ -666,7 +652,7 @@ } else { echo '<option value="0">' . _('No') . '</option>'; } - echo '</tr>'; + echo '</select></td></tr>'; echo '<tr> <td>' . _('Use for Work Order Productions?') . ':</td> @@ -681,7 +667,7 @@ } else { echo '<option value="0">' . _('No') . '</option>'; } - echo '</tr>'; + echo '</select></td></tr>'; /* This functionality is not written yet ... Modified: trunk/WOCanBeProducedNow.php =================================================================== --- trunk/WOCanBeProducedNow.php 2014-09-11 16:26:54 UTC (rev 6879) +++ trunk/WOCanBeProducedNow.php 2014-09-12 00:40:01 UTC (rev 6880) @@ -50,7 +50,7 @@ <th>' . _('Needed') . '</th> <th>' . _('Shrinkage') . '</th> <th>' . _('UOM') . '</th> - <th>' . '' . '</th> + <th></th> <th>' . _('Result') . '</th> </tr>'; |
From: <dai...@us...> - 2014-09-13 04:12:59
|
Revision: 6883 http://sourceforge.net/p/web-erp/reponame/6883 Author: daintree Date: 2014-09-13 04:12:51 +0000 (Sat, 13 Sep 2014) Log Message: ----------- Use global decimal point and thousands separator Modified Paths: -------------- trunk/ImportBankTrans.php trunk/SalesGraph.php trunk/sql/mysql/upgrade4.11-4.12.sql Modified: trunk/ImportBankTrans.php =================================================================== --- trunk/ImportBankTrans.php 2014-09-13 03:12:46 UTC (rev 6882) +++ trunk/ImportBankTrans.php 2014-09-13 04:12:51 UTC (rev 6883) @@ -34,6 +34,9 @@ //But check for the worst if ($_FILES['ImportFile']['size'] > (1024*1024)) { //File Size Check prnMsg(_('The file size is over the maximum allowed. The maximum size allowed is 1 megabyte'),'warn'); + prnMsg(_('The MT940 bank statement file cannot be imported and processed'),'error'); + include('includes/footer.inc'); + exit; $ReadTheFile ='No'; } @@ -42,11 +45,6 @@ $ReadTheFile ='No'; } */ - if ($ReadTheFile=='No'){ - prnMsg(_('The MT940 bank statement file cannot be imported and processed'),'error'); - include('includes/footer.inc'); - exit; - } $fp = fopen($_FILES['ImportFile']['tmp_name'], 'r'); $TransactionLine = false; @@ -57,91 +55,9 @@ $_SESSION['Statement']->FileName = $_FILES['ImportFile']['tmp_name']; while ($LineText = fgets($fp)){ /* get each line of the order file */ - /* - * This block of code could be in an include and different includes included depending on which type of transaction file is being imported - * */ + include('includes/ImportBankTrans_MT940_SCB.php'); //for Siam Commercial Bank Thailand + //for ING Bank Netherlands include('includes/ImportBankTrans_MT940_ING.php'); - if (substr($LineText,0,4)==':20:'){ //Timestamp of report MT940 generation - $_SESSION['Statement']->ReportCreated = substr($LineText,4); //in format DDDHHMM where DDD is the number of day in year and HHMM is the time - $TransactionLine = false; - } - if (substr($LineText,0,4)==':25:'){//The account number in IBAN format - $_SESSION['Statement']->AccountNumber = trim(substr($LineText,4)); - $TransactionLine = false; - } - if (substr($LineText,0,5)==':28C:'){//The statement number - $_SESSION['Statement']->StatementNumber = trim(substr($LineText,5)); - $TransactionLine = false; - } - if (substr($LineText,0,6)==':NS:22'){//The account owner name - $_SESSION['Statement']->AccountOwner = trim(substr($LineText,6)); - $TransactionLine = false; - } - if (substr($LineText,0,6)==':NS:23'){//The account name - $_SESSION['Statement']->AccountName = trim(substr($LineText,6)); - $TransactionLine = false; - } - if (substr($LineText,0,5)==':60F:'){//The account opening balance - $DebitOrCredit = substr($LineText,5,1); //D or C - $_SESSION['Statement']->OpeningDate = ConvertSQLDate('20' . substr($LineText,6,2) . '-' . substr($LineText,8,2) . '-' . substr($LineText,10,2)); - $_SESSION['Statement']->CurrCode = substr($LineText,12,3); - if ($DebitOrCredit =='D'){ - $_SESSION['Statement']->OpeningBalance = doubleval(str_replace(',','.',substr($LineText,15))); - } else { - $_SESSION['Statement']->OpeningBalance = doubleval('-' . str_replace(',','.',substr($LineText,15))); - } - $TransactionLine = false; - } - if (substr($LineText,0,4)==':61:'){//It's a transaction line - $TransactionLine = true; - $TransDate = ConvertSQLDate('20' . substr($LineText,4,2) . '-' . substr($LineText,6,2) . '-' . substr($LineText,8,2)); - $DebitOrCredit = substr($LineText,10,1); //D or C or R - if ($DebitOrCredit =='R'){ //then it is a 2 character reversal - if (substr($LineText,10,2)=='RC'){ - $DebitOrCredit ='D'; - } else { - $DebitOrCredit ='C'; - } - if ($DebitOrCredit =='D'){ - $TransAmount = doubleval(str_replace(',','.',substr($LineText,12,-10))); - } else { - $TransAmount = doubleval('-' . str_replace(',','.',substr($LineText,12,-10))); - } - } else { // it will be either D or C - if ($DebitOrCredit =='D'){ - $TransAmount = doubleval(str_replace(',','.',substr($LineText,11,-10))); - } else { - $TransAmount = doubleval('-' . str_replace(',','.',substr($LineText,11,-10))); - } - } - $i++; - $_SESSION['Trans'][$i] = new BankTrans($TransDate,$TransAmount) ; - } - if (substr($LineText,0,4)==':86:'){ - if ($TransactionLine) { - $_SESSION['Trans'][$i]->Code = substr($LineText,4,3); - $_SESSION['Trans'][$i]->Description = substr($LineText,7); - } - } - - if (substr($LineText,0,1)!=':' AND $TransactionLine){ - //then it is the continuation of an :86: line - $_SESSION['Trans'][$i]->Description .= $LineText; - } - - if (substr($LineText,0,5)==':62F:'){ - $DebitOrCredit = substr($LineText,5,1); //D or C - $_SESSION['Statement']->ClosingDate = ConvertSQLDate('20' . substr($LineText,6,2) . '-' . substr($LineText,8,2) . '-' . substr($LineText,10,2)); - $CurrCode = substr($LineText,12,3); - if ($DebitOrCredit =='D'){ - $_SESSION['Statement']->ClosingBalance = doubleval(str_replace(',','.',substr($LineText,15))); - } else { - $_SESSION['Statement']->ClosingBalance = doubleval('-' . str_replace(',','.',substr($LineText,15))); - } - $TransactionLine = false; - } - /* end of MT940 specific import code - that could be in an include if we get other file formats - * */ } /*end while get next line of message */ /* Look to match up the account for which transactions are being imported with a bank account in webERP */ Modified: trunk/SalesGraph.php =================================================================== --- trunk/SalesGraph.php 2014-09-13 03:12:46 UTC (rev 6882) +++ trunk/SalesGraph.php 2014-09-13 04:12:51 UTC (rev 6883) @@ -161,19 +161,21 @@ <td>' . $_POST['SalesmanCode'] . '</td> </tr>'; - echo '<tr><td>' . _('Graph Type') . '</td>'; - echo '<td><select name="GraphType">'; - echo '<option value="bars">' . _('Bar Graph') . '</option>'; - echo '<option value="stackedbars">' . _('Stacked Bar Graph') . '</option>'; - echo '<option value="lines">' . _('Line Graph') . '</option>'; - echo '<option value="linepoints">' . _('Line Point Graph') . '</option>'; - echo '<option value="area">' . _('Area Graph') . '</option>'; - echo '<option value="points">' . _('Points Graph') . '</option>'; - echo '<option value="pie">' . _('Pie Graph') . '</option>'; - echo '<option value="thinbarline">' . _('Thin Bar Line Graph') . '</option>'; - echo '<option value="squared">' . _('Squared Graph') . '</option>'; - echo '<option value="stackedarea">' . _('Stacked Area Graph') . '</option>'; - echo '</select></td></tr>'; + echo '<tr> + <td>' . _('Graph Type') . '</td + <td><select name="GraphType"> + <option value="bars">' . _('Bar Graph') . '</option> + <option value="stackedbars">' . _('Stacked Bar Graph') . '</option> + <option value="lines">' . _('Line Graph') . '</option> + <option value="linepoints">' . _('Line Point Graph') . '</option> + <option value="area">' . _('Area Graph') . '</option> + <option value="points">' . _('Points Graph') . '</option> + <option value="pie">' . _('Pie Graph') . '</option> + <option value="thinbarline">' . _('Thin Bar Line Graph') . '</option> + <option value="squared">' . _('Squared Graph') . '</option> + <option value="stackedarea">' . _('Stacked Area Graph') . '</option> + </select></td> + </tr>'; if (!isset($_POST['ValueFrom'])){ $_POST['ValueFrom']=''; @@ -188,16 +190,17 @@ echo '<tr><td>' . _('From:') . ' <input type="text" name="ValueFrom" value="' . $_POST['ValueFrom'] . '" /></td> <td>' . _('To:') . ' <input type="text" name="ValueTo" value="' . $_POST['ValueTo'] . '" /></td></tr>'; - echo '<tr><td>' . _('Graph Value:') . '</td><td> - <input type="radio" name="GraphValue" value="Net" checked="checked" />' . _('Net Sales Value') . '<br /> - <input type="radio" name="GraphValue" value="GP" />' . _('Gross Profit') . '<br /> - <input type="radio" name="GraphValue" value="Quantity" />' . _('Quantity') . '</td></tr>'; - - echo '</table>'; - - echo '<br /><div class="centre"><input type="submit" name="ShowGraph" value="' . _('Show Sales Graph') .'" /></div>'; - echo '</div> - </form>'; + echo '<tr> + <td>' . _('Graph Value:') . '</td> + <td><input type="radio" name="GraphValue" value="Net" checked="checked" />' . _('Net Sales Value') . '<br /> + <input type="radio" name="GraphValue" value="GP" />' . _('Gross Profit') . '<br /> + <input type="radio" name="GraphValue" value="Quantity" />' . _('Quantity') . '</td> + </tr> + </table> + <br /> + <div class="centre"><input type="submit" name="ShowGraph" value="' . _('Show Sales Graph') .'" /></div> + </div> + </form>'; include('includes/footer.inc'); } else { @@ -286,7 +289,7 @@ $graph->SetShading(5); $graph->SetDrawYGrid(TRUE); $graph->SetDataType('text-data'); - $graph->SetNumberFormat('.', ','); + $graph->SetNumberFormat($DecimalPoint, $ThousandsSeparator); $graph->SetPrecisionY($_SESSION['CompanyRecord']['decimalplaces']); $SalesResult = DB_query($SQL, $db); @@ -319,11 +322,10 @@ //Draw it $graph->DrawGraph(); echo '<table class="selection"> - <tr><td>'; - echo '<p><img src="companies/' .$_SESSION['DatabaseName'] . '/reports/salesgraph.png" alt="Sales Report Graph"></img></p>'; - echo '</td> - </tr> - </table>'; + <tr> + <td><p><img src="companies/' .$_SESSION['DatabaseName'] . '/reports/salesgraph.png" alt="Sales Report Graph"></img></p></td> + </tr> + </table>'; include('includes/footer.inc'); } ?> \ No newline at end of file Modified: trunk/sql/mysql/upgrade4.11-4.12.sql =================================================================== --- trunk/sql/mysql/upgrade4.11-4.12.sql 2014-09-13 03:12:46 UTC (rev 6882) +++ trunk/sql/mysql/upgrade4.11-4.12.sql 2014-09-13 04:12:51 UTC (rev 6883) @@ -74,7 +74,7 @@ ON www_users.userid = locationusers.userid AND locations.loccode = locationusers.loccode WHERE locationusers.userid IS NULL; - + ALTER TABLE `mrpparameters` ADD `userldemands` VARCHAR( 5 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'use RL requirements or not' AFTER `usemrpdemands`; INSERT INTO `scripts` ( `script` , `pagesecurity` , `description` ) VALUES ('WOCanBeProducedNow.php', '4', 'List of WO items that can be produced with available stock in location'); |
From: <rc...@us...> - 2014-09-13 23:06:57
|
Revision: 6884 http://sourceforge.net/p/web-erp/reponame/6884 Author: rchacon Date: 2014-09-13 23:06:42 +0000 (Sat, 13 Sep 2014) Log Message: ----------- Add info to help manual. Modified Paths: -------------- trunk/doc/Manual/ManualTax.html trunk/includes/DatabaseTranslations.php Modified: trunk/doc/Manual/ManualTax.html =================================================================== --- trunk/doc/Manual/ManualTax.html 2014-09-13 04:12:51 UTC (rev 6883) +++ trunk/doc/Manual/ManualTax.html 2014-09-13 23:06:42 UTC (rev 6884) @@ -55,3 +55,30 @@ <p>The TaxAuthority of the warehouse the goods are delivered from, the TaxLevel of the item and the Tax Authority of the branch of the customer being delivered to are determined. Using all three of these factors the rate is returned from the TaxAuthLevels table.</p> <p>General ledger posting relating to the taxes calculated are made in accordance with the codes set up in the Tax Authority table. <!-- Help End: TaxAuthorities --></p> + +<!-- Begin: Tax Categories --> +<div class="floatright"> + <a class="minitext" href="#top">⬆ Top</a> +</div> + +<h2><a id="TaxCategories">Tax Category Maintenance</a></h2> + +<p>In this script, you can enter, edit or delete a tax category name.</p> + +<p>You can enter any tax category name. But there are three special tax category names:</p> + +<ul> + +<li><b>Exempt</b>. "<i>Exempt</i>" written in British English (en-GB). This tax category name is translated to other languages, if translated term is available. You can edit and you can delete this category.</li> + +<li><b>Freight</b>. "<i>Freight</i>" written in British English (en-GB). This tax category name is translated to other languages, if translated term is available. You can NOT edit nor you can NOT delete this category, because it is used in several scripts.</li> + +<li><b>Handling</b>. "<i>Handling</i>" written in British English (en-GB). This tax category name is translated to other languages, if translated term is available. You can edit and you can delete this category.</li> + +</ul> + + + +<!-- End: Tax Categories --> + + Modified: trunk/includes/DatabaseTranslations.php =================================================================== --- trunk/includes/DatabaseTranslations.php 2014-09-13 04:12:51 UTC (rev 6883) +++ trunk/includes/DatabaseTranslations.php 2014-09-13 23:06:42 UTC (rev 6884) @@ -4,9 +4,9 @@ The script includes/DatabaseTranslations.php is a locale language file for the contents of the fields in the database. The purpose of this file is to translate the database fields that appears in screens and reports. This script is only -used at the time that the system default language file is language file is -rebuilt. Can be extended for scripts and other tables where the data from the -table is static and used to display. +used at the time that the system default language file is rebuilt. Can be +extended for scripts and other tables where the data from the table is static +and used to display. *******************************************************************************/ // scripts.description: |
From: <dai...@us...> - 2014-09-14 02:52:04
|
Revision: 6886 http://sourceforge.net/p/web-erp/reponame/6886 Author: daintree Date: 2014-09-14 02:51:55 +0000 (Sun, 14 Sep 2014) Log Message: ----------- Import Bank transactions modifications for SCB MT940 imports Modified Paths: -------------- trunk/BankAccounts.php trunk/ImportBankTrans.php trunk/ImportBankTransAnalysis.php trunk/doc/Change.log trunk/doc/Manual/ManualTax.html trunk/sql/mysql/upgrade4.11-4.12.sql Added Paths: ----------- trunk/includes/ImportBankTrans_MT940_ING.php trunk/includes/ImportBankTrans_MT940_SCB.php Modified: trunk/BankAccounts.php =================================================================== --- trunk/BankAccounts.php 2014-09-14 00:39:55 UTC (rev 6885) +++ trunk/BankAccounts.php 2014-09-14 02:51:55 UTC (rev 6886) @@ -88,7 +88,8 @@ bankaccountcode='" . $_POST['BankAccountCode'] . "', bankaccountnumber='" . $_POST['BankAccountNumber'] . "', bankaddress='" . $_POST['BankAddress'] . "', - invoice ='" . $_POST['DefAccount'] . "' + invoice ='" . $_POST['DefAccount'] . "', + importformat='" . $_POST['ImportFormat'] . "' WHERE accountcode = '" . $SelectedBankAccount . "'"; prnMsg(_('Note that it is not possible to change the currency of the account once there are transactions against it'),'warn'); echo '<br />'; @@ -98,7 +99,8 @@ bankaccountnumber='" . $_POST['BankAccountNumber'] . "', bankaddress='" . $_POST['BankAddress'] . "', currcode ='" . $_POST['CurrCode'] . "', - invoice ='" . $_POST['DefAccount'] . "' + invoice ='" . $_POST['DefAccount'] . "', + importformat='" . $_POST['ImportFormat'] . "' WHERE accountcode = '" . $SelectedBankAccount . "'"; } @@ -113,14 +115,16 @@ bankaccountnumber, bankaddress, currcode, - invoice + invoice, + importformat ) VALUES ('" . $_POST['AccountCode'] . "', '" . $_POST['BankAccountName'] . "', '" . $_POST['BankAccountCode'] . "', '" . $_POST['BankAccountNumber'] . "', '" . $_POST['BankAddress'] . "', '" . $_POST['CurrCode'] . "', - '" . $_POST['DefAccount'] . "' )"; + '" . $_POST['DefAccount'] . "', + '" . $_POST['ImportFormat'] . "' )"; $msg = _('The new bank account has been entered'); } @@ -178,7 +182,8 @@ bankaccountnumber, bankaddress, currcode, - invoice + invoice, + importformat FROM bankaccounts INNER JOIN chartmaster ON bankaccounts.accountcode = chartmaster.accountcode"; @@ -193,6 +198,7 @@ <th>' . _('Bank Account Code') . '</th> <th>' . _('Bank Account Number') . '</th> <th>' . _('Bank Address') . '</th> + <th>' . _('Import Format') . '</th> <th>' . _('Currency') . '</th> <th>' . _('Default for Invoices') . '</th> </tr>'; @@ -213,6 +219,17 @@ } elseif ($myrow['invoice']==2) { $DefaultBankAccount=_('Currency Default'); } + switch ($myrow['importformat']) { + case 'MT940-ING': + $ImportFormat = 'ING MT940'; + break; + case 'MT940-SCB': + $ImportFormat = 'SCB MT940'; + break; + default: + $ImportFormat =''; + } + printf('<td>%s<br />%s</td> <td>%s</td> <td>%s</td> @@ -220,6 +237,7 @@ <td>%s</td> <td>%s</td> <td>%s</td> + <td>%s</td> <td><a href="%s?SelectedBankAccount=%s">' . _('Edit') . '</a></td> <td><a href="%s?SelectedBankAccount=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this bank account?') . '\');">' . _('Delete') . '</a></td> </tr>', @@ -229,6 +247,7 @@ $myrow['bankaccountcode'], $myrow['bankaccountnumber'], $myrow['bankaddress'], + $ImportFormat, $myrow['currcode'], $DefaultBankAccount, htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), @@ -323,7 +342,9 @@ if (!isset($_POST['BankAddress'])) { $_POST['BankAddress']=''; } - +if (!isset($_POST['ImportFormat'])) { + $_POST['ImportFormat']=''; +} echo '<tr> <td>' . _('Bank Account Name') . ': </td> <td><input tabindex="2" ' . (in_array('AccountName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" required="required" name="BankAccountName" value="' . $_POST['BankAccountName'] . '" size="40" maxlength="50" /></td> @@ -341,8 +362,17 @@ <td><input tabindex="4" ' . (in_array('BankAddress',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="BankAddress" value="' . $_POST['BankAddress'] . '" size="40" maxlength="50" /></td> </tr> <tr> + <td>' . _('Transaction Import File Format') . ': </td> + <td><select tabindex="5" name="ImportFormat"> + <option ' . ($_POST['ImportFormat']=='' ? 'selected="selected"' : '') . ' value="">' . _('N/A') . '</option> + <option ' . ($_POST['ImportFormat']=='MT940-SCB' ? 'selected="selected"' : '') . ' value="MT940-SCB">' . _('MT940 - Siam Comercial Bank Thailand') . '</option> + <option ' . ($_POST['ImportFormat']=='MT940-ING' ? 'selected="selected"' : '') . ' value="MT940-ING">' . _('MT940 - ING Bank Netherlands') . '</option> + </select> + </td> + </tr> + <tr> <td>' . _('Currency Of Account') . ': </td> - <td><select tabindex="5" name="CurrCode">'; + <td><select tabindex="6" name="CurrCode">'; if (!isset($_POST['CurrCode']) or $_POST['CurrCode']==''){ $_POST['CurrCode'] = $_SESSION['CompanyRecord']['currencydefault']; @@ -364,7 +394,7 @@ echo '<tr> <td>' . _('Default for Invoices') . ': </td> - <td><select tabindex="6" name="DefAccount">'; + <td><select tabindex="8" name="DefAccount">'; if (!isset($_POST['DefAccount']) OR $_POST['DefAccount']==''){ $_POST['DefAccount'] = $_SESSION['CompanyRecord']['currencydefault']; @@ -393,11 +423,12 @@ <option value="0">' . _('No') . '</option>'; } -echo '</select></td>'; - -echo '</tr></table><br /> - <div class="centre"><input tabindex="7" type="submit" name="submit" value="'. _('Enter Information') .'" /></div>'; -echo '</div>'; -echo '</form>'; +echo '</select></td> + </tr> + </table> + <br /> + <div class="centre"><input tabindex="9" type="submit" name="submit" value="'. _('Enter Information') .'" /></div> + </div> + </form>'; include('includes/footer.inc'); ?> \ No newline at end of file Modified: trunk/ImportBankTrans.php =================================================================== --- trunk/ImportBankTrans.php 2014-09-14 00:39:55 UTC (rev 6885) +++ trunk/ImportBankTrans.php 2014-09-14 02:51:55 UTC (rev 6886) @@ -8,6 +8,7 @@ include ('includes/header.inc'); include('includes/SQL_CommonFunctions.inc'); +include('includes/CurrenciesArray.php'); /* Read in the flat file one line at a time @@ -15,9 +16,35 @@ */ if (!isset($_FILES['ImportFile']) AND !isset($_SESSION['Statement'])) { - echo '<form name="ImportForm" enctype="multipart/form-data" method="post" action="' . $_SERVER['PHP_SELF'] . '">'; - echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" /> + + $sql = "SELECT bankaccountname, + bankaccountnumber, + currcode, + importformat + FROM bankaccounts WHERE importformat <>''"; + + $ErrMsg = _('The bank accounts set up could not be retrieved because'); + $DbgMsg = _('The SQL used to retrieve the bank accounts was') . '<br />' . $sql; + $result = DB_query($sql,$db,$ErrMsg,$DbgMsg); + if (DB_num_rows($result) ==0){ + prnMsg(_('There are no bank accounts defined that are set up to allow importation of bank statement transactions. First define the file format used by your bank for statement exports.'),'error'); + echo '<br /><a href="BankAccounts.php>' . _('Setup Import Format for Bank Accounts') . '</a>'; + include('includes/footer.inc'); + exit; + } + echo '<form name="ImportForm" enctype="multipart/form-data" method="post" action="' . $_SERVER['PHP_SELF'] . '"> + <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" /> <table> + <tr> + <td>' . _('Bank Account to Import Transaction For') . '</td> + <td><select name="ImportFormat">'; + + while ($myrow = DB_fetch_array($result)) { + echo '<option value="' . $myrow['importformat'] . '">' . $myrow['bankaccountname'] . '</option>'; + } + + echo '</td> + </tr> <tr> <td>' . _('MT940 format Bank Statement File to import') . '</td> <td><input type="file" id="ImportFile" autofocus="autofocus" required="required" title="' . _('Select the file that contains the bank transactions in MT940 format') . '" name="ImportFile"></td> @@ -33,7 +60,7 @@ //But check for the worst if ($_FILES['ImportFile']['size'] > (1024*1024)) { //File Size Check - prnMsg(_('The file size is over the maximum allowed. The maximum size allowed is 1 megabyte'),'warn'); + prnMsg(_('The file size is over the maximum allowed. The maximum size allowed is 1 megabyte. This file size is (bytes)') . ' ' . $_FILES['ImportFile']['size'],'warn'); prnMsg(_('The MT940 bank statement file cannot be imported and processed'),'error'); include('includes/footer.inc'); exit; @@ -55,9 +82,15 @@ $_SESSION['Statement']->FileName = $_FILES['ImportFile']['tmp_name']; while ($LineText = fgets($fp)){ /* get each line of the order file */ - include('includes/ImportBankTrans_MT940_SCB.php'); //for Siam Commercial Bank Thailand - //for ING Bank Netherlands include('includes/ImportBankTrans_MT940_ING.php'); + switch ($_POST['ImportFormat']) { + case 'MT940-SCB': + include('includes/ImportBankTrans_MT940_SCB.php'); //for Siam Commercial Bank Thailand + break; + case 'MT940-ING': //for ING Bank Netherlands + include('includes/ImportBankTrans_MT940_ING.php'); + } + } /*end while get next line of message */ /* Look to match up the account for which transactions are being imported with a bank account in webERP */ Modified: trunk/ImportBankTransAnalysis.php =================================================================== --- trunk/ImportBankTransAnalysis.php 2014-09-14 00:39:55 UTC (rev 6885) +++ trunk/ImportBankTransAnalysis.php 2014-09-14 02:51:55 UTC (rev 6886) @@ -20,7 +20,7 @@ echo '<br /><a href="' . $RootPath . '/ImportBankTrans.php">' . _('Import Bank Transactions') . '</a>'; include('includes/footer.inc'); exit; - /*It all stops here if there aint no bank transactions being imported i.e. $_SESSION['Trans'] has not been initiated + /*It all stops here if there aint no bank transactions being imported i.e. $_SESSION['Trans'] has not been initiated * */ } @@ -76,7 +76,7 @@ if (!is_numeric($_POST['Amount'])){ prnMsg( _('The amount entered is not numeric') . '. ' . _('This line cannot be added to the transaction'),'error'); $InputError = True; - } + } } if ($InputError == False){ @@ -132,11 +132,11 @@ echo '<tr> <td>' . _('Payment to Supplier Account') . ':</td> <td><select name="SupplierID" onChange="ReloadForm(form1.Update)">'; - - $result = DB_query("SELECT supplierid, - suppname - FROM suppliers - WHERE currcode='" . $_SESSION['Statement']->CurrCode . "' + + $result = DB_query("SELECT supplierid, + suppname + FROM suppliers + WHERE currcode='" . $_SESSION['Statement']->CurrCode . "' ORDER BY suppname",$db); if ($_SESSION['Trans'][$TransID]->SupplierID ==''){ echo '<option selected value="">' . _('GL Payment') . '</option>'; @@ -157,16 +157,16 @@ $AllowGLAnalysis = true; } else { $AllowGLAnalysis = false; - } + } echo '</table>'; } else { //its a receipt echo '<tr> <td>' . _('Receipt to Customer Account') . ':</td> <td><select name="DebtorNo" onChange="ReloadForm(form1.Update)">'; - - $result = DB_query("SELECT debtorno, - name - FROM debtorsmaster + + $result = DB_query("SELECT debtorno, + name + FROM debtorsmaster WHERE currcode='" . $_SESSION['Statement']->CurrCode . "' ORDER BY name",$db); if ($_SESSION['Trans'][$TransID]->DebtorNo ==''){ @@ -188,7 +188,7 @@ $AllowGLAnalysis = true; } else { $AllowGLAnalysis = false; - } + } echo '</table>'; } @@ -198,23 +198,22 @@ $_SESSION['Trans'][$TransID]->Remove_GLEntry($GLAnalysisLine->ID); } } else { /*Allow GL Analysis == true */ - echo '</p><table cellpadding="2" class="selection">'; - $TableHeader = '<tr> - <th colspan="5">' . _('General ledger Analysis') . '</th> - </tr> - <tr> - <th class="ascending">' . _('Account') . '</th> - <th class="ascending">' . _('Name') . '</th> - <th class="ascending">' . _('Amount') . '<br />' . _('in') . ' ' . $_SESSION['Statement']->CurrCode . '</th> - <th>' . _('Narrative') . '</th> - <th class="ascending">' . _('Tag') . '</th> - </tr>'; - echo $TableHeader; + echo '</p><table cellpadding="2" class="selection"> + <tr> + <th colspan="5">' . _('General ledger Analysis') . '</th> + </tr> + <tr> + <th class="ascending">' . _('Account') . '</th> + <th class="ascending">' . _('Name') . '</th> + <th class="ascending">' . _('Amount') . '<br />' . _('in') . ' ' . $_SESSION['Statement']->CurrCode . '</th> + <th>' . _('Narrative') . '</th> + <th class="ascending">' . _('Tag') . '</th> + </tr>'; $TotalGLValue=0; $i=0; - + foreach ( $_SESSION['Trans'][$TransID]->GLEntries AS $EnteredGLCode){ - + echo '<tr> <td>' . $EnteredGLCode->GLCode . '</td> <td>' . $EnteredGLCode->GLAccountName . '</td> @@ -224,16 +223,10 @@ <td><a href="' . $_SERVER['PHP_SELF'] . '?Edit=' . $EnteredGLCode->ID . '&TransID=' . $TransID . '">' . _('Edit') . '</a></td> <td><a href="' . $_SERVER['PHP_SELF'] . '?Delete=' . $EnteredGLCode->ID . '&TransID=' . $TransID . '">' . _('Delete') . '</a></td> </tr>'; - + $TotalGLValue += $EnteredGLCode->Amount; - - $i++; - if ($i>15){ - $i = 0; - echo $TableHeader; - } } - + echo '<tr> <td colspan="2" class="number">' . _('Total of GL Entries') . ':</td> <td class="number">' . locale_number_format($TotalGLValue,$_SESSION['Statement']->CurrDecimalPlaces) . '</td> @@ -243,7 +236,7 @@ <td class="number">' . locale_number_format($_SESSION['Trans'][$TransID]->Amount,$_SESSION['Statement']->CurrDecimalPlaces) . '</td> </tr> <tr>'; - + if (($_SESSION['Trans'][$TransID]->Amount - $TotalGLValue)!=0) { echo '<td colspan="2" class="number">' . _('Yet To Enter') . ':</font></td> <td class="number"><font size="4" color="red">' . locale_number_format($_SESSION['Trans'][$TransID]->Amount-$TotalGLValue,$_SESSION['Statement']->CurrDecimalPlaces) . '</td>'; @@ -261,12 +254,12 @@ } echo '<tr> <td>' . _('Account Code') . ':</td> - <td><input type="text" name="GLCode" size="12" required="required" maxlength="11" value="' . $_POST['GLCode'] . '"></td> + <td><input type="text" name="GLCode" size="12" maxlength="11" value="' . $_POST['GLCode'] . '"></td> </tr>'; echo '<tr> <td>' . _('Account Selection') . ':<br />(' . _('If you know the code enter it above') . '<br />' . _('otherwise select the account from the list') . ')</td> <td><select name="AcctSelection">'; - + $result = DB_query("SELECT accountcode, accountname FROM chartmaster ORDER BY accountcode", $db); echo '<option value=""></option>'; while ($myrow = DB_fetch_array($result)) { @@ -277,7 +270,7 @@ } echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . $myrow['accountname'] . '</option>'; } - + echo '</select> </td> </tr>'; @@ -288,7 +281,7 @@ <td>' . _('Amount') . ':</td> <td><input type="text" class="number" name="Amount" required="required" size="12" maxlength="11" value="' . locale_number_format($_POST['Amount'],$_SESSION['Statement']->CurrDecimalPlaces) . '"></td> </tr>'; - + if (!isset($_POST['Narrative'])) { $_POST['Narrative']=''; } @@ -296,16 +289,16 @@ <td>' . _('Narrative') . ':</td> <td><textarea name="Narrative" cols=40 rows=2>' . $_POST['Narrative'] . '</textarea></td> </tr>'; - + //Select the tag echo '<tr><td>' . _('Tag') . '</td> <td><select name="GLTag">'; - + $SQL = "SELECT tagref, tagdescription FROM tags ORDER BY tagref"; - + $result=DB_query($SQL,$db); echo '<option value="0">0 - ' . _('None') . '</option>'; while ($myrow=DB_fetch_array($result)){ Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2014-09-14 00:39:55 UTC (rev 6885) +++ trunk/doc/Change.log 2014-09-14 02:51:55 UTC (rev 6886) @@ -1,7 +1,8 @@ webERP Change Log +13/9/14 Phil: Added new MT940 - SCB - Siam Comercial Bank Thailand style - a bit different to ING's style. Modifications to BankAccounts.php to allow the transaction file format for imports. ImportBankTrans.php must now select the bank account to determine the file import format to use. It now uses an include for the file parsing so other formats can easily be accomodated with a new include. 11/09/14 RChacon: Adds gettext() to line 402 of CustomerAllocations.php. Reported by Harald. 11/09/14 Exson: Code tidy up to make it meet coding guidance in CustomerInquiry.php. -11/09/14: Exson: Fixed the prnMsg bug in CustomerReceipt.php and add an inquiry link in it and make a status selectable in Customer inquiry and removed those rowstring definition which caused printf parameters missing. +11/09/14: Exson: Fixed the prnMsg bug in CustomerReceipt.php and add an inquiry link in it and make a status selectable in Customer inquiry and removed those rowstring definition which caused printf parameters missing. 31/8/14 RChacon: In general: Replaces code to determine background colour with TableRows(). Adds comments to ManualNewScripts.html. Fixes manual.css format. In GLTransInquiry.php: Adds $ViewTopic and $BookMark and sorts columns, and minor improvements. Minor translation improvements. 31/8/14 RChacon: Standardizes page_title_text to main-menu-option, standardizes bottom tax-menu, adds $ViewTopic and $BookMark, completes table header columns, formats data columns in Tax* scripts. 30/8/14 RChacon: In TaxAuthorities.php, adds $ViewTopic and $BookMark, completes table headings, formats number columns to fix sort order, and minor improvements. Modified: trunk/doc/Manual/ManualTax.html =================================================================== --- trunk/doc/Manual/ManualTax.html 2014-09-14 00:39:55 UTC (rev 6885) +++ trunk/doc/Manual/ManualTax.html 2014-09-14 02:51:55 UTC (rev 6886) @@ -63,15 +63,15 @@ <h2><a id="TaxCategories">Tax Category Maintenance</a></h2> -<p>In this script, you can enter, edit or delete a tax category name.</p> +<p>In this script, you can enter, edit or delete a tax category name. A tax category is required for each category of items that attracts different rates of tax because in some authorities childrens clothing and basic food items are not subject to tax. Similarly luxury items might attract higher rates of tax.</p> <p>You can enter any tax category name. But there are three special tax category names:</p> <ul> -<li><b>Exempt</b>. "<i>Exempt</i>" written in British English (en-GB). This tax category name is translated to other languages, if translated term is available. You can edit and you can delete this category.</li> +<li><b>Exempt</b>. "<i>Exempt</i>" written in British English (en-GB). This tax category name is translated to other languages, if translated term is available. You can edit and you can delete this category. Items that are defined with this tax category would normally attract no tax - so the rates for the authority/tax category combination would normally be zero.</li> -<li><b>Freight</b>. "<i>Freight</i>" written in British English (en-GB). This tax category name is translated to other languages, if translated term is available. You can NOT edit nor you can NOT delete this category, because it is used in several scripts.</li> +<li><b>Freight</b>. "<i>Freight</i>" written in British English (en-GB). This tax category name is translated to other languages, if translated term is available. You can NOT edit nor you can NOT delete this category, because it is used in several scripts. The Freight tax category specifies the tax rate from the tax authorities/tax category combination for the order freight value. This is hard coded in webERP so it cannot be deleted and must be present</li> <li><b>Handling</b>. "<i>Handling</i>" written in British English (en-GB). This tax category name is translated to other languages, if translated term is available. You can edit and you can delete this category.</li> Added: trunk/includes/ImportBankTrans_MT940_ING.php =================================================================== --- trunk/includes/ImportBankTrans_MT940_ING.php (rev 0) +++ trunk/includes/ImportBankTrans_MT940_ING.php 2014-09-14 02:51:55 UTC (rev 6886) @@ -0,0 +1,89 @@ +<?php +/* MT940 per ING Bank Netherlands */ + +if (substr($LineText,0,4)==':20:'){ //Timestamp of report MT940 generation + $_SESSION['Statement']->ReportCreated = substr($LineText,4); //in format DDDHHMM where DDD is the number of day in year and HHMM is the time + $TransactionLine = false; + } + if (substr($LineText,0,4)==':25:'){//The account number in IBAN format + $_SESSION['Statement']->AccountNumber = trim(substr($LineText,4)); + $TransactionLine = false; + } + if (substr($LineText,0,5)==':28C:'){//The statement number + $_SESSION['Statement']->StatementNumber = trim(substr($LineText,5)); + $TransactionLine = false; + } + if (substr($LineText,0,6)==':NS:22'){//The account owner name + $_SESSION['Statement']->AccountOwner = trim(substr($LineText,6)); + $TransactionLine = false; + } + if (substr($LineText,0,6)==':NS:23'){//The account name + $_SESSION['Statement']->AccountName = trim(substr($LineText,6)); + $TransactionLine = false; + } + if (substr($LineText,0,5)==':60F:'){//The account opening balance + $DebitOrCredit = substr($LineText,5,1); //D or C + $_SESSION['Statement']->OpeningDate = ConvertSQLDate('20' . substr($LineText,6,2) . '-' . substr($LineText,8,2) . '-' . substr($LineText,10,2)); + $_SESSION['Statement']->CurrCode = substr($LineText,12,3); + if ($DebitOrCredit =='D'){ + $_SESSION['Statement']->OpeningBalance = doubleval(str_replace(',','.',substr($LineText,15))); + } else { + $_SESSION['Statement']->OpeningBalance = doubleval('-' . str_replace(',','.',substr($LineText,15))); + } + $TransactionLine = false; + } + if (substr($LineText,0,4)==':61:'){//It's a transaction line + $TransactionLine = true; + $TransDate = ConvertSQLDate('20' . substr($LineText,4,2) . '-' . substr($LineText,6,2) . '-' . substr($LineText,8,2)); + $DebitOrCredit = substr($LineText,10,1); //D or C or R + if ($DebitOrCredit =='R'){ //then it is a 2 character reversal + if (substr($LineText,10,2)=='RC'){ + $DebitOrCredit ='D'; + } else { + $DebitOrCredit ='C'; + } + if ($DebitOrCredit =='D'){ + $TransAmount = doubleval(str_replace(',','.',substr($LineText,12,-10))); + } else { + $TransAmount = doubleval('-' . str_replace(',','.',substr($LineText,12,-10))); + } + } else { // it will be either D or C + //check for a B - no idea why but can be a B after the D or C for some reason in which case the amount starts a character after + if (substr($LineText,11,1)=='B'){ + $ValueStart = 12; + } else { + $ValueStart = 11; + } + if ($DebitOrCredit =='D'){ + $TransAmount = doubleval(str_replace(',','.',substr($LineText,$ValueStart,-10))); + } else { + $TransAmount = doubleval('-' . str_replace(',','.',substr($LineText,$ValueStart,-10))); + } + } + $i++; + $_SESSION['Trans'][$i] = new BankTrans($TransDate,$TransAmount) ; + } + if (substr($LineText,0,4)==':86:'){ + if ($TransactionLine) { + $_SESSION['Trans'][$i]->Code = substr($LineText,4,3); + $_SESSION['Trans'][$i]->Description = substr($LineText,7); + } + } + + if (substr($LineText,0,1)!=':' AND $TransactionLine){ + //then it is the continuation of an :86: line + $_SESSION['Trans'][$i]->Description .= $LineText; + } + + if (substr($LineText,0,5)==':62F:'){ + $DebitOrCredit = substr($LineText,5,1); //D or C + $_SESSION['Statement']->ClosingDate = ConvertSQLDate('20' . substr($LineText,6,2) . '-' . substr($LineText,8,2) . '-' . substr($LineText,10,2)); + $CurrCode = substr($LineText,12,3); + if ($DebitOrCredit =='D'){ + $_SESSION['Statement']->ClosingBalance = doubleval(str_replace(',','.',substr($LineText,15))); + } else { + $_SESSION['Statement']->ClosingBalance = doubleval('-' . str_replace(',','.',substr($LineText,15))); + } + $TransactionLine = false; + } +?> \ No newline at end of file Added: trunk/includes/ImportBankTrans_MT940_SCB.php =================================================================== --- trunk/includes/ImportBankTrans_MT940_SCB.php (rev 0) +++ trunk/includes/ImportBankTrans_MT940_SCB.php 2014-09-14 02:51:55 UTC (rev 6886) @@ -0,0 +1,102 @@ +<?php +/* MT940 per SCB - Siam Comercial Bank Thailand */ + +if (substr($LineText,0,4)==':20:'){ //Timestamp of report MT940 generation + $_SESSION['Statement']->ReportCreated = substr($LineText,4); //in format DDDHHMM where DDD is the number of day in year and HHMM is the time + $TransactionLine = false; + } + if (substr($LineText,0,4)==':25:'){//The account number in IBAN format + $_SESSION['Statement']->AccountNumber = trim(substr($LineText,4)); + $TransactionLine = false; + } + if (substr($LineText,0,5)==':28C:'){//The statement number + $_SESSION['Statement']->StatementNumber = trim(substr($LineText,5)); + $TransactionLine = false; + } + if (substr($LineText,0,6)==':NS:22'){//The account owner name + $_SESSION['Statement']->AccountOwner = trim(substr($LineText,6)); + $TransactionLine = false; + } + if (substr($LineText,0,6)==':NS:23'){//The account name + $_SESSION['Statement']->AccountName = trim(substr($LineText,6)); + $TransactionLine = false; + } + if (substr($LineText,0,5)==':60F:'){//The account opening balance + $DebitOrCredit = substr($LineText,5,1); //D or C + $_SESSION['Statement']->OpeningDate = ConvertSQLDate('20' . substr($LineText,6,2) . '-' . substr($LineText,8,2) . '-' . substr($LineText,10,2)); + $_SESSION['Statement']->CurrCode = substr($LineText,12,3); + if (!array_key_exists($_SESSION['Statement']->CurrCode,$CurrencyName)){ + prnMsg(_('The bank statement currency is a currency not defined in the system. Please see you system administrator'),'warn'); + prnMsg(_('The MT940 bank statement file cannot be imported and processed'),'error'); + include('includes/footer.inc'); + exit; + $ReadTheFile ='No'; + } + if ($DebitOrCredit =='D'){ + $_SESSION['Statement']->OpeningBalance = doubleval(str_replace(',','.',substr($LineText,15))); + } else { + $_SESSION['Statement']->OpeningBalance = doubleval('-' . str_replace(',','.',substr($LineText,15))); + } + $TransactionLine = false; + } + if (substr($LineText,0,4)==':61:'){//It's a transaction line + $TransactionLine = true; + $TransDate = ConvertSQLDate('20' . substr($LineText,4,2) . '-' . substr($LineText,6,2) . '-' . substr($LineText,8,2)); + //this format repeats the date from characters 10-14 + $DebitOrCredit = substr($LineText,14,1); //D or C or R + if ($DebitOrCredit =='R'){ //then it is a 2 character reversal + if (substr($LineText,14,2)=='RC'){ + $DebitOrCredit ='D'; + } else { + $DebitOrCredit ='C'; + } + //Need to find end of value amount - find the , decimal point + 2 characters + $ValueEnd = strpos($LineText, ',', 12)+2; + if ($DebitOrCredit =='D'){ + $TransAmount = doubleval(str_replace(',','.',substr($LineText,12,$ValueEnd))); + } else { + $TransAmount = doubleval('-' . str_replace(',','.',substr($LineText,12,$ValueEnd))); + } + } else { // it will be either D or C + if (!is_numeric(substr($LineText,15,1)) ){ + //check for a B - no idea why but can be a B after the D or C for some reason in which case the amount starts a character after + $ValueStart = 16; + } else { + $ValueStart = 15; + } + //Need to find end of value amount - find the , decimal point + 2 characters + $ValueEnd = strpos($LineText, ',', $ValueStart)+2; + if ($DebitOrCredit =='D'){ + $TransAmount = doubleval(str_replace(',','.',substr($LineText,$ValueStart,$ValueEnd))); + } else { + $TransAmount = doubleval('-' . str_replace(',','.',substr($LineText,$ValueStart,$ValueEnd))); + } + } + + $i++; + $_SESSION['Trans'][$i] = new BankTrans($TransDate,$TransAmount) ; + $_SESSION['Trans'][$i]->Description = substr($LineText,$ValueEnd+1); + } + if (substr($LineText,0,4)==':86:'){ + if ($TransactionLine) { + $_SESSION['Trans'][$i]->Description .= ' ' . substr($LineText,4); + } + } + + if (substr($LineText,0,1)!=':' AND $TransactionLine){ + //then it is the continuation of an :86: line + $_SESSION['Trans'][$i]->Description .= $LineText; + } + + if (substr($LineText,0,5)==':62F:'){ + $DebitOrCredit = substr($LineText,5,1); //D or C + $_SESSION['Statement']->ClosingDate = ConvertSQLDate('20' . substr($LineText,6,2) . '-' . substr($LineText,8,2) . '-' . substr($LineText,10,2)); + $CurrCode = substr($LineText,12,3); + if ($DebitOrCredit =='D'){ + $_SESSION['Statement']->ClosingBalance = doubleval(str_replace(',','.',substr($LineText,15))); + } else { + $_SESSION['Statement']->ClosingBalance = doubleval('-' . str_replace(',','.',substr($LineText,15))); + } + $TransactionLine = false; + } +?> \ No newline at end of file Modified: trunk/sql/mysql/upgrade4.11-4.12.sql =================================================================== --- trunk/sql/mysql/upgrade4.11-4.12.sql 2014-09-14 00:39:55 UTC (rev 6885) +++ trunk/sql/mysql/upgrade4.11-4.12.sql 2014-09-14 02:51:55 UTC (rev 6886) @@ -81,6 +81,7 @@ INSERT INTO `scripts` ( `script` , `pagesecurity` , `description` ) VALUES ('PrintWOItemSlip.php', '4', 'PDF WO Item production Slip '); ALTER TABLE `locations` ADD `usedforwo` TINYINT( 4 ) NOT NULL DEFAULT '1' AFTER `internalrequest`; +ALTER TABLE `bankaccounts` ADD `importformat` VARCHAR( 10 ) NOT NULL DEFAULT ''; UPDATE config SET confvalue='4.12' WHERE confname='VersionNumber'; |
From: <dai...@us...> - 2014-09-17 08:32:47
|
Revision: 6893 http://sourceforge.net/p/web-erp/reponame/6893 Author: daintree Date: 2014-09-17 08:32:43 +0000 (Wed, 17 Sep 2014) Log Message: ----------- Import GIFTS format bank transactions Modified Paths: -------------- trunk/BankAccounts.php trunk/ImportBankTrans.php trunk/doc/Change.log trunk/includes/session.inc Added Paths: ----------- trunk/includes/ImportBankTrans_GIFTS.php Modified: trunk/BankAccounts.php =================================================================== --- trunk/BankAccounts.php 2014-09-16 07:27:40 UTC (rev 6892) +++ trunk/BankAccounts.php 2014-09-17 08:32:43 UTC (rev 6893) @@ -367,6 +367,7 @@ <option ' . ($_POST['ImportFormat']=='' ? 'selected="selected"' : '') . ' value="">' . _('N/A') . '</option> <option ' . ($_POST['ImportFormat']=='MT940-SCB' ? 'selected="selected"' : '') . ' value="MT940-SCB">' . _('MT940 - Siam Comercial Bank Thailand') . '</option> <option ' . ($_POST['ImportFormat']=='MT940-ING' ? 'selected="selected"' : '') . ' value="MT940-ING">' . _('MT940 - ING Bank Netherlands') . '</option> + <option ' . ($_POST['ImportFormat']=='GIFTS' ? 'selected="selected"' : '') . ' value="GIFTS">' . _('GIFTS - Bank of New Zealand') . '</option> </select> </td> </tr> Modified: trunk/ImportBankTrans.php =================================================================== --- trunk/ImportBankTrans.php 2014-09-16 07:27:40 UTC (rev 6892) +++ trunk/ImportBankTrans.php 2014-09-17 08:32:43 UTC (rev 6893) @@ -89,10 +89,17 @@ break; case 'MT940-ING': //for ING Bank Netherlands include('includes/ImportBankTrans_MT940_ING.php'); + break; + case 'GIFTS': //GIFTS for Bank of New Zealand + include('includes/ImportBankTrans_GIFTS.php'); + break; } } /*end while get next line of message */ + if (!isset($_SESSION['Statement']->CurrCode)){ + $_SESSION['Statement']->CurrCode = $_SESSION['CompanyRecord']['currencydefault']; + } /* Look to match up the account for which transactions are being imported with a bank account in webERP */ $sql = "SELECT accountcode, bankaccountname, @@ -473,6 +480,9 @@ if (isset($_SESSION['Statement'])){ + //print_r($_SESSION['Statement']); + + echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post" >'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; if (!isset($_SESSION['Statement']->BankGLAccount)){ Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2014-09-16 07:27:40 UTC (rev 6892) +++ trunk/doc/Change.log 2014-09-17 08:32:43 UTC (rev 6893) @@ -1,5 +1,9 @@ webERP Change Log -15/09/14 Exson: fixed the date format errors in WorkOrderEntry.php. + + +17/9/14 Phil: Moved the audit log purge to occur if DB_Maintenance is set to run +16/9/14 Phil: Added BNZ GIFTS format for bank account transaction imports +15/09/14 Exson: fixed the date format errors in WorkOrderEntry.php. 13/9/14 Phil: Added new MT940 - SCB - Siam Comercial Bank Thailand style - a bit different to ING's style. Modifications to BankAccounts.php to allow the transaction file format for imports. ImportBankTrans.php must now select the bank account to determine the file import format to use. It now uses an include for the file parsing so other formats can easily be accomodated with a new include. 11/09/14 RChacon: Adds gettext() to line 402 of CustomerAllocations.php. Reported by Harald. 11/09/14 Exson: Code tidy up to make it meet coding guidance in CustomerInquiry.php. Added: trunk/includes/ImportBankTrans_GIFTS.php =================================================================== --- trunk/includes/ImportBankTrans_GIFTS.php (rev 0) +++ trunk/includes/ImportBankTrans_GIFTS.php 2014-09-17 08:32:43 UTC (rev 6893) @@ -0,0 +1,22 @@ +<?php +/* GIFTS format Bank of New Zealand */ +$LineText = mb_substr($LineText,0,-1); +$LineArray = explode(',',$LineText); +if ($LineArray[0] == 5) { //Opening balance + $_SESSION['Statement']->AccountNumber = trim($LineArray[2],'"'); + $_SESSION['Statement']->OpeningBalance = doubleval($LineArray[3]); + $_SESSION['Statement']->OpeningDate = trim($LineArray[10],'"'); + $_SESSION['Statement']->AccountName = trim($LineArray[9],'"'); +} +if ($LineArray[0] == 6) { //Closing balance + $_SESSION['Statement']->AccountNumber = trim($LineArray[2],'"'); + $_SESSION['Statement']->ClosingBalance = doubleval($LineArray[3]); + $_SESSION['Statement']->ClosingDate = trim($LineArray[10],'"'); +} +if ($LineArray[0] == 3) {//A Transaction Line + $i++; + $_SESSION['Trans'][$i] = new BankTrans(trim($LineArray[10],'"'),doubleval(-$LineArray[3])) ; + $_SESSION['Trans'][$i]->Description = trim($LineArray[12],'"') . '-' . trim($LineArray[6],'"') . ' ' . trim($LineArray[7],'"') . ' ' . trim($LineArray[8],'"') . ' ' . trim($LineArray[9],'"') . ' ' . trim($LineArray[11],'"') . ' ' . trim($LineArray[14],'"'); +} + +?> \ No newline at end of file Modified: trunk/includes/session.inc =================================================================== --- trunk/includes/session.inc 2014-09-16 07:27:40 UTC (rev 6892) +++ trunk/includes/session.inc 2014-09-17 08:32:43 UTC (rev 6893) @@ -140,6 +140,7 @@ if (strcmp($Version,$_SESSION['VersionNumber'])>0 AND (basename($_SERVER['SCRIPT_NAME'])!='UpgradeDatabase.php')) { header('Location: UpgradeDatabase.php'); } + if(isset($_SESSION['DB_Maintenance'])){ if ($_SESSION['DB_Maintenance']>0) { //run the DB maintenance script if (DateDiff(Date($_SESSION['DefaultDateFormat']), @@ -149,19 +150,22 @@ /*Do the DB maintenance routing for the DB_type selected */ DB_Maintenance($db); $_SESSION['DB_Maintenance_LastRun'] = Date('Y-m-d'); + + /* Audit trail purge only runs if DB_Maintenance is enabled */ + if (isset($_SESSION['MonthsAuditTrail'])){ + $sql = "DELETE FROM audittrail + WHERE transactiondate <= '" . Date('Y-m-d', mktime(0,0,0, Date('m')-$_SESSION['MonthsAuditTrail'])) . "'"; + $ErrMsg = _('There was a problem deleting expired audit-trail history'); + $result = DB_query($sql,$db); + } } } } -//purge the audit trail if necessary -if (isset($_SESSION['MonthsAuditTrail'])){ - $sql = "DELETE FROM audittrail - WHERE transactiondate <= '" . Date('Y-m-d', mktime(0,0,0, Date('m')-$_SESSION['MonthsAuditTrail'])) . "'"; - $ErrMsg = _('There was a problem deleting expired audit-trail history'); - $result = DB_query($sql,$db); -} + /*Check to see if currency rates need to be updated */ if (isset($_SESSION['UpdateCurrencyRatesDaily'])){ if ($_SESSION['UpdateCurrencyRatesDaily']!=0) { + /* Only run the update to currency rates if today is after the last update i.e. only runs once a day */ if (DateDiff(Date($_SESSION['DefaultDateFormat']), ConvertSQLDate($_SESSION['UpdateCurrencyRatesDaily']),'d')> 0){ |
From: <rc...@us...> - 2014-09-19 19:27:08
|
Revision: 6894 http://sourceforge.net/p/web-erp/reponame/6894 Author: rchacon Date: 2014-09-19 19:27:05 +0000 (Fri, 19 Sep 2014) Log Message: ----------- Add ascending class to PaymentMethods.php to have sortable columns. Modified Paths: -------------- trunk/PaymentMethods.php trunk/doc/Change.log Modified: trunk/PaymentMethods.php =================================================================== --- trunk/PaymentMethods.php 2014-09-17 08:32:43 UTC (rev 6893) +++ trunk/PaymentMethods.php 2014-09-19 19:27:05 UTC (rev 6894) @@ -1,11 +1,12 @@ <?php - /* $Id$*/ include('includes/session.inc'); - $Title = _('Payment Methods'); - +/* Manual links before header.inc */ +/* RChacon: This is a topic to create. +$ViewTopic = 'ARTransactions';// Filename in ManualContents.php's TOC. +$BookMark = 'PaymentMethods';// Anchor's id in the manual's html document.*/ include('includes/header.inc'); echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('Payments') . @@ -182,11 +183,12 @@ echo '<table class="selection"> <tr> - <th>' . _('Payment Method') . '</th> - <th>' . _('Use For Payments') . '</th> - <th>' . _('Use For Receipts') . '</th> - <th>' . _('Use Pre-printed Stationery') . '</th> - <th>' . _('Open POS Cash Drawer for Sale') . '</th> + <th class="ascending">' . _('Payment Method') . '</th> + <th class="ascending">' . _('Use For Payments') . '</th> + <th class="ascending">' . _('Use For Receipts') . '</th> + <th class="ascending">' . _('Use Pre-printed Stationery') . '</th> + <th class="ascending">' . _('Open POS Cash Drawer for Sale') . '</th> + <th colspan="2"> </th> </tr>'; $k=0; //row colour counter Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2014-09-17 08:32:43 UTC (rev 6893) +++ trunk/doc/Change.log 2014-09-19 19:27:05 UTC (rev 6894) @@ -1,6 +1,6 @@ webERP Change Log - +11/09/14 RChacon: Add ascending class to PaymentMethods.php to have sortable columns. 17/9/14 Phil: Moved the audit log purge to occur if DB_Maintenance is set to run 16/9/14 Phil: Added BNZ GIFTS format for bank account transaction imports 15/09/14 Exson: fixed the date format errors in WorkOrderEntry.php. |
From: <dai...@us...> - 2014-09-19 20:25:11
|
Revision: 6895 http://sourceforge.net/p/web-erp/reponame/6895 Author: daintree Date: 2014-09-19 20:25:01 +0000 (Fri, 19 Sep 2014) Log Message: ----------- Amendments to CustomerInquiry Tim, StockStatus Bob Thomas Modified Paths: -------------- trunk/CustomerInquiry.php trunk/StockStatus.php trunk/doc/Change.log Modified: trunk/CustomerInquiry.php =================================================================== --- trunk/CustomerInquiry.php 2014-09-19 19:27:05 UTC (rev 6894) +++ trunk/CustomerInquiry.php 2014-09-19 20:25:01 UTC (rev 6895) @@ -1,51 +1,43 @@ <?php -/* $Id$*/ - -include('includes/SQL_CommonFunctions.inc'); - include('includes/session.inc'); $Title = _('Customer Inquiry'); - -$ViewTopic = 'ARInquiries'; -$BookMark = 'CustomerInquiry'; - +/* Manual links before header.inc */ +$ViewTopic = 'ARInquiries'; // Filename in ManualContents.php's TOC. +$BookMark = 'CustomerInquiry'; // Anchor's id in the manual's html document. include('includes/header.inc'); // always figure out the SQL required from the inputs available -if(!isset($_GET['CustomerID']) AND !isset($_SESSION['CustomerID'])) { - prnMsg(_('To display the enquiry a customer must first be selected from the customer selection screen'),'info'); - echo '<br /><div class="centre"><a href="'. $RootPath . '/SelectCustomer.php?' . SID . '">' . _('Select a Customer to Inquire On') . '</a><br /></div>'; +if (!isset($_GET['CustomerID']) and !isset($_SESSION['CustomerID'])) { + prnMsg(_('To display the enquiry a customer must first be selected from the customer selection screen'), 'info'); + echo '<br /><div class="centre"><a href="', $RootPath, '/SelectCustomer.php">', _('Select a Customer to Inquire On'), '</a></div>'; include('includes/footer.inc'); exit; } else { if (isset($_GET['CustomerID'])) { - $_SESSION['CustomerID'] = $_GET['CustomerID']; + $_SESSION['CustomerID'] = stripslashes($_GET['CustomerID']); } $CustomerID = $_SESSION['CustomerID']; } -if(isset($_GET['Status'])){ - if(is_numeric($_GET['Status'])){ + +if (isset($_GET['Status'])) { + if (is_numeric($_GET['Status'])) { $_POST['Status'] = $_GET['Status']; } -} -if(isset($_POST['Status'])){ - if($_POST['Status']=='' OR $_POST['Status']==1 OR $_POST['Status']==0){ +} elseif (isset($_POST['Status'])) { + if($_POST['Status'] == '' or $_POST['Status'] == 1 or $_POST['Status'] == 0) { $Status = $_POST['Status']; - }else{ - prnMsg(_('The balance status should be all or zero balance or not zero balance'),'error'); + } else { + prnMsg(_('The balance status should be all or zero balance or not zero balance'), 'error'); exit; } +} else { + $_POST['Status'] = ''; } + if (!isset($_POST['TransAfterDate'])) { - $sql = "SELECT confvalue - FROM `config` - WHERE confname ='NumberOfMonthMustBeShown'"; - $ErrMsg=_('The config value NumberOfMonthMustBeShown cannot be retrieved'); - $result = DB_query($sql,$db,$ErrMsg); - $row = DB_fetch_array($result); - $_POST['TransAfterDate'] = Date($_SESSION['DefaultDateFormat'],Mktime(0,0,0,Date('m')-$row['confvalue'],Date('d'),Date('Y'))); + $_POST['TransAfterDate'] = Date($_SESSION['DefaultDateFormat'], Mktime(0, 0, 0, Date('m') - $_SESSION['NumberOfMonthMustBeShown'], Date('d'), Date('Y'))); } $SQL = "SELECT debtorsmaster.name, @@ -55,8 +47,7 @@ debtorsmaster.creditlimit, holdreasons.dissallowinvoices, holdreasons.reasondescription, - SUM(debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount -- debtortrans.alloc) AS balance, + 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 @@ -65,11 +56,10 @@ 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'] . ") + 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(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, @@ -77,18 +67,18 @@ 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(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, - paymentterms, - holdreasons, - currencies, - debtortrans + paymentterms, + holdreasons, + currencies, + debtortrans WHERE debtorsmaster.paymentterms = paymentterms.termsindicator - AND debtorsmaster.currcode = currencies.currabrev - AND debtorsmaster.holdreason = holdreasons.reasoncode - AND debtorsmaster.debtorno = '" . $CustomerID . "' - AND debtorsmaster.debtorno = debtortrans.debtorno"; + AND debtorsmaster.currcode = currencies.currabrev + AND debtorsmaster.holdreason = holdreasons.reasoncode + AND debtorsmaster.debtorno = '" . $CustomerID . "' + AND debtorsmaster.debtorno = debtortrans.debtorno"; if ($_SESSION['SalesmanLogin'] != '') { $SQL .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'"; @@ -104,9 +94,9 @@ holdreasons.reasondescription"; $ErrMsg = _('The customer details could not be retrieved by the SQL because'); -$CustomerResult = DB_query($SQL,$db,$ErrMsg); +$CustomerResult = DB_query($SQL, $ErrMsg); -if (DB_num_rows($CustomerResult)==0) { +if (DB_num_rows($CustomerResult) == 0) { /*Because there is no balance - so just retrieve the header information about the customer - the choice is do one query to get the balance and transactions for those customers who have a balance and two queries for those who don't have a balance OR always do two queries - I opted for the former */ @@ -122,14 +112,14 @@ holdreasons.reasondescription 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 currencies - ON debtorsmaster.currcode = currencies.currabrev WHERE debtorsmaster.debtorno = '" . $CustomerID . "'"; - $ErrMsg =_('The customer details could not be retrieved by the SQL because'); - $CustomerResult = DB_query($SQL,$db,$ErrMsg); + $ErrMsg = _('The customer details could not be retrieved by the SQL because'); + $CustomerResult = DB_query($SQL, $ErrMsg); } else { $NIL_BALANCE = False; @@ -137,77 +127,68 @@ $CustomerRecord = DB_fetch_array($CustomerResult); -if ($NIL_BALANCE==True) { - $CustomerRecord['balance']=0; - $CustomerRecord['due']=0; - $CustomerRecord['overdue1']=0; - $CustomerRecord['overdue2']=0; +if ($NIL_BALANCE == True) { + $CustomerRecord['balance'] = 0; + $CustomerRecord['due'] = 0; + $CustomerRecord['overdue1'] = 0; + $CustomerRecord['overdue2'] = 0; } -include('includes/CurrenciesArray.php'); // To get the currency name from the currency code. -echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/customer.png" title="' . _('Customer') . '" alt="" /> ' . - _('Customer') . ': ' . - $CustomerID . ' - ' . $CustomerRecord['name'] . '<br />' . - _('All amounts stated in') . ': ' . - $CustomerRecord['currency'] . '<br />' . // To be replaced by: -/* $CustomerRecord['currcode'] . ' - ' . $CurrencyName[$CustomerRecord['currcode']] . '<br />' . // <-- Replacement */ - _('Terms') . ': ' . - $CustomerRecord['terms'] . '<br />' . - _('Credit Limit') . ': ' . - locale_number_format($CustomerRecord['creditlimit'],0) . '<br />' . - _('Credit Status') . ': ' . - $CustomerRecord['reasondescription'] . '</p>'; -if ($CustomerRecord['dissallowinvoices']!=0) { - echo '<br /><font color="red" size="4"><b>' . _('ACCOUNT ON HOLD') . '</font></b><br />'; +echo '<div class="toplink"> + <a href="', $RootPath, '/SelectCustomer.php">', _('Back to Customer Screen'), '</a> + </div>'; + +echo '<p class="page_title_text"> + <img src="', $RootPath, '/css/', $Theme, '/images/customer.png" title="', _('Customer'), '" alt="" />', _('Customer'), ': ', stripslashes($CustomerID), ' - ', $CustomerRecord['name'], '<br />', _('All amounts stated in'), ': ', $CustomerRecord['currency'], '<br />', _('Terms'), ': ', $CustomerRecord['terms'], '<br />', _('Credit Limit'), ': ', locale_number_format($CustomerRecord['creditlimit'], 0), '<br />', _('Credit Status'), ': ', $CustomerRecord['reasondescription'], ' + </p>'; + +if ($CustomerRecord['dissallowinvoices'] != 0) { + echo '<br /><font color="red" size="4"><b>', _('ACCOUNT ON HOLD'), '</font></b><br />'; } echo '<table class="selection" width="70%"> <tr> - <th style="width:20%">' . _('Total Balance') . '</th> - <th style="width:20%">' . _('Current') . '</th> - <th style="width:20%">' . _('Now Due') . '</th> - <th style="width:20%">' . $_SESSION['PastDueDays1'] . '-' . $_SESSION['PastDueDays2'] . ' ' . _('Days Overdue') . '</th> - <th style="width:20%">' . _('Over') . ' ' . $_SESSION['PastDueDays2'] . ' ' . _('Days Overdue') . '</th></tr>'; + <th style="width:20%">', _('Total Balance'), '</th> + <th style="width:20%">', _('Current'), '</th> + <th style="width:20%">', _('Now Due'), '</th> + <th style="width:20%">', $_SESSION['PastDueDays1'], '-', $_SESSION['PastDueDays2'], ' ' . _('Days Overdue'), '</th> + <th style="width:20%">', _('Over'), ' ', $_SESSION['PastDueDays2'], ' ', _('Days Overdue'), '</th> + </tr>'; echo '<tr> - <td class="number">' . locale_number_format($CustomerRecord['balance'],$CustomerRecord['decimalplaces']) . '</td> - <td class="number">' . locale_number_format(($CustomerRecord['balance'] - $CustomerRecord['due']),$CustomerRecord['decimalplaces']) . '</td> - <td class="number">' . locale_number_format(($CustomerRecord['due']-$CustomerRecord['overdue1']),$CustomerRecord['decimalplaces']) . '</td> - <td class="number">' . locale_number_format(($CustomerRecord['overdue1']-$CustomerRecord['overdue2']) ,$CustomerRecord['decimalplaces']) . '</td> - <td class="number">' . locale_number_format($CustomerRecord['overdue2'],$CustomerRecord['decimalplaces']) . '</td> + <td class="number">', locale_number_format($CustomerRecord['balance'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format(($CustomerRecord['balance'] - $CustomerRecord['due']), $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format(($CustomerRecord['due'] - $CustomerRecord['overdue1']), $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format(($CustomerRecord['overdue1'] - $CustomerRecord['overdue2']), $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($CustomerRecord['overdue2'], $CustomerRecord['decimalplaces']), '</td> </tr> - </table>'; -if(!isset($_POST['Status'])){ - $_POST['Status'] = ''; +</table>'; + +echo '<form onSubmit="return VerifyForm(this);" action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post" class="noPrint"> + <input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />'; +echo _('Show all transactions after'), ':<input tabindex="1" type="text" required="required" class="date" alt="', $_SESSION['DefaultDateFormat'], '" id="datepicker" name="TransAfterDate" value="', $_POST['TransAfterDate'], '" minlength="0" maxlength="10" size="12" />'; + +echo '<select name="Status">'; +if ($_POST['Status'] == '') { + echo '<option value="" selected="selected">', _('All'), '</option>'; + echo '<option value="1">', _('Invoices not fully allocated'), '</option>'; + echo '<option value="0">', _('Invoices fully allocated'), '</option>'; +} else { + if ($_POST['Status'] == 0) { + echo '<option value="">', _('All'), '</option>'; + echo '<option value="1">', _('Invoices not fully allocated'), '</option>'; + echo '<option selected="selected" value="0">', _('Invoices fully allocated'), '</option>'; + } elseif ($_POST['Status'] == 1) { + echo '<option value="" selected="selected">', _('All'), '</option>'; + echo '<option selected="selected" value="1">', _('Invoices not fully allocated'), '</option>'; + echo '<option value="0">', _('Invoices fully allocated'), '</option>'; + } } -echo '<br /> - <div class="centre"> - <form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post"> - <div> - <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />' - . _('Show all transactions after') . ': <input tabindex="1" type="text" required="required" title="' . _('A date after which all transactions for the customer should be displayed must be entered') . '" class="date" alt="' .$_SESSION['DefaultDateFormat']. '" id="datepicker" name="TransAfterDate" value="' . $_POST['TransAfterDate'] . '" maxlength="10" size="12" /> - <select name="Status">'; - if($_POST['Status']==''){ - echo '<option value="" selected="selected">' . _('All') . '</option>'; - echo '<option value="1">' . _('Invoices not fully allocated') . '</option>'; - echo '<option value="0">' . _('Invoices fully allocated') . '</option>'; - }else{ - $Choice = ($_POST['Status']==1)?_('Invoices fully allocated'):_('Invoices not fully allocated'); - $ChoiceLeft = ($_POST['Status']==1)?_('Invoices not fully allocated'):_('Invoices fully allocated'); - echo '<option value="' . $_POST['Status'] . '" selected="selected">' . $Choice . '</option>'; - $StatusValue = ($_POST['Status']==1)?0:1; - echo '<option value="' . $StatusValue . '">' . $ChoiceLeft . '</option>'; - echo '<option value="">' . _('All') . '</option>'; +echo '</select>'; +echo '<input tabindex="3" type="submit" name="Refresh Inquiry" value="', _('Refresh Inquiry'), '" /> + </form>'; - } - -echo '</select><input tabindex="3" type="submit" name="Refresh Inquiry" value="' . _('Refresh Inquiry') . '" /> - </div> - </form> - </div> - <br />'; - $DateAfterCriteria = FormatDateForSQL($_POST['TransAfterDate']); $SQL = "SELECT systypes.typename, @@ -219,62 +200,58 @@ debtortrans.reference, debtortrans.invtext, debtortrans.order_, + salesorders.customerref, debtortrans.rate, (debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount) AS totalamount, - debtortrans.alloc AS allocated, - (debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc) as balance - FROM debtortrans INNER JOIN systypes - ON debtortrans.type = systypes.typeid - WHERE debtortrans.debtorno = '" . $CustomerID . "' - AND debtortrans.trandate >= '" . $DateAfterCriteria . "'"; + debtortrans.alloc AS allocated + FROM debtortrans + INNER JOIN systypes + ON debtortrans.type = systypes.typeid + LEFT JOIN salesorders + ON salesorders.orderno=debtortrans.order_ + WHERE debtortrans.debtorno = '" . $CustomerID . "' + AND debtortrans.trandate >= '" . $DateAfterCriteria . "'"; if ($_SESSION['SalesmanLogin'] != '') { $SQL .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'"; } -if (isset($Status) AND $Status != '') { - $SQL .= ($Status==1)?' having balance<=0.00001 ':' having balance>0.00001 '; -} - $SQL .= " ORDER BY debtortrans.id"; $ErrMsg = _('No transactions were returned by the SQL because'); -$TransResult = DB_query($SQL,$db,$ErrMsg); +$TransResult = DB_query($SQL, $ErrMsg); -if (DB_num_rows($TransResult)==0){ - echo '<div class="centre">' . _('There are no transactions to display since') . ' ' . $_POST['TransAfterDate'] . '</div>'; +if (DB_num_rows($TransResult) == 0) { + echo '<div class="centre">', _('There are no transactions to display since'), ' ', $_POST['TransAfterDate'], '</div>'; include('includes/footer.inc'); exit; } -/*show a table of the invoices returned by the SQL */ -echo '<table class="selection">'; +/* Show a table of the invoices returned by the SQL. */ -$tableheader = '<tr> - <th class="assending">' . _('Type') . '</th> - <th class="assending">' . _('Number') . '</th> - <th class="ascending">' . _('Date') . '</th> - <th>' . _('Branch') . '</th> - <th>' . _('Reference') . '</th> - <th>' . _('Comments') . '</th> - <th>' . _('Order') . '</th> - <th>' . _('Total') . '</th> - <th>' . _('Allocated') . '</th> - <th>' . _('Balance') . '</th> - <th>' . _('More Info') . '</th> - <th>' . _('More Info') . '</th> - <th>' . _('More Info') . '</th> - <th>' . _('More Info') . '</th> - <th>' . _('More Info') . '</th> - </tr>'; +echo '<table class="selection"> + <tr> + <th class="SortableColumn">', _('Type'), '</th> + <th class="SortableColumn">', _('Number'), '</th> + <th class="SortableColumn">', _('Date'), '</th> + <th>', _('Branch'), '</th> + <th class="SortableColumn">', _('Reference'), '</th> + <th>', _('Comments'), '</th> + <th>', _('Order'), '</th> + <th>', _('Total'), '</th> + <th>', _('Allocated'), '</th> + <th>', _('Balance'), '</th> + <th>', _('More Info'), '</th> + <th>', _('More Info'), '</th> + <th>', _('More Info'), '</th> + <th>', _('More Info'), '</th> + <th>', _('More Info'), '</th> + </tr>'; -echo $tableheader; +$k = 0; //row colour counter +while ($MyRow = DB_fetch_array($TransResult)) { -$j = 1; -$k = 0;//row colour counter -while ($myrow=DB_fetch_array($TransResult)) { - - if ($k==1) { + if ($k == 1) { echo '<tr class="EvenTableRows">'; $k = 0; } else { @@ -282,305 +259,371 @@ $k = 1; } - $FormatedTranDate = ConvertSQLDate($myrow['trandate']); + $FormatedTranDate = ConvertSQLDate($MyRow['trandate']); - if ($_SESSION['InvoicePortraitFormat']==1){ //Invoice/credits in portrait + if ($_SESSION['InvoicePortraitFormat'] == 1) { //Invoice/credits in portrait $PrintCustomerTransactionScript = 'PrintCustTransPortrait.php'; } else { //produce pdfs in landscape $PrintCustomerTransactionScript = 'PrintCustTrans.php'; } - $BaseFormatString = '<td>%s</td> - <td>%s</td> - <td>%s</td> - <td>%s</td> - <td>%s</td> - <td style="width:200px">%s</td> - <td>%s</td> - <td class="number">%s</td> - <td class="number">%s</td> - <td class="number">%s</td>'; + /* if the user is allowed to create credits for invoices */ + if (in_array($_SESSION['PageSecurityArray']['Credit_Invoice.php'], $_SESSION['AllowedPageSecurityTokens']) and $MyRow['type'] == 10) { + if ($_SESSION['CompanyRecord']['gllink_debtors'] == 1 and in_array($_SESSION['PageSecurityArray']['GLTransInquiry.php'], $_SESSION['AllowedPageSecurityTokens'])) { + /* Show transactions where: + * - Is invoice + * - User can raise credits + * - User can view GL transactions + */ + echo '<td>', _($MyRow['typename']), '</td> + <td>', $MyRow['transno'], '</td> + <td>', ConvertSQLDate($MyRow['trandate']), '</td> + <td>', $MyRow['branchcode'], '</td> + <td>', $MyRow['reference'], '</td> + <td style="width:200px">', $MyRow['invtext'], '</td> + <td>', $MyRow['order_'], '</td> + <td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['totalamount'] - $MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td> + <td> + <a href="', $RootPath, '/Credit_Invoice.php?InvoiceNumber=', $MyRow['transno'], '">', _('Credit '), ' + <img src="', $RootPath, '/css/', $Theme, '/images/credit.png" title="', _('Click to credit the invoice'), '" alt="" /> + </a> + </td> + <td> + <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('HTML '), ' + <img src="', $RootPath, '/css/', $Theme, '/images/preview.png" title="', _('Click to preview the invoice'), '" alt="" /> + </a> + </td> + <td> + <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice&PrintPDF=True">', _('PDF '), ' + <img src="', $RootPath, '/css/', $Theme, '/images/pdf.png" title="', _('Click for PDF'), '" alt="" /> + </a> + </td> + <td> + <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('Email '), ' + <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the invoice'), '" alt="" /> + </a> + </td> + <td> + <a href="', $RootPath, '/GLTransInquiry.php?TypeID=', $MyRow['type'], '&TransNo=', $MyRow['transno'], '">', _('View GL Entries'), ' + <img src="', $RootPath, '/css/', $Theme, '/images/gl.png" title="', _('View the GL Entries'), '" alt="" /> + </a> + </td> + </tr>'; + } else { + /* Show transactions where: + * - Is invoice + * - User can raise credits + * - User cannot view GL transactions + */ + echo '<td>', _($MyRow['typename']), '</td> + <td>', $MyRow['transno'], '</td> + <td>', ConvertSQLDate($MyRow['trandate']), '</td> + <td>', $MyRow['branchcode'], '</td> + <td>', $MyRow['reference'], '</td> + <td style="width:200px">', $MyRow['invtext'], '</td> + <td>', $MyRow['order_'], '</td> + <td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['totalamount'] - $MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td> + <td> + <a href="', $RootPath, '/Credit_Invoice.php?InvoiceNumber=', $MyRow['transno'], '">' . _('Credit ') . ' + <img src="', $RootPath, '/css/', $Theme, '/images/credit.png" title="', _('Click to credit the invoice'), '" alt="" /> + </a> + </td> + <td> + <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('HTML '), ' + <img src="', $RootPath, '/css/', $Theme, '/images/preview.png" title="', _('Click to preview the invoice'), '" alt="" /> + </a> + </td> + <td> + <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice&PrintPDF=True">', _('PDF '), ' + <img src="', $RootPath, '/css/', $Theme, '/images/pdf.png" title="', _('Click for PDF'), '" alt="" /> + </a> + </td> + <td> + <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('Email ') . ' + <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the invoice'), '" alt="" /> + </a> + </td> + <td></td> + </tr>'; - - $CreditInvoiceFormatString = '<td><a href="%s/Credit_Invoice.php?InvoiceNumber=%s">' . _('Credit ') . '<img src="%s/credit.gif" title="' . _('Click to credit the invoice') . '" alt="" /></a></td>'; - - $PreviewInvoiceFormatString = '<td><a href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Invoice">' . _('HTML ') . '<img src="%s/preview.gif" title="' . _('Click to preview the invoice') . '" alt="" /></a></td> - <td><a href="%s/%s?FromTransNo=%s&InvOrCredit=Invoice&PrintPDF=True">' . _('PDF ') . '<img src="%s/css/' . $Theme . '/images/pdf.png" title="' . _('Click for PDF') . '" alt="" /></a></td> - <td><a href="%s/EmailCustTrans.php?FromTransNo=%s&InvOrCredit=Invoice">' . _('Email ') . '<img src="%s/email.gif" title="' . _('Click to email the invoice') . '" alt="" /></a></td>'; - - $PreviewCreditFormatString = '<td><a href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Credit">' . _('HTML ') . ' <IMG SRC="%s/preview.gif" title="' . _('Click to preview the credit note') . '" /></a></td> - <td><a href="%s/%s?FromTransNo=%s&InvOrCredit=Credit&PrintPDF=True">' . _('PDF ') . '<img src="%s/css/' . $Theme . '/images/pdf.png" title="' . _('Click for PDF') . '" alt="" /></a></td> - <td><a href="%s/EmailCustTrans.php?FromTransNo=%s&InvOrCredit=Credit">' . _('Email') . ' <img src="%s/email.gif" title="' . _('Click to email the credit note') . '" alt="" /></a></td>'; - - /* assumed allowed page security token 3 allows the user to create credits for invoices */ - if (in_array(3,$_SESSION['AllowedPageSecurityTokens']) AND $myrow['type']==10){ - /*Show a link to allow an invoice to be credited */ - - /* assumed allowed page security token 8 allows the user to see GL transaction information */ - if ($_SESSION['CompanyRecord']['gllink_debtors']== 1 AND in_array(8,$_SESSION['AllowedPageSecurityTokens'])){ - - /* format string with GL inquiry options and for invoice to be credited */ - - printf($BaseFormatString . $CreditInvoiceFormatString . $PreviewInvoiceFormatString . - '<td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' - <img src="' .$RootPath. '/css/'.$Theme.'/images/gl.png" title="' . _('View the GL Entries') . '" alt="" /></a></td> - </tr>', - //$BaseFormatString parameters - $myrow['typename'], - $myrow['transno'], - ConvertSQLDate($myrow['trandate']), - $myrow['branchcode'], - $myrow['reference'], - $myrow['invtext'], - $myrow['order_'], - locale_number_format($myrow['totalamount'],$CustomerRecord['decimalplaces']), - locale_number_format($myrow['allocated'],$CustomerRecord['decimalplaces']), - locale_number_format($myrow['totalamount']-$myrow['allocated'],$CustomerRecord['decimalplaces']), - //$CreditInvoiceFormatString parameters - $RootPath, - $myrow['transno'], - $RootPath.'/css/'.$Theme.'/images', - //$PreviewInvoiceFormatString parameters - $RootPath, - $myrow['transno'], - $RootPath.'/css/'.$Theme.'/images', - $RootPath, - $PrintCustomerTransactionScript, - $myrow['transno'], - $RootPath, - $RootPath, - $myrow['transno'], - $RootPath.'/css/'.$Theme.'/images', - //Parameter for string for GL Trans Inquiries - $RootPath, - $myrow['type'], - $myrow['transno']); - } else { //user does not have privileges to see GL inquiry stuff - - printf($BaseFormatString . $CreditInvoiceFormatString . $PreviewInvoiceFormatString . '</tr>', - //BaseFormatString parameters - $myrow['typename'], - $myrow['transno'], - ConvertSQLDate($myrow['trandate']), - $myrow['branchcode'], - $myrow['reference'], - $myrow['invtext'], - $myrow['order_'], - locale_number_format($myrow['totalamount'],$CustomerRecord['decimalplaces']), - locale_number_format($myrow['allocated'],$CustomerRecord['decimalplaces']), - locale_number_format($myrow['totalamount']-$myrow['allocated'],$CustomerRecord['decimalplaces']), - //CreditInvoiceFormatString parameters - $RootPath, - $myrow['transno'], - $RootPath.'/css/'.$Theme.'/images', - //$PreviewInvoiceFormatString parameters - $RootPath, - $myrow['transno'], - $RootPath.'/css/'.$Theme.'/images', - $RootPath, - $PrintCustomerTransactionScript, - $myrow['transno'], - $RootPath, - $RootPath, - $myrow['transno'], - $RootPath.'/css/'.$Theme.'/images'); } - } elseif($myrow['type']==10) { /*its an invoice but not high enough priveliges to credit it */ + } elseif ($MyRow['type'] == 10) { + /* Show transactions where: + * - Is invoice + * - User cannot raise credits + * - User cannot view GL transactions + */ + echo '<td>', _($MyRow['typename']), '</td> + <td>', $MyRow['transno'], '</td> + <td>', ConvertSQLDate($MyRow['trandate']), '</td> + <td>', $MyRow['branchcode'], '</td> + <td>', $MyRow['reference'], '</td> + <td style="width:200px">', $MyRow['invtext'], '</td> + <td>', $MyRow['order_'], '</td> + <td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['totalamount'] - $MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td> + <td></td> + <td> + <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('HTML '), ' + <img src="', $RootPath, '/css/', $Theme, '/images/preview.png" title="', _('Click to preview the invoice'), '" alt="" /> + </a> + </td> + <td> + <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice&PrintPDF=True">' . _('PDF ') . ' + <img src="', $RootPath, '/css/', $Theme, '/images/pdf.png" title="', _('Click for PDF'), '" alt="" /> + </a> + </td> + <td> + <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('Email ') . ' + <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the invoice'), '" alt="" /> + </a> + </td> + <td></td> + </tr>'; - printf($BaseFormatString . - $PreviewInvoiceFormatString . - '</tr>', - //$BaseFormatString parameters - $myrow['typename'], - $myrow['transno'], - ConvertSQLDate($myrow['trandate']), - $myrow['branchcode'], - $myrow['reference'], - $myrow['invtext'], - $myrow['order_'], - locale_number_format($myrow['totalamount'],$CustomerRecord['decimalplaces']), - locale_number_format($myrow['allocated'],$CustomerRecord['decimalplaces']), - locale_number_format($myrow['totalamount']-$myrow['allocated'],$CustomerRecord['decimalplaces']), - //$PreviewInvoiceFormatString parameters - $RootPath, - $myrow['transno'], - $RootPath.'/css/'.$Theme.'/images', - $RootPath, - $PrintCustomerTransactionScript, - $myrow['transno'], - $RootPath, - $RootPath, - $myrow['transno'], - $RootPath.'/css/'.$Theme.'/images'); + } elseif ($MyRow['type'] == 11) { + /* Show transactions where: + * - Is credit note + * - User can view GL transactions + */ + if ($_SESSION['CompanyRecord']['gllink_debtors'] == 1 and in_array($_SESSION['PageSecurityArray']['GLTransInquiry.php'], $_SESSION['AllowedPageSecurityTokens'])) { + echo '<td>', _($MyRow['typename']), '</td> + <td>', $MyRow['transno'], '</td> + <td>', ConvertSQLDate($MyRow['trandate']), '</td> + <td>', $MyRow['branchcode'], '</td> + <td>', $MyRow['reference'], '</td> + <td style="width:200px">', $MyRow['invtext'], '</td> + <td>', $MyRow['order_'], '</td> + <td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['totalamount'] - $MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td> + <td> + <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit">', _('HTML '), ' + <img src="', $RootPath, '/css/', $Theme, '/images/preview.png" title="', _('Click to preview the credit note'), '" /> + </a> + </td> + <td> + <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit&PrintPDF=True">', _('PDF '), ' + <img src="', $RootPath, '/css/', $Theme, '/images/pdf.png" title="', _('Click for PDF'), '" alt="" /> + </a> + </td> + <td> + <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit">', _('Email'), ' + <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the credit note'), '" alt="" /> + </a> + </td> + <td> + <a href="', $RootPath, '/CustomerAllocations.php?AllocTrans=', $MyRow['id'], '">', _('Allocation'), ' + <img src="', $RootPath, '/css/', $Theme, '/images/allocation.png" title="', _('Click to allocate funds'), '" alt="" /> + </a> + </td> + <td> + <a href="', $RootPath, '/GLTransInquiry.php?TypeID=', $MyRow['type'], '&TransNo=', $MyRow['transno'], '">' . _('View GL Entries') . ' + <img src="', $RootPath, '/css/', $Theme, '/images/gl.png" title="', _('View the GL Entries'), '" alt="" /> + </a> + </td> + </tr>'; - } elseif ($myrow['type']==11) { /*its a credit note */ - if ($_SESSION['CompanyRecord']['gllink_debtors']== 1 AND in_array(8,$_SESSION['AllowedPageSecurityTokens'])){ - printf($BaseFormatString . - $PreviewCreditFormatString . - '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$RootPath .'/css/' . $Theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" alt="" /></a></td> - <td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <a><img src="' .$RootPath.'/css/'.$Theme.'/images/gl.png" title="' . _('View the GL Entries') . '" alt="" /></a></td></tr>', - //$BaseFormatString parameters - $myrow['typename'], - $myrow['transno'], - ConvertSQLDate($myrow['trandate']), - $myrow['branchcode'], - $myrow['reference'], - $myrow['invtext'], - $myrow['order_'], - locale_number_format($myrow['totalamount'],$CustomerRecord['decimalplaces']), - locale_number_format($myrow['allocated'],$CustomerRecord['decimalplaces']), - locale_number_format($myrow['totalamount']-$myrow['allocated'],$CustomerRecord['decimalplaces']), - //$PreviewCreditFormatString parameters - $RootPath, - $myrow['transno'], - $RootPath.'/css/'.$Theme.'/images', - $RootPath, - $PrintCustomerTransactionScript, - $myrow['transno'], - $RootPath, - $RootPath, - $myrow['transno'], - $RootPath.'/css/'.$Theme.'/images', - // hand coded format string for Allocations and GLTrans Inquiry parameters - $RootPath, - $myrow['id'], - $RootPath, - $myrow['type'], - $myrow['transno']); } else { - printf($BaseFormatString . - $PreviewCreditFormatString . - '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="%s/allocation.png" title="' . _('Click to allocate funds') . '" alt="" /></a></td> - </tr>', - $myrow['typename'], - $myrow['transno'], - ConvertSQLDate($myrow['trandate']), - $myrow['branchcode'], - $myrow['reference'], - $myrow['invtext'], - $myrow['order_'], - locale_number_format($myrow['totalamount'],$CustomerRecord['decimalplaces']), - locale_number_format($myrow['allocated'],$CustomerRecord['decimalplaces']), - locale_number_format($myrow['totalamount']-$myrow['allocated'],$CustomerRecord['decimalplaces']), - //$PreviewCreditFormatString parameters - $RootPath, - $myrow['transno'], - $RootPath.'/css/'.$Theme.'/images', - $RootPath, - $PrintCustomerTransactionScript, - $myrow['transno'], - $RootPath, - $RootPath, - $myrow['transno'], - $RootPath.'/css/'.$Theme.'/images', - //Parameters for hand coded string to show allocations - $RootPath, - $myrow['id'], - $RootPath.'/css/'.$Theme.'/images'); + /* Show transactions where: + * - Is credit note + * - User cannot view GL transactions + */ + echo '<td>', _($MyRow['typename']), '</td> + <td>', $MyRow['transno'], '</td> + <td>', ConvertSQLDate($MyRow['trandate']), '</td> + <td>', $MyRow['branchcode'], '</td> + <td>', $MyRow['reference'], '</td> + <td style="width:200px">', $MyRow['invtext'], '</td> + <td>', $MyRow['order_'], '</td> + <td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['totalamount'] - $MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td> + <td> + <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit">', _('HTML '), ' + <img src="', $RootPath, '/css/', $Theme, '/images/preview.png" title="', _('Click to preview the credit note'), '" /> + </a> + </td> + <td> + <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit&PrintPDF=True">', _('PDF '), ' + <img src="', $RootPath, '/css/', $Theme, '/images/pdf.png" title="', _('Click for PDF'), '" alt="" /> + </a> + </td> + <td> + <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit">', _('Email'), ' + <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the credit note'), '" alt="" /> + </a> + </td> + <td> + <a href="', $RootPath, '/CustomerAllocations.php?AllocTrans=', $MyRow['id'], '">', _('Allocation'), ' + <img src="', $RootPath, '/css/', $Theme, '/images/allocation.png" title="', _('Click to allocate funds'), '" alt="" /> + </a> + </td> + <td></td> + </tr>'; + } - } elseif ($myrow['type']==12 AND $myrow['totalamount']<0) { /*its a receipt which could have an allocation*/ + } elseif ($MyRow['type'] == 12 and $MyRow['totalamount'] < 0) { + /* Show transactions where: + * - Is receipt + * - User can view GL transactions + */ + if ($_SESSION['CompanyRecord']['gllink_debtors'] == 1 and in_array($_SESSION['PageSecurityArray']['GLTransInquiry.php'], $_SESSION['AllowedPageSecurityTokens'])) { + echo '<td>', _($MyRow['typename']), '</td> + <td>', $MyRow['transno'], '</td> + <td>', ConvertSQLDate($MyRow['trandate']), '</td> + <td>', $MyRow['branchcode'], '</td> + <td>', $MyRow['reference'], '</td> + <td style="width:200px">', $MyRow['invtext'], '</td> + <td>', $MyRow['order_'], '</td> + <td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['totalamount'] - $MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td> + <td> + <a href="', $RootPath, '/CustomerAllocations.php?AllocTrans=', $MyRow['id'], '">', _('Allocation'), ' + <img src="', $RootPath, '/css/', $Theme, '/images/allocation.png" title="', _('Click to allocate funds'), '" alt="" /> + </a> + </td> + <td></td> + <td></td> + <td></td> + <td> + <a href="', $RootPath, '/GLTransInquiry.php?TypeID=', $MyRow['type'], '&TransNo=', $MyRow['transno'], '">', _('View GL Entries'), ' + <img src="', $RootPath, '/css/', $Theme, '/images/gl.png" title="', _('View the GL Entries'), '" alt="" /> + </a> + </td> + </tr>'; - //If security token 8 in the allowed page security tokens then assumed ok for GL trans inquiries - if ($_SESSION['CompanyRecord']['gllink_debtors']== 1 AND in_array(8,$_SESSION['AllowedPageSecurityTokens'])){ - printf($BaseFormatString . - '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$RootPath . '/css/' . $Theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" alt="" /></a></td> - <td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <img src="' .$RootPath . '/css/' . $Theme .'/images/gl.png" title="' . _('View the GL Entries') . '" alt="" /></a></td> - </tr>', - $myrow['typename'], - $myrow['transno'], - ConvertSQLDate($myrow['trandate']), - $myrow['branchcode'], - $myrow['reference'], - $myrow['invtext'], - $myrow['order_'], - locale_number_format($myrow['totalamount'],$CustomerRecord['decimalplaces']), - locale_number_format($myrow['allocated'],$CustomerRecord['decimalplaces']), - locale_number_format($myrow['totalamount']-$myrow['allocated'],$CustomerRecord['decimalplaces']), - $RootPath, - $myrow['id'], - $RootPath, - $myrow['type'], - $myrow['transno']); } else { //no permission for GLTrans Inquiries - printf($BaseFormatString . - '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$RootPath . '/css/' . $Theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" alt="" /></a></td> - </tr>', - $myrow['typename'], - $myrow['transno'], - ConvertSQLDate($myrow['trandate']), - $myrow['branchcode'], - $myrow['reference'], - $myrow['invtext'], - $myrow['order_'], - locale_number_format($myrow['totalamount'],$CustomerRecord['decimalplaces']), - locale_number_format($myrow['allocated'],$CustomerRecord['decimalplaces']), - locale_number_format($myrow['totalamount']-$myrow['allocated'],$CustomerRecord['decimalplaces']), - $RootPath, - $myrow['id']); + /* Show transactions where: + * - Is credit note + * - User cannot view GL transactions + */ + echo '<td>', _($MyRow['typename']), '</td> + <td>', $MyRow['transno'], '</td> + <td>', ConvertSQLDate($MyRow['trandate']), '</td> + <td>', $MyRow['branchcode'], '</td> + <td>', $MyRow['reference'], '</td> + <td style="width:200px">', $MyRow['invtext'], '</td> + <td>', $MyRow['order_'], '</td> + <td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['totalamount'] - $MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td> + <td> + <a href="', $RootPath, '/CustomerAllocations.php?AllocTrans=', $MyRow['id'], '">', _('Allocation'), ' + <img src="', $RootPath, '/css/', $Theme, '/images/allocation.png" title="', _('Click to allocate funds'), '" alt="" /> + </a> + </td> + <td></td> + <td></td> + <td></td> + <td></td> + </tr>'; + } - } elseif ($myrow['type']==12 AND $myrow['totalamount']>0) { /*its a negative receipt */ + } elseif ($MyRow['type'] == 12 and $MyRow['totalamount'] > 0) { + if ($_SESSION['CompanyRecord']['gllink_debtors'] == 1 and in_array($_SESSION['PageSecurityArray']['GLTransInquiry.php'], $_SESSION['AllowedPageSecurityTokens'])) { + /* Show transactions where: + * - Is a negative receipt + * - User can view GL transactions + */ + echo '<td>', _($MyRow['typename']), '</td> + <td>', $MyRow['transno'], '</td> + <td>', ConvertSQLDate($MyRow['trandate']), '</td> + <td>', $MyRow['branchcode'], '</td> + <td>', $MyRow['reference'], '</td> + <td style="width:200px">', $MyRow['invtext'], '</td> + <td>', $MyRow['order_'], '</td> + <td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['totalamount'] - $MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td> + <td></td> + <td></td> + <td></td> + <td></td> + <td> + <a href="', $RootPath, '/GLTransInquiry.php?TypeID=', $MyRow['type'], '&TransNo=', $MyRow['transno'], '">' . _('View GL Entries') . ' + <img src="', $RootPath, '/css/', $Theme, '/images/gl.png" title="', _('View the GL Entries'), '" alt="" /> + </a> + </td> + </tr>'; - //If security token 8 in the allowed page security tokens then assumed ok for GL trans inquiries - if ($_SESSION['CompanyRecord']['gllink_debtors']== 1 AND in_array(8,$_SESSION['AllowedPageSecurityTokens'])){ - printf($BaseFormatString . - '<td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <a></td></tr>', - $myrow['typename'], - $myrow['transno'], - ConvertSQLDate($myrow['trandate']), - $myrow['branchcode'], - $myrow['reference'], - $myrow['invtext'], - $myrow['order_'], - locale_number_format($myrow['totalamount'],$CustomerRecord['decimalplaces']), - locale_number_format($myrow['allocated'],$CustomerRecord['decimalplaces']), - locale_number_format($myrow['totalamount']-$myrow['allocated'],$CustomerRecord['decimalplaces']), - $RootPath, - $myrow['type'], - $myrow['transno']); - } else { //no permission for GLTrans Inquiries - printf($BaseFormatString . '<td></tr>', - $myrow['typename'], - $myrow['transno'], - ConvertSQLDate($myrow['trandate']), - $myrow['branchcode'], - $myrow['reference'], - $myrow['invtext'], - $myrow['order_'], - locale_number_format($myrow['totalamount'],$CustomerRecord['decimalplaces']), - locale_number_format($myrow['allocated'],$CustomerRecord['decimalplaces']), - locale_number_format($myrow['totalamount']-$myrow['allocated'],$CustomerRecord['decimalplaces'])); + } else { + /* Show transactions where: + * - Is a negative receipt + * - User cannot view GL transactions + */ + echo '<td>', _($MyRow['typename']), '</td> + <td>', $MyRow['transno'], '</td> + <td>', ConvertSQLDate($MyRow['trandate']), '</td> + <td>', $MyRow['branchcode'], '</td> + <td>', $MyRow['reference'], '</td> + <td style="width:200px">', $MyRow['invtext'], '</td> + <td>', $MyRow['order_'], '</td> + <td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['totalamount'] - $MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td> + <td></td> + <td></td> + <td></td> + <td></td> + <td></td> + </tr>'; } } else { - //If security token 8 in the allowed page security tokens then assumed ok for GL trans inquiries - if ($_SESSION['CompanyRecord']['gllink_debtors']== 1 AND in_array(8,$_SESSION['AllowedPageSecurityTokens'])){ - printf($BaseFormatString . - '<td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <a></td></tr>', - $myrow['typename'], - $myrow['transno'], - ConvertSQLDate($myrow['trandate']), - $myrow['branchcode'], - $myrow['reference'], - $myrow['invtext'], - $myrow['order_'], - locale_number_format($myrow['totalamount'],$CustomerRecord['decimalplaces']), - locale_number_format($myrow['allocated'],$CustomerRecord['decimalplaces']), - locale_number_format($myrow['totalamount']-$myrow['allocated'],$CustomerRecord['decimalplaces']), - $RootPath, - $myrow['type'], - $myrow['transno']); + if ($_SESSION['CompanyRecord']['gllink_debtors'] == 1 and in_array($_SESSION['PageSecurityArray']['GLTransInquiry.php'], $_SESSION['AllowedPageSecurityTokens'])) { + /* Show transactions where: + * - Is a misc transaction + * - User can view GL transactions + */ + echo '<td>', _($MyRow['typename']), '</td> + <td>', $MyRow['transno'], '</td> + <td>', ConvertSQLDate($MyRow['trandate']), '</td> + <td>', $MyRow['branchcode'], '</td> + <td>', $MyRow['reference'], '</td> + <td style="width:200px">', $MyRow['invtext'], '</td> + <td>', $MyRow['order_'], '</td> + <td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['totalamount'] - $MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td> + <td></td> + <td></td> + <td></td> + <td></td> + <td> + <a href="', $RootPath, '/GLTransInquiry.php?TypeID=', $MyRow['type'], '&TransNo=', $MyRow['transno'], '">', _('View GL Entries'), ' + <img src="', $RootPath, '/css/', $Theme, '/images/gl.png" title="', _('View the GL Entries'), '" alt="" /> + </a> + </td> + </tr>'; + } else { - printf($BaseFormatString . '</tr>', - $myrow['typename'], - $myrow['transno'], - ConvertSQLDate($myrow['trandate']), - $myrow['branchcode'], - $myrow['reference'], - $myrow['invtext'], - $myrow['order_'], - locale_number_format($myrow['totalamount'],$CustomerRecord['decimalplaces']), - locale_number_format($myrow['allocated'],$CustomerRecord['decimalplaces']), - locale_number_format($myrow['totalamount']-$myrow['allocated'],$CustomerRecord['decimalplaces'])); + /* Show transactions where: + * - Is a misc transaction + * - User cannot view GL transactions + */ + echo '<td>', $MyRow['typename'], '</td> + <td>', $MyRow['transno'], '</td> + <td>', ConvertSQLDate($MyRow['trandate']), '</td> + <td>', $MyRow['branchcode'], '</td> + <td>', $MyRow['reference'], '</td> + <td style="width:200px">', $MyRow['invtext'], '</td> + <td>', $MyRow['order_'], '</td> + <td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td> + <td class="number">', locale_number_format($MyRow['totalamount'] - $MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td> + <td></td> + <td></td> + <td></td> + <td></td> + <td></td> + </tr>'; } } @@ -589,4 +632,4 @@ echo '</table>'; include('includes/footer.inc'); -?> +?> \ No newline at end of file Modified: trunk/StockStatus.php =================================================================== --- trunk/StockStatus.php 2014-09-19 19:27:05 UTC (rev 6894) +++ trunk/StockStatus.php 2014-09-19 20:25:01 UTC (rev 6895) @@ -176,12 +176,9 @@ if ($Its_A_KitSet_Assembly_Or_Dummy == False){ - $sql="SELECT SUM(purchorderdetails.quantityord*(CASE WHEN purchdata.conversionfactor IS NULL THEN 1 ELSE purchdata.conversionfactor END) - - purchorderdetails.quantityrecd*(CASE WHEN purchdata.conversionfactor IS NULL THEN 1 ELSE purchdata.conversionfactor END)) + $sql="SELECT SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) FROM purchorders LEFT JOIN purchorderdetails ON purchorders.orderno=purchorderdetails.orderno - LEFT JOIN purchdata ON purchorders.supplierno=purchdata.supplierno - AND purchorderdetails.itemcode=purchdata.stockid WHERE purchorderdetails.itemcode='" . $StockID . "' AND purchorders.intostocklocation='" . $myrow['loccode'] . "' AND (purchorders.status<>'Cancelled' Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2014-09-19 19:27:05 UTC (rev 6894) +++ trunk/doc/Change.log 2014-09-19 20:25:01 UTC (rev 6895) @@ -1,5 +1,6 @@ webERP Change Log +20/9/14 Bob Thomas: StockStatus incorrectly displaying quantity on order extended by conversion units 11/09/14 RChacon: Add ascending class to PaymentMethods.php to have sortable columns. 17/9/14 Phil: Moved the audit log purge to occur if DB_Maintenance is set to run 16/9/14 Phil: Added BNZ GIFTS format for bank account transaction imports |
From: <dai...@us...> - 2014-09-20 02:33:17
|
Revision: 6896 http://sourceforge.net/p/web-erp/reponame/6896 Author: daintree Date: 2014-09-20 02:33:13 +0000 (Sat, 20 Sep 2014) Log Message: ----------- Phil: Move the DB Maintenance/GetConfig/Exchange rates update/audit trail purge inside UserLogin.php to ensure they do no add unecessary overhead to every page Modified Paths: -------------- trunk/doc/Change.log trunk/includes/UserLogin.php trunk/includes/session.inc trunk/sql/mysql/upgrade4.11-4.12.sql Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2014-09-19 20:25:01 UTC (rev 6895) +++ trunk/doc/Change.log 2014-09-20 02:33:13 UTC (rev 6896) @@ -1,5 +1,6 @@ webERP Change Log +20/9/14 Phil: Move the DB Maintenance/GetConfig/Exchange rates update/audit trail purge inside UserLogin.php to ensure they do no add unecessary overhead to every page 20/9/14 Bob Thomas: StockStatus incorrectly displaying quantity on order extended by conversion units 11/09/14 RChacon: Add ascending class to PaymentMethods.php to have sortable columns. 17/9/14 Phil: Moved the audit log purge to occur if DB_Maintenance is set to run Modified: trunk/includes/UserLogin.php =================================================================== --- trunk/includes/UserLogin.php 2014-09-19 20:25:01 UTC (rev 6895) +++ trunk/includes/UserLogin.php 2014-09-20 02:33:13 UTC (rev 6896) @@ -144,14 +144,93 @@ $i++; } } - // check if only maintenance users can access webERP - $sql = "SELECT confvalue FROM config WHERE confname = 'DB_Maintenance'"; - $Maintenance_Result = DB_query($sql, $db); - if (DB_num_rows($Maintenance_Result)==0){ + + + /*User is logged in so get configuration parameters - save in session*/ + include($PathPrefix . 'includes/GetConfig.php'); + + + /*If the Code $Version - held in ConnectDB.inc is > than the Database VersionNumber held in config table then do upgrades */ + if (strcmp($Version,$_SESSION['VersionNumber'])>0 AND (basename($_SERVER['SCRIPT_NAME'])!='UpgradeDatabase.php')) { + header('Location: UpgradeDatabase.php'); + } + + if(isset($_SESSION['DB_Maintenance'])){ + if ($_SESSION['DB_Maintenance']>0) { //run the DB maintenance script + if (DateDiff(Date($_SESSION['DefaultDateFormat']), + ConvertSQLDate($_SESSION['DB_Maintenance_LastRun']) + ,'d') >= $_SESSION['DB_Maintenance']){ + + /*Do the DB maintenance routing for the DB_type selected */ + DB_Maintenance($db); + $_SESSION['DB_Maintenance_LastRun'] = Date('Y-m-d'); + + /* Audit trail purge only runs if DB_Maintenance is enabled */ + if (isset($_SESSION['MonthsAuditTrail'])){ + $sql = "DELETE FROM audittrail + WHERE transactiondate <= '" . Date('Y-m-d', mktime(0,0,0, Date('m')-$_SESSION['MonthsAuditTrail'])) . "'"; + $ErrMsg = _('There was a problem deleting expired audit-trail history'); + $result = DB_query($sql,$db); + } + } + } + } + + /*Check to see if currency rates need to be updated */ + if (isset($_SESSION['UpdateCurrencyRatesDaily'])){ + if ($_SESSION['UpdateCurrencyRatesDaily']!=0) { + /* Only run the update to currency rates if today is after the last update i.e. only runs once a day */ + if (DateDiff(Date($_SESSION['DefaultDateFormat']), + ConvertSQLDate($_SESSION['UpdateCurrencyRatesDaily']),'d')> 0){ + + if ($_SESSION['ExchangeRateFeed']=='ECB') { + $CurrencyRates = GetECBCurrencyRates(); // gets rates from ECB see includes/MiscFunctions.php + /*Loop around the defined currencies and get the rate from ECB */ + if ($CurrencyRates!=false) { + $CurrenciesResult = DB_query("SELECT currabrev FROM currencies",$db); + while ($CurrencyRow = DB_fetch_row($CurrenciesResult)){ + if ($CurrencyRow[0]!=$_SESSION['CompanyRecord']['currencydefault']){ + + $UpdateCurrRateResult = DB_query("UPDATE currencies SET rate='" . GetCurrencyRate($CurrencyRow[0],$CurrencyRates) . "' + WHERE currabrev='" . $CurrencyRow[0] . "'",$db); + } + } + } + } else { + $CurrenciesResult = DB_query("SELECT currabrev FROM currencies",$db); + while ($CurrencyRow = DB_fetch_row($CurrenciesResult)){ + if ($CurrencyRow[0]!=$_SESSION['CompanyRecord']['currencydefault']){ + $UpdateCurrRateResult = DB_query("UPDATE currencies SET rate='" . google_currency_rate($CurrencyRow[0]) . "' + WHERE currabrev='" . $CurrencyRow[0] . "'",$db); + } + } + } + $_SESSION['UpdateCurrencyRatesDaily'] = Date('Y-m-d'); + $UpdateConfigResult = DB_query("UPDATE config SET confvalue = '" . Date('Y-m-d') . "' WHERE confname='UpdateCurrencyRatesDaily'",$db); + } + } + } + + + /* Set the logo if not yet set. + * will be done only once per session and each time + * we are not in session (i.e. before login) + */ + if (empty($_SESSION['LogoFile'])) { + /* find a logo in companies/CompanyDir */ + if (file_exists($PathPrefix . 'companies/' . $_SESSION['DatabaseName'] . '/logo.png')) { + $_SESSION['LogoFile'] = 'companies/' . $_SESSION['DatabaseName'] . '/logo.png'; + } elseif (file_exists($PathPrefix . 'companies/' . $_SESSION['DatabaseName'] . '/logo.jpg')) { + $_SESSION['LogoFile'] = 'companies/' . $_SESSION['DatabaseName'] . '/logo.jpg'; + } + } + + + if(!isset($_SESSION['DB_Maintenance'])){ return UL_CONFIGERR; } else { - $myMaintenanceRow = DB_fetch_row($Maintenance_Result); - if (($myMaintenanceRow[0] == -1) AND ($UserIsSysAdmin == FALSE)){ + + if ($_SESSION['DB_Maintenance']==-1 AND !in_array(15, $_SESSION['AllowedPageSecurityTokens'])){ // the configuration setting has been set to -1 ==> Allow SysAdmin Access Only // the user is NOT a SysAdmin return UL_MAINTENANCE; Modified: trunk/includes/session.inc =================================================================== --- trunk/includes/session.inc 2014-09-19 20:25:01 UTC (rev 6895) +++ trunk/includes/session.inc 2014-09-20 02:33:13 UTC (rev 6896) @@ -132,71 +132,7 @@ } -/*User is logged in so get configuration parameters - save in session*/ -include($PathPrefix . 'includes/GetConfig.php'); - -/*If the Code $Version - held in ConnectDB.inc is > than the Database VersionNumber held in config table then do upgrades */ -if (strcmp($Version,$_SESSION['VersionNumber'])>0 AND (basename($_SERVER['SCRIPT_NAME'])!='UpgradeDatabase.php')) { - header('Location: UpgradeDatabase.php'); -} - -if(isset($_SESSION['DB_Maintenance'])){ - if ($_SESSION['DB_Maintenance']>0) { //run the DB maintenance script - if (DateDiff(Date($_SESSION['DefaultDateFormat']), - ConvertSQLDate($_SESSION['DB_Maintenance_LastRun']) - ,'d') >= $_SESSION['DB_Maintenance']){ - - /*Do the DB maintenance routing for the DB_type selected */ - DB_Maintenance($db); - $_SESSION['DB_Maintenance_LastRun'] = Date('Y-m-d'); - - /* Audit trail purge only runs if DB_Maintenance is enabled */ - if (isset($_SESSION['MonthsAuditTrail'])){ - $sql = "DELETE FROM audittrail - WHERE transactiondate <= '" . Date('Y-m-d', mktime(0,0,0, Date('m')-$_SESSION['MonthsAuditTrail'])) . "'"; - $ErrMsg = _('There was a problem deleting expired audit-trail history'); - $result = DB_query($sql,$db); - } - } - } -} - -/*Check to see if currency rates need to be updated */ -if (isset($_SESSION['UpdateCurrencyRatesDaily'])){ - if ($_SESSION['UpdateCurrencyRatesDaily']!=0) { - /* Only run the update to currency rates if today is after the last update i.e. only runs once a day */ - if (DateDiff(Date($_SESSION['DefaultDateFormat']), - ConvertSQLDate($_SESSION['UpdateCurrencyRatesDaily']),'d')> 0){ - - if ($_SESSION['ExchangeRateFeed']=='ECB') { - $CurrencyRates = GetECBCurrencyRates(); // gets rates from ECB see includes/MiscFunctions.php - /*Loop around the defined currencies and get the rate from ECB */ - if ($CurrencyRates!=false) { - $CurrenciesResult = DB_query("SELECT currabrev FROM currencies",$db); - while ($CurrencyRow = DB_fetch_row($CurrenciesResult)){ - if ($CurrencyRow[0]!=$_SESSION['CompanyRecord']['currencydefault']){ - - $UpdateCurrRateResult = DB_query("UPDATE currencies SET rate='" . GetCurrencyRate($CurrencyRow[0],$CurrencyRates) . "' - WHERE currabrev='" . $CurrencyRow[0] . "'",$db); - } - } - } - } else { - $CurrenciesResult = DB_query("SELECT currabrev FROM currencies",$db); - while ($CurrencyRow = DB_fetch_row($CurrenciesResult)){ - if ($CurrencyRow[0]!=$_SESSION['CompanyRecord']['currencydefault']){ - $UpdateCurrRateResult = DB_query("UPDATE currencies SET rate='" . google_currency_rate($CurrencyRow[0]) . "' - WHERE currabrev='" . $CurrencyRow[0] . "'",$db); - } - } - } - $_SESSION['UpdateCurrencyRatesDaily'] = Date('Y-m-d'); - $UpdateConfigResult = DB_query("UPDATE config SET confvalue = '" . Date('Y-m-d') . "' WHERE confname='UpdateCurrencyRatesDaily'",$db); - } - } -} - If (isset($_POST['Theme']) AND ($_SESSION['UsersRealName'] == $_POST['RealName'])) { $_SESSION['Theme'] = $_POST['Theme']; $Theme = $_POST['Theme']; @@ -204,34 +140,7 @@ $Theme = $_SESSION['Theme']; } -/* Set the logo if not yet set. - * will be done only once per session and each time - * we are not in session (i.e. before login) - */ -if (empty($_SESSION['LogoFile'])) { - /* find a logo in companies/$CompanyDir - * (nice side effect of function: - * variables are local, so we will never - * cause name clashes) - */ - function findLogoFile($CompanyDir, $PathPrefix) { - $result = null; - $dir = $PathPrefix . 'companies/' . $CompanyDir; - if (file_exists($dir . '/logo.png')) { - $result = 'companies/' . $CompanyDir . '/logo.png'; - } elseif (file_exists($dir . '/logo.jpg')) { - $result = 'companies/' . $CompanyDir . '/logo.jpg'; - } - return $result; - } - - /* Find a logo in companies/<company of this session> */ - if (!empty($_SESSION['DatabaseName'])) { - $_SESSION['LogoFile'] = findLogoFile($_SESSION['DatabaseName'], $PathPrefix); - } -} - if ($_SESSION['HTTPS_Only']==1){ if ($_SERVER['HTTPS']!='on'){ prnMsg(_('webERP is configured to allow only secure socket connections. Pages must be called with https://') . ' .....','error'); Modified: trunk/sql/mysql/upgrade4.11-4.12.sql =================================================================== --- trunk/sql/mysql/upgrade4.11-4.12.sql 2014-09-19 20:25:01 UTC (rev 6895) +++ trunk/sql/mysql/upgrade4.11-4.12.sql 2014-09-20 02:33:13 UTC (rev 6896) @@ -82,6 +82,7 @@ ALTER TABLE `locations` ADD `usedforwo` TINYINT( 4 ) NOT NULL DEFAULT '1' AFTER `internalrequest`; ALTER TABLE `bankaccounts` ADD `importformat` VARCHAR( 10 ) NOT NULL DEFAULT ''; +ALTER TABLE `audittrail` ADD INDEX ( `transactiondate` ); UPDATE config SET confvalue='4.12' WHERE confname='VersionNumber'; |
From: <dai...@us...> - 2014-09-21 05:07:26
|
Revision: 6897 http://sourceforge.net/p/web-erp/reponame/6897 Author: daintree Date: 2014-09-21 05:07:16 +0000 (Sun, 21 Sep 2014) Log Message: ----------- Tidy up dashboard Modified Paths: -------------- trunk/Dashboard.php trunk/SelectSalesOrder.php trunk/doc/Change.log trunk/includes/UserLogin.php trunk/includes/session.inc Modified: trunk/Dashboard.php =================================================================== --- trunk/Dashboard.php 2014-09-20 02:33:13 UTC (rev 6896) +++ trunk/Dashboard.php 2014-09-21 05:07:16 UTC (rev 6897) @@ -63,13 +63,16 @@ echo $TableHeader; $j = 1; $k=0; //row colour counter + if (!isset($_POST['Salesman'])){ + $_POST['Salesman']=''; + } if ($_SESSION['SalesmanLogin'] != '') { $_POST['Salesman'] = $_SESSION['SalesmanLogin']; } if (trim($_POST['Salesman'])!=''){ $SalesLimit = " AND debtorsmaster.debtorno IN (SELECT DISTINCT debtorno FROM custbranch WHERE salesman = '".$_POST['Salesman']."') "; } else { - $SalesLimit = ""; + $SalesLimit = ''; } $SQL = "SELECT debtorsmaster.debtorno, debtorsmaster.name, @@ -188,7 +191,8 @@ <td class="number"><b>%s</b></td> <td class="number" style="color:orange;"><b>%s</b></td> <td class="number" style="color:red;"><b>%s</b></td> - <td class="number" style="color:red;"><b>%s</b></td>', + <td class="number" style="color:red;"><b>%s</b></td> + </tr>', $AgedAnalysis['debtorno'] . ' - ' . $AgedAnalysis['name'], '', '', @@ -197,9 +201,8 @@ $DisplayCurrent, $DisplayDue, $DisplayOverdue1, - $DisplayOverdue2 - ); - echo '</tr>'; + $DisplayOverdue2 ); + $sql = "SELECT systypes.typename, debtortrans.transno, debtortrans.trandate, @@ -346,23 +349,18 @@ } //DebtorSecurity if (in_array($PayeeSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($PayeeSecurity)) { - //$UpcomingDate = Date($_SESSION['DefaultDateFormat'], Mktime(0,0,0,Date('m')+1,0 ,Date('y'))); - $UpcomingDate = Date(($_SESSION['DefaultDateFormat']), strtotime($UpcomingDate . ' + 30 days')); echo '<br /><b>' . _('Supplier Invoices Due within 1 Month') . '</b> <table class="selection"> - <tbody>'; + <tbody> + <tr> + <th>' . _('Supplier') . '</th> + <th>' . _('Invoice Date') . '</th> + <th>' . _('Invoice') . '</th> + <th>' . _('Amount Due') . '</th> + <th>' . _('Due Date') . '</th> + </tr>'; - $TableHeader = '<tr> - <th>' . _('Supplier') . '</th> - <th>' . _('Invoice Date') . '</th> - <th>' . _('Invoice') . '</th> - <th>' . _('Amount Due') . '</th> - <th>' . _('Due Date') . '</th> - </tr>'; - echo $TableHeader; - $j = 1; - $k=0; //row colour counter $sql = "SELECT suppliers.supplierid, currencies.decimalplaces AS currdecimalplaces, SUM(supptrans.ovamount + supptrans.ovgst - supptrans.alloc) AS balance @@ -413,7 +411,7 @@ ON systypes.typeid = supptrans.type WHERE supptrans.supplierno = '" . $SuppliersToPay['supplierid'] . "' AND supptrans.ovamount + supptrans.ovgst - supptrans.alloc !=0 - AND supptrans.duedate <='" . FormatDateForSQL($UpcomingDate) . "' + AND supptrans.duedate <='" . Date('Y-m-d', mktime(0,0,0, Date('n'),Date('j')+30,date('Y'))) . "' AND supptrans.hold = 0 ORDER BY supptrans.supplierno, supptrans.type, @@ -433,6 +431,8 @@ unset($Allocs); $Allocs = array(); $AllocCounter =0; + $AccumBalance =0; + $k=0; //row colour counter while ($DetailTrans = DB_fetch_array($TransResult)){ @@ -491,15 +491,6 @@ } /*end while there are detail transactions to show */ } /* end while there are suppliers to retrieve transactions for */ - /* if (DB_error_no($db) !=0) { - prnMsg(_('None of the payments will be processed. Unfortunately, there was a problem committing the changes to the database because') . ' - ' . DB_error_msg($db),'error'); - echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>'; - if ($debug==1){ - prnMsg(_('The SQL that failed was') . '<br />' . $SQL,'error'); - } - include('includes/footer.inc'); - exit; - } */ if ($k==1){ echo '<tr class="EvenTableRows">'; $k=0; @@ -507,18 +498,13 @@ echo '<tr class="OddTableRows">'; $k=1; } - printf('<td style="text-align:left"><b>%s</b></td> - <td>%s</td> - <td>%s</td> - <td class="number"><b>%s</b></td> - <td><b>%s</b></td>', - _('Grand Total Payments Due'), - '', - '', - locale_number_format($AccumBalance,$CurrDecimalPlaces), - ''); - echo '</tr>'; - echo '</tbody> + echo '<td style="text-align:left">' . _('Grand Total Payments Due') . '</td> + <td></td> + <td></td> + <td class="number"><b>' . locale_number_format($AccumBalance,$CurrDecimalPlaces) . '</b></td> + <td></td> + </tr> + </tbody> </table>'; } //PayeeSecurity if (in_array($CashSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($CashSecurity)) { @@ -528,14 +514,12 @@ $FirstPeriodSelected = GetPeriod(date($_SESSION['DefaultDateFormat']), $db); $LastPeriodSelected = GetPeriod(date($_SESSION['DefaultDateFormat']), $db); $SelectedPeriod=$LastPeriodSelected; - $TableHeader = '<tr> - <th class="ascending">' . _('GL Account') . '</th> - <th class="ascending">' . _('Account Name') . '</th> - <th class="ascending">' . _('Balance') . '</th> - </tr>'; - echo $TableHeader; - $j = 1; - $k=0; //row colour counter + echo '<tr> + <th class="ascending">' . _('GL Account') . '</th> + <th class="ascending">' . _('Account Name') . '</th> + <th class="ascending">' . _('Balance') . '</th> + </tr>'; + $sql = "SELECT bankaccounts.accountcode, bankaccounts.bankaccountcode, chartmaster.accountname, @@ -547,6 +531,8 @@ $DbgMsg = _('The SQL used to retrieve the bank account details was') . '<br />' . $sql; $result1 = DB_query($sql,$db,$ErrMsg,$DbgMsg); + $k=0; //row colour counter + while ($myrow = DB_fetch_array($result1)) { if ($k==1){ echo '<tr class="EvenTableRows">'; @@ -639,40 +625,30 @@ $DisplayBalance=locale_number_format(($RunningTotal),$_SESSION['CompanyRecord']['decimalplaces']); printf('<td>%s</td> <td>%s</td> - <td class="number">%s</td>', + <td class="number">%s</td> + </tr>', $myrow['accountcode'] . ' - ' . $myrow['accountname'], $myrow['bankaccountname'], $DisplayBalance); - echo '</tr>'; } //each bank account echo '</tbody> </table>'; } //CashSecurity if (in_array($OrderSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($OrderSecurity)) { - echo '<br /><b>' . _('Outstanding Orders') . '</b>'; + echo '<br /><b>' . _('Outstanding Orders') . '</b> + <table cellpadding="2" width="95%" class="selection"> + <tr> + <th>' . _('View Order') . '</th> + <th>' . _('Customer') . '</th> + <th>' . _('Branch') . '</th> + <th>' . _('Cust Order') . ' #</th> + <th>' . _('Order Date') . '</th> + <th>' . _('Req Del Date') . '</th> + <th>' . _('Delivery To') . '</th> + <th>' . _('Order Total') . ' ' . _('in') . ' ' . $_SESSION['CompanyRecord']['currencydefault'] . '</th> + </tr>'; - echo '<table cellpadding="2" width="95%" class="selection">'; - $RecentDate = Date(($_SESSION['DefaultDateFormat']), strtotime($RecentDate . ' - 1 days')); - $TableHeader = '<tr>' . - /* - <th>' . _('Modify') . '</th> - */ - '<th>' . _('View Order') . '</th>' . - /* - <th>' . _('Invoice') . '</th> - <th>' . _('Dispatch Note') . '</th> - <th>' . _('Labels') . '</th> - */ - '<th>' . _('Customer') . '</th> - <th>' . _('Branch') . '</th> - <th>' . _('Cust Order') . ' #</th> - <th>' . _('Order Date') . '</th> - <th>' . _('Req Del Date') . '</th> - <th>' . _('Delivery To') . '</th> - <th>' . _('Order Total') . ' in ' . $_SESSION['CompanyRecord']['currencydefault'] . '</th>'; - echo $TableHeader; - $SQL = "SELECT salesorders.orderno, debtorsmaster.name, custbranch.brname, @@ -708,16 +684,17 @@ /*show a table of the orders returned by the SQL */ if (DB_num_rows($SalesOrdersResult)>0) { - - $i = 1; - $j = 1; $k=0; //row colour counter $OrdersTotal =0; + $FontColor=''; while ($myrow=DB_fetch_array($SalesOrdersResult)) { - $FontColor=''; - $FormatedOrderDate = ConvertSQLDate($myrow['orddate']); - if ($FormatedOrderDate >= $RecentDate) { + + $OrderDate = ConvertSQLDate($myrow['orddate']); + $FormatedDelDate = ConvertSQLDate($myrow['deliverydate']); + $FormatedOrderValue = locale_number_format($myrow['ordervalue'],$_SESSION['CompanyRecord']['decimalplaces']); + + if (DateDiff(Date($_SESSION['DefaultDateFormat']),$OrderDate,'d')>5) { $FontColor=' style="color:green; font-weight:bold"'; } if ($k==1){ @@ -728,77 +705,34 @@ $k++; } - - $ModifyPage = $RootPath . '/SelectOrderItems.php?ModifyOrderNumber=' . $myrow['orderno']; - $Confirm_Invoice = $RootPath . '/ConfirmDispatch_Invoice.php?OrderNumber=' .$myrow['orderno']; - - if ($_SESSION['PackNoteFormat']==1){ /*Laser printed A4 default */ - $PrintDispatchNote = $RootPath . '/PrintCustOrder_generic.php?TransNo=' . $myrow['orderno']; - } else { /*pre-printed stationery default */ - $PrintDispatchNote = $RootPath . '/PrintCustOrder.php?TransNo=' . $myrow['orderno']; - } - $PrintQuotation = $RootPath . '/PDFQuotation.php?QuotationNo=' . $myrow['orderno']; - $PrintQuotationPortrait = $RootPath . '/PDFQuotationPortrait.php?QuotationNo=' . $myrow['orderno']; - $FormatedDelDate = ConvertSQLDate($myrow['deliverydate']); - $FormatedOrderValue = locale_number_format($myrow['ordervalue'],$_SESSION['CompanyRecord']['decimalplaces']); - $PrintAck = $RootPath . '/PDFAck.php?AcknowledgementNo=' . $myrow['orderno']; - - if ($myrow['printedpackingslip']==0) { - $PrintText = _('Print'); - } else { - $PrintText = _('Reprint'); - } - - $PrintLabels = $RootPath . '/PDFShipLabel.php?Type=Sales&ORD=' . $myrow['orderno'] ; - - - printf( - /*<td><a href="%s">%s</a></td>*/ - '<td><a href="%s" target="_blank">' . $myrow['orderno'] . '</a></td>' . - /* - <td><a href="%s">' . _('Invoice') . '</a></td> - <td><a target="_blank" href="%s">' . $PrintText . ' <img src="' .$RootPath.'/css/'.$Theme.'/images/pdf.png" title="' . _('Click for PDF') . '" alt="" /></a></td> - <td><a href="%s">' . _('Labels') . '</a></td> - */ - '<td' . $FontColor . '>%s</td> + printf( '<td><a href="%s" target="_blank">' . $myrow['orderno'] . '</a></td> <td' . $FontColor . '>%s</td> <td' . $FontColor . '>%s</td> <td' . $FontColor . '>%s</td> <td' . $FontColor . '>%s</td> <td' . $FontColor . '>%s</td> + <td' . $FontColor . '>%s</td> <td' . $FontColor . ' class="number">%s</td> </tr>', - /* - $ModifyPage, - $myrow['orderno'], - */ - $PrintAck, - /* - $Confirm_Invoice, - $PrintDispatchNote, - $PrintLabels, - */ + $RootPath . '/OrderDetails.php?OrderNumber=' . $myrow['orderno'], $myrow['name'], $myrow['brname'], $myrow['customerref'], - $FormatedOrderDate, + $OrderDate, $FormatedDelDate, html_entity_decode($myrow['deliverto'],ENT_QUOTES,'UTF-8'), - $FormatedOrderValue, - $i, - $i, - $myrow['orderno']); - $i++; + $FormatedOrderValue); $OrdersTotal += $myrow['ordervalue']; } //while - echo '<tfoot><tr><td colspan="6" class="number">'; - echo '<b>' . _('Total Order(s) Value in'); - echo ' ' . $_SESSION['CompanyRecord']['currencydefault'] . ' :</b></td> - <td class="number"><b>' . locale_number_format($OrdersTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td> - </tr></tfoot> + echo '<tfoot> + <tr> + <td colspan="7" class="number"><b>' . _('Total Order(s) Value in') . ' ' . $_SESSION['CompanyRecord']['currencydefault'] . ' :</b></td> + <td class="number"><b>' . locale_number_format($OrdersTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td> + </tr> + </tfoot> </table>'; } //rows > 0 } //OrderSecurity include('includes/footer.inc'); -?> +?> \ No newline at end of file Modified: trunk/SelectSalesOrder.php =================================================================== --- trunk/SelectSalesOrder.php 2014-09-20 02:33:13 UTC (rev 6896) +++ trunk/SelectSalesOrder.php 2014-09-21 05:07:16 UTC (rev 6897) @@ -763,32 +763,32 @@ /*Check authority to create POs if user has authority then show the check boxes to select sales orders to place POs for otherwise don't provide this option */ if ($AuthRow['cancreate']==0 AND $myrow['poplaced']==0){ //cancreate==0 if the user can create POs and not already placed - printf('<td><a href="%s">%s</a></td> - <td><a href="%s">' . _('Invoice') . '</a></td> - <td><a target="_blank" href="%s">' . $PrintText . ' <img src="' .$RootPath.'/css/'.$Theme.'/images/pdf.png" title="' . _('Click for PDF') . '" alt="" /></a></td> - <td>%s</td> - <td>%s</td> - <td>%s</td> - <td>%s</td> - <td>%s</td> - <td>%s</td> - <td class="number">%s</td> - <td><input type="checkbox" name="PlacePO_%s" /><input type="hidden" name="OrderNo_PO_%s" value="%s" /></td> - </tr>', - $ModifyPage, - $myrow['orderno'], + printf('<td><a href="%s">%s</a></td> + <td><a href="%s">' . _('Invoice') . '</a></td> + <td><a target="_blank" href="%s">' . $PrintText . ' <img src="' .$RootPath.'/css/'.$Theme.'/images/pdf.png" title="' . _('Click for PDF') . '" alt="" /></a></td> + <td>%s</td> + <td>%s</td> + <td>%s</td> + <td>%s</td> + <td>%s</td> + <td>%s</td> + <td class="number">%s</td> + <td><input type="checkbox" name="PlacePO_%s" /><input type="hidden" name="OrderNo_PO_%s" value="%s" /></td> + </tr>', + $ModifyPage, + $myrow['orderno'], $Confirm_Invoice, - $PrintDispatchNote, - $myrow['name'], - $myrow['brname'], - $myrow['customerref'], - $FormatedOrderDate, - $FormatedDelDate, - html_entity_decode($myrow['deliverto'],ENT_QUOTES,'UTF-8'), - $FormatedOrderValue, - $i, - $i, - $myrow['orderno']); + $PrintDispatchNote, + $myrow['name'], + $myrow['brname'], + $myrow['customerref'], + $FormatedOrderDate, + $FormatedDelDate, + html_entity_decode($myrow['deliverto'],ENT_QUOTES,'UTF-8'), + $FormatedOrderValue, + $i, + $i, + $myrow['orderno']); } else { /*User is not authorised to create POs so don't even show the option */ printf('<td><a href="%s">%s</a></td> <td><a href="%s">' . _('Invoice') . '</a></td> Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2014-09-20 02:33:13 UTC (rev 6896) +++ trunk/doc/Change.log 2014-09-21 05:07:16 UTC (rev 6897) @@ -1,5 +1,6 @@ webERP Change Log +21/9/14 Phil: Tidy up Dashboard to remove redundant code etc 20/9/14 Phil: Move the DB Maintenance/GetConfig/Exchange rates update/audit trail purge inside UserLogin.php to ensure they do no add unecessary overhead to every page 20/9/14 Bob Thomas: StockStatus incorrectly displaying quantity on order extended by conversion units 11/09/14 RChacon: Add ascending class to PaymentMethods.php to have sortable columns. Modified: trunk/includes/UserLogin.php =================================================================== --- trunk/includes/UserLogin.php 2014-09-20 02:33:13 UTC (rev 6896) +++ trunk/includes/UserLogin.php 2014-09-21 05:07:16 UTC (rev 6897) @@ -20,6 +20,8 @@ function userLogin($Name, $Password, $SysAdminEmail = '', $db) { global $debug; + global $PathPrefix; + global $Version; if (!isset($_SESSION['AccessLevel']) OR $_SESSION['AccessLevel'] == '' OR (isset($Name) AND $Name != '')) { @@ -274,4 +276,4 @@ return UL_OK; /* All is well */ } -?> +?> \ No newline at end of file Modified: trunk/includes/session.inc =================================================================== --- trunk/includes/session.inc 2014-09-20 02:33:13 UTC (rev 6896) +++ trunk/includes/session.inc 2014-09-21 05:07:16 UTC (rev 6897) @@ -80,15 +80,14 @@ } include($PathPrefix . 'includes/LanguageSetup.php'); - +$FirstLogin = False; if (!isset($AllowAnyone)){ /* only do security checks if AllowAnyone is not true */ include $PathPrefix . 'includes/UserLogin.php'; /* Login checking and setup */ if (isset($_POST['UserNameEntryField']) AND isset($_POST['Password'])) { $rc = userLogin($_POST['UserNameEntryField'], $_POST['Password'], $SysAdminEmail, $db); - header('Location: ' . $PathPrefix .'Dashboard.php'); - exit; + $FirstLogin = true; } elseif (empty($_SESSION['DatabaseName'])) { $rc = UL_SHOWLOGIN; } else { @@ -195,17 +194,25 @@ //$PageSecurity = 9 hard coded for supplier access Supplier access must have just 9 and 0 tokens if (in_array(9,$_SESSION['AllowedPageSecurityTokens']) AND count($_SESSION['AllowedPageSecurityTokens'])==2){ - $SupplierLogin=1; + $SupplierLogin = 1; +} else { + $SupplierLogin = 0; //false } if (in_array(1,$_SESSION['AllowedPageSecurityTokens']) AND count($_SESSION['AllowedPageSecurityTokens'])==2){ $CustomerLogin = 1; +} else { + $CustomerLogin = 0; } - if (in_array($_SESSION['PageSecurityArray']['WWW_Users.php'], $_SESSION['AllowedPageSecurityTokens'])) { /*System administrator login */ $debug = 1; //allow debug messages } else { $debug = 0; //don't allow debug messages } +if ($FirstLogin AND !$SupplierLogin AND !$CustomerLogin) { + header('Location: ' . $PathPrefix .'Dashboard.php'); +} + + function CryptPass( $Password ) { if (PHP_VERSION_ID < 50500) { $Salt = base64_encode(mcrypt_create_iv(22, MCRYPT_DEV_URANDOM)); |
From: <rc...@us...> - 2014-09-27 17:06:50
|
Revision: 6900 http://sourceforge.net/p/web-erp/reponame/6900 Author: rchacon Date: 2014-09-27 17:06:42 +0000 (Sat, 27 Sep 2014) Log Message: ----------- Add ascending class to have sortable columns, complete table-heads and add documentation. Modified Paths: -------------- trunk/AccountSections.php trunk/CustomerInquiry.php trunk/GLAccounts.php trunk/doc/Change.log Modified: trunk/AccountSections.php =================================================================== --- trunk/AccountSections.php 2014-09-27 14:45:09 UTC (rev 6899) +++ trunk/AccountSections.php 2014-09-27 17:06:42 UTC (rev 6900) @@ -1,14 +1,11 @@ <?php - /* $Id$*/ include('includes/session.inc'); - $Title = _('Account Sections'); - -$ViewTopic = 'GeneralLedger'; -$BookMark = 'AccountSections'; - +/* Manual links before header.inc */ +$ViewTopic = 'GeneralLedger';// Filename in ManualContents.php's TOC. +$BookMark = 'AccountSections';// Anchor's id in the manual's html document. include('includes/header.inc'); // SOME TEST TO ENSURE THAT AT LEAST INCOME AND COST OF SALES ARE THERE @@ -169,12 +166,13 @@ $ErrMsg = _('Could not get account group sections because'); $result = DB_query($sql,$db,$ErrMsg); - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '<br /></p>'; + echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" />' . ' ' . $Title . '</p><br />'; echo '<table class="selection"> <tr> <th class="ascending">' . _('Section Number') . '</th> <th class="ascending">' . _('Section Description') . '</th> + <th colspan="2"> </th> </tr>'; $k=0; //row colour counter Modified: trunk/CustomerInquiry.php =================================================================== --- trunk/CustomerInquiry.php 2014-09-27 14:45:09 UTC (rev 6899) +++ trunk/CustomerInquiry.php 2014-09-27 17:06:42 UTC (rev 6900) @@ -1,4 +1,5 @@ <?php +/* $Id$*/ include('includes/session.inc'); $Title = _('Customer Inquiry'); @@ -164,7 +165,7 @@ </tr> </table>'; -echo '<form onSubmit="return VerifyForm(this);" action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post" class="noPrint"> +echo '<div class="centre"><form onSubmit="return VerifyForm(this);" action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post" class="noPrint"> <input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />'; echo _('Show all transactions after'), ':<input tabindex="1" type="text" required="required" class="date" alt="', $_SESSION['DefaultDateFormat'], '" id="datepicker" name="TransAfterDate" value="', $_POST['TransAfterDate'], '" minlength="0" maxlength="10" size="12" />'; @@ -187,7 +188,7 @@ echo '</select>'; echo '<input tabindex="3" type="submit" name="Refresh Inquiry" value="', _('Refresh Inquiry'), '" /> - </form>'; + </form></div>'; $DateAfterCriteria = FormatDateForSQL($_POST['TransAfterDate']); @@ -231,11 +232,11 @@ echo '<table class="selection"> <tr> - <th class="SortableColumn">', _('Type'), '</th> - <th class="SortableColumn">', _('Number'), '</th> - <th class="SortableColumn">', _('Date'), '</th> + <th class="ascending">', _('Type'), '</th> + <th class="ascending">', _('Number'), '</th> + <th class="ascending">', _('Date'), '</th> <th>', _('Branch'), '</th> - <th class="SortableColumn">', _('Reference'), '</th> + <th class="ascending">', _('Reference'), '</th> <th>', _('Comments'), '</th> <th>', _('Order'), '</th> <th>', _('Total'), '</th> Modified: trunk/GLAccounts.php =================================================================== --- trunk/GLAccounts.php 2014-09-27 14:45:09 UTC (rev 6899) +++ trunk/GLAccounts.php 2014-09-27 17:06:42 UTC (rev 6900) @@ -3,10 +3,9 @@ include('includes/session.inc'); $Title = _('Chart of Accounts Maintenance'); - -$ViewTopic= 'GeneralLedger'; -$BookMark = 'GLAccounts'; - +/* Manual links before header.inc */ +$ViewTopic= 'GeneralLedger';// Filename in ManualContents.php's TOC. +$BookMark = 'GLAccounts';// Anchor's id in the manual's html document. include('includes/header.inc'); if (isset($_POST['SelectedAccount'])){ @@ -15,8 +14,8 @@ $SelectedAccount = $_GET['SelectedAccount']; } -echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . - _('General Ledger Accounts') . '" alt="" />' . ' ' . $Title . '</p>'; +echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . + _('General Ledger Accounts') . '" />' . ' ' . $Title . '</p>'; if (isset($_POST['submit'])) { @@ -292,10 +291,11 @@ echo '<br /><table class="selection">'; echo '<tr> - <th>' . _('Account Code') . '</th> - <th>' . _('Account Name') . '</th> - <th>' . _('Account Group') . '</th> - <th>' . _('P/L or B/S') . '</th> + <th class="ascending">' . _('Account Code') . '</th> + <th class="ascending">' . _('Account Name') . '</th> + <th class="ascending">' . _('Account Group') . '</th> + <th class="ascending">' . _('P/L or B/S') . '</th> + <th colspan="2"> </th> </tr>'; $k=0; //row colour counter @@ -340,4 +340,4 @@ } include('includes/footer.inc'); -?> +?> \ No newline at end of file Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2014-09-27 14:45:09 UTC (rev 6899) +++ trunk/doc/Change.log 2014-09-27 17:06:42 UTC (rev 6900) @@ -1,9 +1,10 @@ webERP Change Log +27/09/14 RChacon: Add ascending class to have sortable columns, complete table-heads and add documentation. 21/9/14 Phil: Tidy up Dashboard to remove redundant code etc 20/9/14 Phil: Move the DB Maintenance/GetConfig/Exchange rates update/audit trail purge inside UserLogin.php to ensure they do no add unecessary overhead to every page 20/9/14 Bob Thomas: StockStatus incorrectly displaying quantity on order extended by conversion units -11/09/14 RChacon: Add ascending class to PaymentMethods.php to have sortable columns. +19/09/14 RChacon: Add ascending class to PaymentMethods.php to have sortable columns. 17/9/14 Phil: Moved the audit log purge to occur if DB_Maintenance is set to run 16/9/14 Phil: Added BNZ GIFTS format for bank account transaction imports 15/09/14 Exson: fixed the date format errors in WorkOrderEntry.php. |
From: <dai...@us...> - 2014-10-03 21:29:04
|
Revision: 6905 http://sourceforge.net/p/web-erp/reponame/6905 Author: daintree Date: 2014-10-03 21:28:56 +0000 (Fri, 03 Oct 2014) Log Message: ----------- defaulted factory location from WOIssues WO record Modified Paths: -------------- trunk/WorkOrderIssue.php trunk/doc/Change.log trunk/includes/ImportBankTrans_MT940_SCB.php Modified: trunk/WorkOrderIssue.php =================================================================== --- trunk/WorkOrderIssue.php 2014-09-30 08:55:26 UTC (rev 6904) +++ trunk/WorkOrderIssue.php 2014-10-03 21:28:56 UTC (rev 6905) @@ -564,6 +564,10 @@ } DB_data_seek($WOResult,0); +if (!isset($_POST['FromLocation'])){ + $_POST['FromLocation']=$WORow['loccode']; +} + while($WORow = DB_fetch_array($WOResult)){ echo '<tr> @@ -581,19 +585,17 @@ <td>'; if (!isset($_POST['IssueItem'])){ - $LocResult = DB_query("SELECT locations.loccode,locationname + $LocResult = DB_query("SELECT locations.loccode,locationname FROM locations - INNER JOIN locationusers - ON locationusers.loccode=locations.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' + INNER JOIN locationusers + ON locationusers.loccode=locations.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canupd=1 WHERE locations.usedforwo = 1",$db); echo '<select name="FromLocation">'; - if (!isset($_POST['FromLocation'])){ - $_POST['FromLocation']=$WORow['loccode']; - } + while ($LocRow = DB_fetch_array($LocResult)){ if ($_POST['FromLocation'] ==$LocRow['loccode']){ echo '<option selected="selected" value="' . $LocRow['loccode'] .'">' . $LocRow['locationname'] . '</option>'; Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2014-09-30 08:55:26 UTC (rev 6904) +++ trunk/doc/Change.log 2014-10-03 21:28:56 UTC (rev 6905) @@ -1,5 +1,7 @@ webERP Change Log -30/09/14 Exson: Fixed the purchase order details status to be right when the PO is recovered from Cancelled status. + +4/10/14 Andrew Galuski: defaulted factory location from WO record +30/09/14 Exson: Fixed the purchase order details status to be right when the PO is recovered from Cancelled status. 29/09/14 Exson: Change charset from latin1 to utf8 for supplierdiscounts. 27/09/14 RChacon: Add ascending class to have sortable columns, complete table-heads and add documentation. 21/9/14 Phil: Tidy up Dashboard to remove redundant code etc Modified: trunk/includes/ImportBankTrans_MT940_SCB.php =================================================================== --- trunk/includes/ImportBankTrans_MT940_SCB.php 2014-09-30 08:55:26 UTC (rev 6904) +++ trunk/includes/ImportBankTrans_MT940_SCB.php 2014-10-03 21:28:56 UTC (rev 6905) @@ -33,9 +33,9 @@ $ReadTheFile ='No'; } if ($DebitOrCredit =='D'){ + $_SESSION['Statement']->OpeningBalance = doubleval('-' . str_replace(',','.',substr($LineText,15))); + } else { $_SESSION['Statement']->OpeningBalance = doubleval(str_replace(',','.',substr($LineText,15))); - } else { - $_SESSION['Statement']->OpeningBalance = doubleval('-' . str_replace(',','.',substr($LineText,15))); } $TransactionLine = false; } @@ -53,9 +53,9 @@ //Need to find end of value amount - find the , decimal point + 2 characters $ValueEnd = strpos($LineText, ',', 12)+2; if ($DebitOrCredit =='D'){ + $TransAmount = doubleval('-' . str_replace(',','.',substr($LineText,12,$ValueEnd))); + } else { $TransAmount = doubleval(str_replace(',','.',substr($LineText,12,$ValueEnd))); - } else { - $TransAmount = doubleval('-' . str_replace(',','.',substr($LineText,12,$ValueEnd))); } } else { // it will be either D or C if (!is_numeric(substr($LineText,15,1)) ){ @@ -67,9 +67,9 @@ //Need to find end of value amount - find the , decimal point + 2 characters $ValueEnd = strpos($LineText, ',', $ValueStart)+2; if ($DebitOrCredit =='D'){ + $TransAmount = doubleval('-' . str_replace(',','.',substr($LineText,$ValueStart,$ValueEnd))); + } else { $TransAmount = doubleval(str_replace(',','.',substr($LineText,$ValueStart,$ValueEnd))); - } else { - $TransAmount = doubleval('-' . str_replace(',','.',substr($LineText,$ValueStart,$ValueEnd))); } } @@ -83,19 +83,19 @@ } } - if (substr($LineText,0,1)!=':' AND $TransactionLine){ + /* if (substr($LineText,0,1)!=':' AND $TransactionLine){ //then it is the continuation of an :86: line - $_SESSION['Trans'][$i]->Description .= $LineText; - } + $_SESSION['Trans'][$i]->Description .= $LineText; + }*/ if (substr($LineText,0,5)==':62F:'){ $DebitOrCredit = substr($LineText,5,1); //D or C $_SESSION['Statement']->ClosingDate = ConvertSQLDate('20' . substr($LineText,6,2) . '-' . substr($LineText,8,2) . '-' . substr($LineText,10,2)); $CurrCode = substr($LineText,12,3); if ($DebitOrCredit =='D'){ + $_SESSION['Statement']->ClosingBalance = doubleval('-' . str_replace(',','.',substr($LineText,15))); + } else { $_SESSION['Statement']->ClosingBalance = doubleval(str_replace(',','.',substr($LineText,15))); - } else { - $_SESSION['Statement']->ClosingBalance = doubleval('-' . str_replace(',','.',substr($LineText,15))); } $TransactionLine = false; } |
From: <dai...@us...> - 2014-10-04 03:41:03
|
Revision: 6906 http://sourceforge.net/p/web-erp/reponame/6906 Author: daintree Date: 2014-10-04 03:40:57 +0000 (Sat, 04 Oct 2014) Log Message: ----------- invoice attempt to lose rounding issue Modified Paths: -------------- trunk/ConfirmDispatch_Invoice.php trunk/doc/INSTALL.txt Modified: trunk/ConfirmDispatch_Invoice.php =================================================================== --- trunk/ConfirmDispatch_Invoice.php 2014-10-03 21:28:56 UTC (rev 6905) +++ trunk/ConfirmDispatch_Invoice.php 2014-10-04 03:40:57 UTC (rev 6906) @@ -245,7 +245,7 @@ foreach ($Itm->SerialItems as $SerialItem) { //calculate QtyDispatched from bundle quantities $_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->QtyDispatched += $SerialItem->BundleQty; } - //Preventing from dispatched more than ordered. Since it's controlled items, users must select the batch/lot again. + //Preventing from dispatched more than ordered. Since it's controlled items, users must select the batch/lot again. if($_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->QtyDispatched > ($_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->Quantity - $_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->QtyInv)){ prnMsg(_('Dispathed Quantity should not be more than order balanced quantity').'. '._('To dispatch quantity is').' '.$_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->QtyDispatched.' '._('And the order balance is ').' '.($_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->Quantity - $_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->QtyInv),'error'); include('includes/footer.inc'); @@ -561,12 +561,6 @@ $DisplaySubTotal = locale_number_format(($_SESSION['Items'.$identifier]->total + filter_number_format($_POST['ChargeFreightCost'])),$_SESSION['Items'.$identifier]->CurrDecimalPlaces); - -/* round the totals to avoid silly entries */ -$TaxTotal = round($TaxTotal,$_SESSION['Items'.$identifier]->CurrDecimalPlaces); -$_SESSION['Items'.$identifier]->total = round($_SESSION['Items'.$identifier]->total,$_SESSION['Items'.$identifier]->CurrDecimalPlaces); -$_POST['ChargeFreightCost'] = round(filter_number_format($_POST['ChargeFreightCost']),$_SESSION['Items'.$identifier]->CurrDecimalPlaces); - echo '<tr> <td colspan="8" class="number">' . _('Invoice Totals'). '</td> <td class="number"><hr /><b>' . $DisplaySubTotal . '</b><hr /></td> @@ -575,6 +569,7 @@ <td class="number"><hr /><b>' . locale_number_format($TaxTotal+($_SESSION['Items'.$identifier]->total + $_POST['ChargeFreightCost']),$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</b><hr /></td> </tr>'; + if (! isset($_POST['DispatchDate']) OR ! Is_Date($_POST['DispatchDate'])){ $DefaultDispatchDate = Date($_SESSION['DefaultDateFormat'],CalcEarliestDispatchDate()); } else { @@ -1376,7 +1371,7 @@ '" . $PeriodNo . "', '" . $SalesGLAccounts['salesglcode'] . "', '" . $_SESSION['Items'.$identifier]->DebtorNo . " - " . $OrderLine->StockID . " x " . $OrderLine->QtyDispatched . " @ " . $OrderLine->Price . "', - '" . round((-$OrderLine->Price * $OrderLine->QtyDispatched/$_SESSION['CurrencyRate']),$_SESSION['CompanyRecord']['decimalplaces']) . "')"; + '" . (-$OrderLine->Price * $OrderLine->QtyDispatched/$_SESSION['CurrencyRate']) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The sales GL posting could not be inserted because'); $DbgMsg = '<br />' ._('The following SQL to insert the GLTrans record was used'); @@ -1398,7 +1393,7 @@ '" . $PeriodNo . "', '" . $SalesGLAccounts['discountglcode'] . "', '" . $_SESSION['Items'.$identifier]->DebtorNo . " - " . $OrderLine->StockID . " @ " . ($OrderLine->DiscountPercent * 100) . "%', - '" . round(($OrderLine->Price * $OrderLine->QtyDispatched * $OrderLine->DiscountPercent/$_SESSION['CurrencyRate']),$_SESSION['CompanyRecord']['decimalplaces']) . "')"; + '" . ($OrderLine->Price * $OrderLine->QtyDispatched * $OrderLine->DiscountPercent/$_SESSION['CurrencyRate']) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The sales discount GL posting could not be inserted because'); $DbgMsg = _('The following SQL to insert the GLTrans record was used'); @@ -1510,7 +1505,7 @@ '" . $PeriodNo . "', '" . $DisposalRow['disposalact'] . "', '" . $_SESSION['Items'.$identifier]->DebtorNo . " - " . $OrderLine->StockID . ' ' . _('asset disposal proceeds') . "', - '" . round((-$OrderLine->Price * $OrderLine->QtyDispatched* (1 - $OrderLine->DiscountPercent)/$_SESSION['CurrencyRate']),$_SESSION['CompanyRecord']['decimalplaces']) . "')"; + '" . (-$OrderLine->Price * $OrderLine->QtyDispatched* (1 - $OrderLine->DiscountPercent)/$_SESSION['CurrencyRate']) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The disposal proceeds GL posting could not be inserted because'); $DbgMsg = '<br />' ._('The following SQL to insert the GLTrans record was used'); @@ -1576,7 +1571,7 @@ '" . $PeriodNo . "', '" . $_SESSION['CompanyRecord']['debtorsact'] . "', '" . $_SESSION['Items'.$identifier]->DebtorNo . "', - '" . round((($_SESSION['Items'.$identifier]->total + $_SESSION['Items'.$identifier]->FreightCost + $TaxTotal)/$_SESSION['CurrencyRate']),$_SESSION['CompanyRecord']['decimalplaces']) . "')"; + '" . (($_SESSION['Items'.$identifier]->total + $_SESSION['Items'.$identifier]->FreightCost + $TaxTotal)/$_SESSION['CurrencyRate']) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The total debtor GL posting could not be inserted because'); $DbgMsg = _('The following SQL to insert the total debtors control GLTrans record was used'); @@ -1601,7 +1596,7 @@ '" . $PeriodNo . "', '" . $_SESSION['CompanyRecord']['freightact'] . "', '" . $_SESSION['Items'.$identifier]->DebtorNo . "', - '" . round((-$_SESSION['Items'.$identifier]->FreightCost/$_SESSION['CurrencyRate']),$_SESSION['CompanyRecord']['decimalplaces']) . "')"; + '" . (-$_SESSION['Items'.$identifier]->FreightCost/$_SESSION['CurrencyRate']) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The freight GL posting could not be inserted because'); $DbgMsg = _('The following SQL to insert the GLTrans record was used'); @@ -1623,7 +1618,7 @@ '" . $PeriodNo . "', '" . $TaxGLCodes[$TaxAuthID] . "', '" . $_SESSION['Items'.$identifier]->DebtorNo . "', - '" . round((-$TaxAmount/$_SESSION['CurrencyRate']),$_SESSION['CompanyRecord']['decimalplaces']) . "')"; + '" . (-$TaxAmount/$_SESSION['CurrencyRate']) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The tax GL posting could not be inserted because'); $DbgMsg = _('The following SQL to insert the GLTrans record was used'); Modified: trunk/doc/INSTALL.txt =================================================================== --- trunk/doc/INSTALL.txt 2014-10-03 21:28:56 UTC (rev 6905) +++ trunk/doc/INSTALL.txt 2014-10-04 03:40:57 UTC (rev 6906) @@ -18,7 +18,7 @@ at the beginning of the script. Where mydatabase is the name of the company database that you are using in your webERP installation. -It is recommended to use phpMyAdmin to run the upgrade script since you select the database to use using the web GUI and you can click on the import tab and select the upgrade script to run against the DB more easily. +It is recommended to use phpMyAdmin to run the upgrade script since you select the database to use using the web GUI and you can click on the import tab and select the upgrade script to run against the DB more easily. If you are running the upgrade script with the mysql command line client, after editing the script as described above the syntax to use is as follows: @@ -27,16 +27,16 @@ where weberp_db_user is the name of your mysql user and some_pass is the password for that user. -If you have some modified scripts that you require these should be saved in a separate directory for the purposes of reworking against the new scripts. +If you have some modified scripts that you require these should be saved in a separate directory for the purposes of reworking against the new scripts. The old version scripts should be deleted and the new scripts extracted to the webERP installation directory under the web-server root directory. config.php will require modification for your database username and password and company specific details. ***************New Installations*************** -There is an automated Installation script to +There is an automated Installation script to -Extract the webERP archive under your web-root directory (folder). Browse to the +Extract the webERP archive under your web-root directory (folder). Browse to the http://yourhost/webERP/ @@ -56,7 +56,7 @@ - A working PHP web server - v 5.0 or later is required (it no longer works with versions prior) PHP must have support for mysql databases (either mysql or mysqli), gd, gettext (for translations), libxml, mbstring and ftp - A working MySQL server (MySql version 4.1 or above - innodb tables MUST be enabled - check your my.cnf file to ensure innodb tables are enabled (normally under /etc/my.cnf or the mysql data directory - see the MySQL manual). -Installing these components are well covered elsewhere - but if you need to install these components the recommended solution under windows would be to download and install apache2triad - http://apache2triad.net/ or under windows or *nix download and install XAMPP - http://www.apachefriends.org/en/xampp.html +Installing these components are well covered elsewhere - but if you need to install these components the recommended solution under windows would be to download and install AMPPS see http://www.ampps.com/ or under windows. AMPPS also has a one click install option for webERP and a multitude of other PHP/MYSQL - LAMP stack web-applications. On *nix download and install XAMPP - https://www.apachefriends.org/index.html PHP must have the register globals configuration parameter set to off. This is the default (now). This flag can be set in the php.ini on the server. If it can't be changed on the server's php.ini, it is possibe for apache web servers to alter the configuration using a file called .htaccess. A .htaccess file is included in the webERP directory that ensures the register_globals flag is set to off for those web-servers that support .htaccess files. @@ -144,7 +144,7 @@ 2. Creating the Database -MySQL version 4.1 or above is required +MySQL version 4.1 or above is required INNODB TABLES MUST BE ENABLED IN THE MYSQL SERVER. @@ -198,7 +198,7 @@ 1. demo.sql This has a minimal amount of demonstration data in a bogus company set up so that transactions can be tried to see how the system works. 2. default.sql This script has only the basic data necessary to start a new company system off. If you wish to set up your company on webERP then this is the script to use. weberp-new.sql you will need to create a database first (using phpMyAdmin for example) or add the following sql commands to this script - CREATE DATABASE mycompanyname DEFAULT CHARACTER SET utf8 DEFAULT + CREATE DATABASE mycompanyname DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unicode_ci; USE mycompanyname @@ -222,7 +222,7 @@ 3. Editing config.php -The webERP archive no longer comes with a config.php file. There is now a web-based installer that is activated when there is no config.php file. Simply browse to your webERP installation with the URL +The webERP archive no longer comes with a config.php file. There is now a web-based installer that is activated when there is no config.php file. Simply browse to your webERP installation with the URL http://yourdomain/webERP/ in your browser, @@ -259,7 +259,7 @@ //DefaultLanguage $DefaultLanguage ='en_GB.utf8'; -// Whether to display the admin login and password or not +// Whether to display the admin login and password or not $AllowDemoMode = True; // Application version @@ -341,7 +341,7 @@ All the standing configuration data is defined from the system setup tab and each link should be reviewed to enter appropriate data for the business. The manual has a section on Getting Started which is essential reading before going live. -Please try not to refer questions about PHP or database configuration +Please try not to refer questions about PHP or database configuration - check your PHP web server works by installing phpMyAdmin before referring any installation issues - check http://www.weberp.org for Installation FAQ |
From: <te...@us...> - 2014-10-05 13:15:00
|
Revision: 6907 http://sourceforge.net/p/web-erp/reponame/6907 Author: tehonu Date: 2014-10-05 13:14:49 +0000 (Sun, 05 Oct 2014) Log Message: ----------- Use of GetQuantityOnOrderDueToPurchaseOrders() and GetQuantityOnOrderDueToWorkOrders() to calculate QOO Modified Paths: -------------- trunk/CounterReturns.php trunk/CounterSales.php trunk/InventoryPlanning.php trunk/InventoryPlanningPrefSupplier.php trunk/SelectOrderItems.php trunk/SelectProduct.php trunk/StockLocStatus.php trunk/StockStatus.php trunk/TopItems.php trunk/includes/SQL_CommonFunctions.inc Modified: trunk/CounterReturns.php =================================================================== --- trunk/CounterReturns.php 2014-10-04 03:40:57 UTC (rev 6906) +++ trunk/CounterReturns.php 2014-10-05 13:14:49 UTC (rev 6907) @@ -1724,39 +1724,11 @@ $DemandQty = 0; } - // Find the quantity on purchase orders - $sql = "SELECT SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS QOO - FROM purchorderdetails INNER JOIN purchorders - ON purchorderdetails.orderno=purchorders.orderno - WHERE purchorderdetails.completed=0 - AND purchorders.status <>'Cancelled' - AND purchorders.status <>'Rejected' - AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'"; + // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc + $QOO= GetQuantityOnOrderDueToPurchaseOrders($myrow['stockid'], "", $db); + // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc + $QOO += GetQuantityOnOrderDueToWorkOrders($myrow['stockid'], "", $db); - $ErrMsg = _('The order details for this product cannot be retrieved because'); - $PurchResult = DB_query($sql,$db,$ErrMsg); - - $PurchRow = DB_fetch_row($PurchResult); - if ($PurchRow[0]!=null){ - $PurchQty = $PurchRow[0]; - } else { - $PurchQty = 0; - } - - // Find the quantity on works orders - $sql = "SELECT SUM(woitems.qtyreqd - woitems.qtyrecd) AS dedm - FROM woitems - WHERE stockid='" . $myrow['stockid'] ."'"; - $ErrMsg = _('The order details for this product cannot be retrieved because'); - $WoResult = DB_query($sql,$db,$ErrMsg); - - $WoRow = DB_fetch_row($WoResult); - if ($WoRow[0]!=null){ - $WoQty = $WoRow[0]; - } else { - $WoQty = 0; - } - if ($k==1){ echo '<tr class="EvenTableRows">'; $k=0; @@ -1764,9 +1736,8 @@ echo '<tr class="OddTableRows">'; $k=1; } - $OnOrder = $PurchQty + $WoQty; - $Available = $QOH - $DemandQty + $OnOrder; + $Available = $QOH - $DemandQty + $QOO; printf('<td>%s</td> <td title="%s">%s</td> @@ -1783,7 +1754,7 @@ $myrow['units'], locale_number_format($QOH, $myrow['decimalplaces']), locale_number_format($DemandQty, $myrow['decimalplaces']), - locale_number_format($OnOrder, $myrow['decimalplaces']), + locale_number_format($QOO, $myrow['decimalplaces']), locale_number_format($Available, $myrow['decimalplaces']), $i, $i, Modified: trunk/CounterSales.php =================================================================== --- trunk/CounterSales.php 2014-10-04 03:40:57 UTC (rev 6906) +++ trunk/CounterSales.php 2014-10-05 13:14:49 UTC (rev 6907) @@ -1183,29 +1183,11 @@ $AssemblyDemandRow = DB_fetch_row($AssemblyDemandResult); $QuantityAssemblyDemand = $AssemblyDemandRow[0]; - $SQL = "SELECT SUM(purchorderdetails.quantityord - purchorderdetails.quantityrecd) as qtyonorder - FROM purchorderdetails INNER JOIN purchorders - ON purchorderdetails.orderno = purchorders.orderno - WHERE purchorderdetails.itemcode = '" . $StockItem->StockID . "' - AND purchorderdetails.completed = 0 - AND purchorders.status<>'Cancelled' - AND purchorders.status<>'Rejected' - AND purchorders.status<>'Pending' - AND purchorders.status<>'Completed'"; - $PurchOrdersResult = DB_query($SQL,$db); - $PurchOrdersRow = DB_fetch_row($PurchOrdersResult); - $QuantityPurchOrders = $PurchOrdersRow[0]; + // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc + $QuantityPurchOrders= GetQuantityOnOrderDueToPurchaseOrders($StockItem->StockID, "", $db); + // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc + $QuantityWorkOrders = GetQuantityOnOrderDueToWorkOrders($StockItem->StockID, "", $db); - $SQL = "SELECT SUM(woitems.qtyreqd - woitems.qtyrecd) as qtyonorder - FROM woitems INNER JOIN workorders - ON woitems.wo=workorders.wo - WHERE woitems.stockid = '" . $StockItem->StockID . "' - AND woitems.qtyreqd > woitems.qtyrecd - AND workorders.closed = 0"; - $WorkOrdersResult = DB_query($SQL,$db); - $WorkOrdersRow = DB_fetch_row($WorkOrdersResult); - $QuantityWorkOrders = $WorkOrdersRow[0]; - //Now we have the data - do we need to make any more? $ShortfallQuantity = $QOH-$QuantityDemand-$QuantityAssemblyDemand+$QuantityPurchOrders+$QuantityWorkOrders; @@ -2153,38 +2135,12 @@ } else { $DemandQty = 0; } - // Find the quantity on purchase orders - $sql = "SELECT SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS QOO - FROM purchorderdetails INNER JOIN purchorders - ON purchorderdetails.orderno=purchorders.orderno - WHERE purchorderdetails.completed=0 - AND purchorders.status<>'Cancelled' - AND purchorders.status<>'Rejected' - AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'"; - $ErrMsg = _('The order details for this product cannot be retrieved because'); - $PurchResult = DB_query($sql,$db,$ErrMsg); + // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc + $QOO = GetQuantityOnOrderDueToPurchaseOrders($myrow['stockid'], "", $db); + // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc + $QOO += GetQuantityOnOrderDueToWorkOrders($myrow['stockid'], "", $db); - $PurchRow = DB_fetch_row($PurchResult); - if ($PurchRow[0]!=null){ - $PurchQty = $PurchRow[0]; - } else { - $PurchQty = 0; - } - - // Find the quantity on works orders - $sql = "SELECT SUM(woitems.qtyreqd - woitems.qtyrecd) AS dedm - FROM woitems - WHERE stockid='" . $myrow['stockid'] ."'"; - $ErrMsg = _('The order details for this product cannot be retrieved because'); - $WoResult = DB_query($sql,$db,$ErrMsg); - $WoRow = DB_fetch_row($WoResult); - if ($WoRow[0]!=null){ - $WoQty = $WoRow[0]; - } else { - $WoQty = 0; - } - if ($k==1){ echo '<tr class="EvenTableRows">'; $k=0; @@ -2192,9 +2148,8 @@ echo '<tr class="OddTableRows">'; $k=1; } - $OnOrder = $PurchQty + $WoQty; - $Available = $QOH - $DemandQty + $OnOrder; + $Available = $QOH - $DemandQty + $QOO; printf('<td>%s</td> <td>%s</td> @@ -2212,7 +2167,7 @@ $myrow['units'], $QOH, $DemandQty, - $OnOrder, + $QOO, $Available, $i, $i, @@ -2332,39 +2287,11 @@ $DemandQty = 0; } - // Find the quantity on purchase orders - $sql = "SELECT SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS QOO - FROM purchorderdetails INNER JOIN purchorders - WHERE purchorderdetails.completed=0 - AND purchorders.status <>'Cancelled' - AND purchorders.status <>'Rejected' - AND purchorders.status <>'Completed' - AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'"; + // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc + $QOO = GetQuantityOnOrderDueToPurchaseOrders($myrow['stockid'], "", $db); + // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc + $QOO += GetQuantityOnOrderDueToWorkOrders($myrow['stockid'], "", $db); - $ErrMsg = _('The order details for this product cannot be retrieved because'); - $PurchResult = DB_query($sql,$db,$ErrMsg); - - $PurchRow = DB_fetch_row($PurchResult); - if ($PurchRow[0]!=null){ - $PurchQty = $PurchRow[0]; - } else { - $PurchQty = 0; - } - - // Find the quantity on works orders - $sql = "SELECT SUM(woitems.qtyreqd - woitems.qtyrecd) AS dedm - FROM woitems - WHERE stockid='" . $myrow['stockid'] ."'"; - $ErrMsg = _('The order details for this product cannot be retrieved because'); - $WoResult = DB_query($sql,$db,$ErrMsg); - - $WoRow = DB_fetch_row($WoResult); - if ($WoRow[0]!=null){ - $WoQty = $WoRow[0]; - } else { - $WoQty = 0; - } - if ($k==1){ echo '<tr class="EvenTableRows">'; $k=0; @@ -2372,9 +2299,8 @@ echo '<tr class="OddTableRows">'; $k=1; } - $OnOrder = $PurchQty + $WoQty; - $Available = $QOH - $DemandQty + $OnOrder; + $Available = $QOH - $DemandQty + $QOO; printf('<td>%s</td> <td>%s</td> @@ -2390,7 +2316,7 @@ $myrow['units'], locale_number_format($QOH, $myrow['decimalplaces']), locale_number_format($DemandQty, $myrow['decimalplaces']), - locale_number_format($OnOrder, $myrow['decimalplaces']), + locale_number_format($QOO, $myrow['decimalplaces']), locale_number_format($Available, $myrow['decimalplaces']), $i, $i, Modified: trunk/InventoryPlanning.php =================================================================== --- trunk/InventoryPlanning.php 2014-10-04 03:40:57 UTC (rev 6906) +++ trunk/InventoryPlanning.php 2014-10-05 13:14:49 UTC (rev 6907) @@ -7,6 +7,8 @@ $ViewTopic= "Inventory"; $BookMark = "PlanningReport"; +include ('includes/SQL_CommonFunctions.inc'); + if (isset($_POST['PrintPDF']) and isset($_POST['FromCriteria']) and mb_strlen($_POST['FromCriteria'])>=1 @@ -274,50 +276,20 @@ exit; } + // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc + // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc if ($_POST['Location']=='All'){ - $SQL = "SELECT SUM(purchorderdetails.quantityord - purchorderdetails.quantityrecd) as qtyonorder - FROM purchorderdetails INNER JOIN purchorders - ON purchorderdetails.orderno = purchorders.orderno - INNER JOIN locationusers ON locationusers.loccode=purchorders.intostocklocation AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 - WHERE purchorderdetails.itemcode = '" . $InventoryPlan['stockid'] . "' - AND purchorderdetails.completed = 0 - AND purchorders.status <> 'Cancelled' - AND purchorders.status <> 'Rejected' - AND purchorders.status <> 'Pending' - AND purchorders.status <> 'Completed'"; + $QOO = GetQuantityOnOrderDueToPurchaseOrders($InventoryPlan['stockid'], "", $db); + $QOO += GetQuantityOnOrderDueToWorkOrders($InventoryPlan['stockid'], "", $db); } else { - $SQL = "SELECT SUM(purchorderdetails.quantityord - purchorderdetails.quantityrecd) as qtyonorder - FROM purchorderdetails INNER JOIN purchorders - ON purchorderdetails.orderno = purchorders.orderno - INNER JOIN locationusers ON locationusers.loccode=purchorders.intostocklocation AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 - WHERE purchorderdetails.itemcode = '" . $InventoryPlan['stockid'] . "' - AND purchorderdetails.completed = 0 - AND purchorders.intostocklocation= '" . $_POST['Location'] . "' - AND purchorders.status <> 'Cancelled' - AND purchorders.status <> 'Rejected' - AND purchorders.status <> 'Pending' - AND purchorders.status <> 'Completed'"; + $QOO = GetQuantityOnOrderDueToPurchaseOrders($InventoryPlan['stockid'], $_POST['Location'], $db); + $QOO += GetQuantityOnOrderDueToWorkOrders($InventoryPlan['stockid'], $_POST['Location'], $db); } $DemandRow = DB_fetch_array($DemandResult); $BOMDemandRow = DB_fetch_array($BOMDemandResult); $TotalDemand = $DemandRow['qtydemand'] + $BOMDemandRow['dem']; - $OnOrdResult = DB_query($SQL,$db,'','',false,false); - if (DB_error_no($db) !=0) { - $Title = _('Inventory Planning') . ' - ' . _('Problem Report') . '....'; - include('includes/header.inc'); - prnMsg( _('The purchase order quantities could not be retrieved by the SQL because') . ' - ' . DB_error_msg($db),'error'); - echo '<br /><a href="' .$RootPath .'/index.php">' . _('Back to the menu') . '</a>'; - if ($debug==1){ - echo '<br />' . $SQL; - } - include('includes/footer.inc'); - exit; - } - - $OnOrdRow = DB_fetch_array($OnOrdResult); - $LeftOvers = $pdf->addTextWrap($Left_Margin, $YPos, 110, $FontSize, $InventoryPlan['stockid'], 'left'); $LeftOvers = $pdf->addTextWrap(130, $YPos, 120,6,$InventoryPlan['description'],'left'); $LeftOvers = $pdf->addTextWrap(251, $YPos, 40,$FontSize,locale_number_format($SalesRow['prd5'],0),'right'); @@ -343,9 +315,9 @@ $LeftOvers = $pdf->addTextWrap(597, $YPos, 40,$FontSize,locale_number_format($InventoryPlan['qoh'],0),'right'); $LeftOvers = $pdf->addTextWrap(638, $YPos, 40,$FontSize,locale_number_format($TotalDemand,0),'right'); - $LeftOvers = $pdf->addTextWrap(679, $YPos, 40,$FontSize,locale_number_format($OnOrdRow['qtyonorder'],0),'right'); + $LeftOvers = $pdf->addTextWrap(679, $YPos, 40,$FontSize,locale_number_format($QOO,0),'right'); - $SuggestedTopUpOrder = $IdealStockHolding - $InventoryPlan['qoh'] + $TotalDemand - $OnOrdRow['qtyonorder']; + $SuggestedTopUpOrder = $IdealStockHolding - $InventoryPlan['qoh'] + $TotalDemand - $QOO; if ($SuggestedTopUpOrder <=0){ $LeftOvers = $pdf->addTextWrap(720, $YPos, 40,$FontSize,' ','right'); Modified: trunk/InventoryPlanningPrefSupplier.php =================================================================== --- trunk/InventoryPlanningPrefSupplier.php 2014-10-04 03:40:57 UTC (rev 6906) +++ trunk/InventoryPlanningPrefSupplier.php 2014-10-05 13:14:49 UTC (rev 6907) @@ -97,6 +97,7 @@ } include('includes/session.inc'); +include ('includes/SQL_CommonFunctions.inc'); if (isset($_POST['PrintPDF'])){ @@ -142,59 +143,38 @@ /*Now figure out the inventory data to report for the category range under review need QOH, QOO, QDem, Sales Mth -1, Sales Mth -2, Sales Mth -3, Sales Mth -4*/ + $SQL = "SELECT stockmaster.description, + stockmaster.eoq, + locstock.stockid, + purchdata.supplierno, + suppliers.suppname, + purchdata.leadtime/30 AS monthsleadtime, + SUM(locstock.quantity) AS qoh + FROM locstock + INNER JOIN locationusers + ON locationusers.loccode=locstock.loccode + AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1, + stockmaster, + purchdata, + suppliers + WHERE locstock.stockid=stockmaster.stockid + AND purchdata.supplierno=suppliers.supplierid + AND (stockmaster.mbflag='B' OR stockmaster.mbflag='M') + AND purchdata.stockid=stockmaster.stockid + AND purchdata.preferred=1"; if ($_POST['Location']=='All'){ - - $SQL = "SELECT stockmaster.description, - stockmaster.eoq, - locstock.stockid, - purchdata.supplierno, - suppliers.suppname, - purchdata.leadtime/30 AS monthsleadtime, - SUM(locstock.quantity) AS qoh - FROM locstock - INNER JOIN locationusers ON locationusers.loccode=locstock.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1, - stockmaster, - purchdata, - suppliers - WHERE locstock.stockid=stockmaster.stockid - AND purchdata.supplierno=suppliers.supplierid - AND (stockmaster.mbflag='B' OR stockmaster.mbflag='M') - AND purchdata.stockid=stockmaster.stockid - AND purchdata.preferred=1 - GROUP BY - purchdata.supplierno, - stockmaster.description, - stockmaster.eoq, - locstock.stockid - ORDER BY purchdata.supplierno, - stockmaster.stockid"; - + $SQL .= " GROUP BY + purchdata.supplierno, + stockmaster.description, + stockmaster.eoq, + locstock.stockid + ORDER BY purchdata.supplierno, + stockmaster.stockid"; } else { - - $SQL = "SELECT - stockmaster.description, - stockmaster.eoq, - purchdata.supplierno, - suppliers.suppname, - locstock.stockid, - purchdata.leadtime/30 AS monthsleadtime, - locstock.quantity AS qoh - FROM locstock - INNER JOIN locationusers ON locationusers.loccode=locstock.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1, - stockmaster, - purchdata, - suppliers - WHERE locstock.stockid=stockmaster.stockid - AND purchdata.supplierno=suppliers.supplierid - AND (stockmaster.mbflag='B' OR stockmaster.mbflag='M') - AND purchdata.stockid=stockmaster.stockid - AND locstock.loccode = '" . $_POST['Location'] . "' - AND purchdata.preferred=1 - ORDER BY purchdata.supplierno, - stockmaster.stockid"; - - + $SQL .= " AND locstock.loccode = '" . $_POST['Location'] . "' + ORDER BY purchdata.supplierno, + stockmaster.stockid"; } $InventoryResult = DB_query($SQL, $db, '', '', false, false); $ListCount = DB_num_rows($InventoryResult); @@ -221,7 +201,6 @@ $Period_3 = $CurrentPeriod -3; $Period_4 = $CurrentPeriod -4; - while ($InventoryPlan = DB_fetch_array($InventoryResult,$db)){ if ($SupplierID!=$InventoryPlan['supplierno']){ @@ -239,32 +218,21 @@ $YPos -=$line_height; - - if ($_POST['Location']=='All'){ - $SQL = "SELECT SUM(CASE WHEN (prd>='" . $Period_1 . "' OR - prd<='" . $Period_4 . "') THEN -qty ELSE 0 END) AS 4mthtotal, - SUM(CASE WHEN prd='" . $Period_1 . "' THEN -qty ELSE 0 END) AS prd1, - SUM(CASE WHEN prd='" . $Period_2 . "' THEN -qty ELSE 0 END) AS prd2, - SUM(CASE WHEN prd='" . $Period_3 . "' THEN -qty ELSE 0 END) AS prd3, - SUM(CASE WHEN prd='" . $Period_4 . "' THEN -qty ELSE 0 END) AS prd4 - FROM stockmoves - INNER JOIN locationusers ON locationusers.loccode=stockmoves.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 - WHERE stockid='" . $InventoryPlan['stockid'] . "' - AND (type=10 OR type=11) - AND stockmoves.hidemovt=0"; - } else { - $SQL = "SELECT SUM(CASE WHEN (prd>='" . $Period_1 . "' OR - prd<='" . $Period_4 . "') THEN -qty ELSE 0 END) AS 4mthtotal, - SUM(CASE WHEN prd='" . $Period_1 . "' THEN -qty ELSE 0 END) AS prd1, - SUM(CASE WHEN prd='" . $Period_2 . "' THEN -qty ELSE 0 END) AS prd2, - SUM(CASE WHEN prd='" . $Period_3 . "' THEN -qty ELSE 0 END) AS prd3, - SUM(CASE WHEN prd='" . $Period_4 . "' THEN -qty ELSE 0 END) AS prd4 - FROM stockmoves - INNER JOIN locationusers ON locationusers.loccode=stockmoves.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 - WHERE stockid='" . $InventoryPlan['stockid'] . "' - AND stockmoves.loccode ='" . $_POST['Location'] . "' - AND (stockmoves.type=10 OR stockmoves.type=11) - AND stockmoves.hidemovt=0"; + $SQL = "SELECT SUM(CASE WHEN (prd>='" . $Period_1 . "' OR prd<='" . $Period_4 . "') THEN -qty ELSE 0 END) AS 4mthtotal, + SUM(CASE WHEN prd='" . $Period_1 . "' THEN -qty ELSE 0 END) AS prd1, + SUM(CASE WHEN prd='" . $Period_2 . "' THEN -qty ELSE 0 END) AS prd2, + SUM(CASE WHEN prd='" . $Period_3 . "' THEN -qty ELSE 0 END) AS prd3, + SUM(CASE WHEN prd='" . $Period_4 . "' THEN -qty ELSE 0 END) AS prd4 + FROM stockmoves + INNER JOIN locationusers + ON locationusers.loccode=stockmoves.loccode + AND locationusers.userid='" . $_SESSION['UserID'] . "' + AND locationusers.canview=1 + WHERE stockid='" . $InventoryPlan['stockid'] . "' + AND (stockmoves.type=10 OR stockmoves.type=11) + AND stockmoves.hidemovt=0"; + if ($_POST['Location']!='All'){ + $SQL .= " AND stockmoves.loccode ='" . $_POST['Location'] . "'"; } $SalesResult=DB_query($SQL,$db,'','',FALSE,FALSE); @@ -283,28 +251,19 @@ $SalesRow = DB_fetch_array($SalesResult); - if ($_POST['Location']=='All'){ - $SQL = "SELECT SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qtydemand - FROM salesorderdetails INNER JOIN salesorders - ON salesorderdetails.orderno=salesorders.orderno - INNER JOIN locationusers ON locationusers.loccode=salesorders.fromstkloc AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 - WHERE salesorderdetails.stkcode = '" . $InventoryPlan['stockid'] . "' - AND salesorderdetails.completed = 0 - AND salesorders.quotation=0"; - } else { - $SQL = "SELECT SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qtydemand - FROM salesorderdetails INNER JOIN salesorders - ON salesorderdetails.orderno=salesorders.orderno - INNER JOIN locationusers ON locationusers.loccode=salesorders.fromstkloc AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 - WHERE salesorders.fromstkloc ='" . $_POST['Location'] . "' - AND salesorderdetails.stkcode = '" . $InventoryPlan['stockid'] . "' - AND salesorderdetails.completed = 0 - AND salesorders.quotation=0"; + $SQL = "SELECT SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qtydemand + FROM salesorderdetails INNER JOIN salesorders + ON salesorderdetails.orderno=salesorders.orderno + INNER JOIN locationusers ON locationusers.loccode=salesorders.fromstkloc AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 + WHERE salesorderdetails.stkcode = '" . $InventoryPlan['stockid'] . "' + AND salesorderdetails.completed = 0 + AND salesorders.quotation=0"; + if ($_POST['Location']!='All'){ + $SQL .= " AND salesorders.fromstkloc ='" . $_POST['Location'] . "'"; } $DemandResult = DB_query($SQL, $db, '', '', false, false); - if (DB_error_no($db) !=0) { $Title = _('Inventory Planning') . ' - ' . _('Problem Report') . '....'; include('includes/header.inc'); @@ -319,35 +278,21 @@ // Also need to add in the demand as a component of an assembly items if this items has any assembly parents. - if ($_POST['Location']=='All'){ - $SQL = "SELECT SUM((salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*bom.quantity) AS dem - FROM salesorderdetails INNER JOIN bom - ON salesorderdetails.stkcode=bom.parent - INNER JOIN stockmaster - ON stockmaster.stockid=bom.parent - INNER JOIN salesorders - ON salesorders.orderno = salesorderdetails.orderno - INNER JOIN locationusers ON locationusers.loccode=salesorders.fromstkloc AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 - WHERE salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0 - AND bom.component='" . $InventoryPlan['stockid'] . "' - AND stockmaster.mbflag='A' - AND salesorderdetails.completed=0 - AND salesorders.quotation=0"; - } else { - $SQL = "SELECT SUM((salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*bom.quantity) AS dem - FROM salesorderdetails INNER JOIN bom - ON salesorderdetails.stkcode=bom.parent - INNER JOIN stockmaster - ON stockmaster.stockid=bom.parent - INNER JOIN salesorders - ON salesorders.orderno = salesorderdetails.orderno - INNER JOIN locationusers ON locationusers.loccode=salesorders.fromstkloc AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 - WHERE salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0 - AND bom.component='" . $InventoryPlan['stockid'] . "' - AND salesorders.fromstkloc ='" . $_POST['Location'] . "' - AND stockmaster.mbflag='A' - AND salesorderdetails.completed=0 - AND salesorders.quotation=0"; + $SQL = "SELECT SUM((salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*bom.quantity) AS dem + FROM salesorderdetails INNER JOIN bom + ON salesorderdetails.stkcode=bom.parent + INNER JOIN stockmaster + ON stockmaster.stockid=bom.parent + INNER JOIN salesorders + ON salesorders.orderno = salesorderdetails.orderno + INNER JOIN locationusers ON locationusers.loccode=salesorders.fromstkloc AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 + WHERE salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0 + AND bom.component='" . $InventoryPlan['stockid'] . "' + AND stockmaster.mbflag='A' + AND salesorderdetails.completed=0 + AND salesorders.quotation=0"; + if ($_POST['Location']!='All'){ + $SQL .= " AND salesorders.fromstkloc ='" . $_POST['Location'] . "'"; } $BOMDemandResult = DB_query($SQL,$db,'','',false,false); @@ -364,58 +309,20 @@ exit; } + // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc + // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc if ($_POST['Location']=='All'){ - $SQL = "SELECT SUM(purchorderdetails.quantityord- purchorderdetails.quantityrecd) as qtyonorder - FROM purchorderdetails - LEFT JOIN purchorders - ON purchorderdetails.orderno = purchorders.orderno - INNER JOIN locationusers ON locationusers.loccode=purchorders.intostocklocation AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 - LEFT JOIN purchdata - ON purchorders.supplierno=purchdata.supplierno - AND purchorderdetails.itemcode=purchdata.stockid - WHERE purchorderdetails.itemcode = '" . $InventoryPlan['stockid'] . "' - AND purchorderdetails.completed = 0 - AND purchorders.status <> 'Cancelled' - AND purchorders.status <> 'Rejected' - AND purchorders.status <> 'Pending' - AND purchorders.status <> 'Completed'"; + $QOO = GetQuantityOnOrderDueToPurchaseOrders($InventoryPlan['stockid'], "", $db); + $QOO += GetQuantityOnOrderDueToWorkOrders($InventoryPlan['stockid'], "", $db); } else { - $SQL = "SELECT SUM(purchorderdetails.quantityord - purchorderdetails.quantityrecd) as qtyonorder - FROM purchorderdetails - LEFT JOIN purchorders - ON purchorderdetails.orderno = purchorders.orderno - INNER JOIN locationusers ON locationusers.loccode=purchorders.intostocklocation AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 - LEFT JOIN purchdata - ON purchorders.supplierno=purchdata.supplierno - AND purchorderdetails.itemcode=purchdata.stockid - WHERE purchorderdetails.itemcode = '" . $InventoryPlan['stockid'] . "' - AND purchorderdetails.completed = 0 - AND purchorders.intostocklocation= '" . $_POST['Location'] . "' - AND purchorders.status <> 'Cancelled' - AND purchorders.status <> 'Rejected' - AND purchorders.status <> 'Pending' - AND purchorders.status <> 'Completed'"; + $QOO = GetQuantityOnOrderDueToPurchaseOrders($InventoryPlan['stockid'], $_POST['Location'], $db); + $QOO += GetQuantityOnOrderDueToWorkOrders($InventoryPlan['stockid'], $_POST['Location'], $db); } $DemandRow = DB_fetch_array($DemandResult); $BOMDemandRow = DB_fetch_array($BOMDemandResult); $TotalDemand = $DemandRow['qtydemand'] + $BOMDemandRow['dem']; - $OnOrdResult = DB_query($SQL, $db, '', '', false, false); - if (DB_error_no($db) !=0) { - $Title = _('Inventory Planning') . ' - ' . _('Problem Report') . '....'; - include('includes/header.inc'); - prnMsg( _('The purchase order quantities could not be retrieved by the SQL because') . ' - ' . DB_error_msg($db),'error'); - echo '<br /><a href="' .$RootPath .'/index.php">' . _('Back to the menu') . '</a>'; - if ($debug==1){ - echo '<br />' . $SQL; - } - include('includes/footer.inc'); - exit; - } - - $OnOrdRow = DB_fetch_array($OnOrdResult); - $LeftOvers = $pdf->addTextWrap($Left_Margin, $YPos, 60, $FontSize, $InventoryPlan['stockid'], 'left'); $LeftOvers = $pdf->addTextWrap(100, $YPos, 150,6,$InventoryPlan['description'],'left'); $AverageOfLast4Months = $SalesRow['4mthtotal']/4; @@ -436,9 +343,9 @@ $LeftOvers = $pdf->addTextWrap(597, $YPos, 40,$FontSize,locale_number_format($InventoryPlan['qoh'],0),'right'); $LeftOvers = $pdf->addTextWrap(638, $YPos, 40,$FontSize,locale_number_format($TotalDemand,0),'right'); - $LeftOvers = $pdf->addTextWrap(679, $YPos, 40,$FontSize,locale_number_format($OnOrdRow['qtyonorder'],0),'right'); + $LeftOvers = $pdf->addTextWrap(679, $YPos, 40,$FontSize,locale_number_format($QOO,0),'right'); - $SuggestedTopUpOrder = $RequiredStockInSupplyChain - $InventoryPlan['qoh'] + $TotalDemand - $OnOrdRow['qtyonorder']; + $SuggestedTopUpOrder = $RequiredStockInSupplyChain - $InventoryPlan['qoh'] + $TotalDemand - $QOO; if ($SuggestedTopUpOrder <=0){ $LeftOvers = $pdf->addTextWrap(730, $YPos, 40,$FontSize,_('Nil'),'center'); Modified: trunk/SelectOrderItems.php =================================================================== --- trunk/SelectOrderItems.php 2014-10-04 03:40:57 UTC (rev 6906) +++ trunk/SelectOrderItems.php 2014-10-05 13:14:49 UTC (rev 6907) @@ -1494,39 +1494,11 @@ } else { $DemandQty = 0; } - // Find the quantity on purchase orders - $sql = "SELECT SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qoo - FROM purchorderdetails INNER JOIN purchorders - ON purchorderdetails.orderno=purchorders.orderno - WHERE purchorderdetails.completed=0 - AND purchorders.status<> 'Completed' - AND purchorders.status<> 'Rejected' - AND purchorders.status<> 'Cancelled' - AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'"; + // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc + $PurchQty = GetQuantityOnOrderDueToPurchaseOrders($myrow['stockid'], "", $db); + // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc + $WoQty = GetQuantityOnOrderDueToWorkOrders($myrow['stockid'], "", $db); - $ErrMsg = _('The order details for this product cannot be retrieved because'); - $PurchResult = DB_query($sql,$db,$ErrMsg); - - $PurchRow = DB_fetch_row($PurchResult); - if ($PurchRow[0]!=null){ - $PurchQty = $PurchRow[0]; - } else { - $PurchQty = 0; - } - - // Find the quantity on works orders - $sql = "SELECT SUM(woitems.qtyreqd - woitems.qtyrecd) AS qwo - FROM woitems - WHERE stockid='" . $myrow['stockid'] ."'"; - $ErrMsg = _('The order details for this product cannot be retrieved because'); - $WoResult = DB_query($sql,$db,$ErrMsg); - $WoRow = DB_fetch_row($WoResult); - if ($WoRow[0]!=null){ - $WoQty = $WoRow[0]; - } else { - $WoQty = 0; - } - if ($k==1){ echo '<tr class="EvenTableRows">'; $k=0; @@ -1686,41 +1658,11 @@ $DemandQty = 0; } - // Find the quantity on purchase orders - $sql = "SELECT SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qoo - FROM purchorderdetails INNER JOIN purchorders - ON purchorderdetails.orderno=purchorders.orderno - WHERE purchorderdetails.completed=0 - AND purchorders.status<>'Cancelled' - AND purchorders.status<>'Rejected' - AND purchorders.status<>'Pending' - AND purchorders.status<>'Completed' - AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'"; + // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc + $PurchQty = GetQuantityOnOrderDueToPurchaseOrders($myrow['stockid'], "", $db); + // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc + $WoQty = GetQuantityOnOrderDueToWorkOrders($myrow['stockid'], "", $db); - $ErrMsg = _('The order details for this product cannot be retrieved because'); - $PurchResult = DB_query($sql,$db,$ErrMsg); - - $PurchRow = DB_fetch_row($PurchResult); - if ($PurchRow[0]!=null){ - $PurchQty = $PurchRow[0]; - } else { - $PurchQty = 0; - } - - // Find the quantity on works orders - $sql = "SELECT SUM(woitems.qtyreqd - woitems.qtyrecd) AS dedm - FROM woitems - WHERE stockid='" . $myrow['stockid'] ."'"; - $ErrMsg = _('The order details for this product cannot be retrieved because'); - $WoResult = DB_query($sql,$db,$ErrMsg); - - $WoRow = DB_fetch_row($WoResult); - if ($WoRow[0]!=null){ - $WoQty = $WoRow[0]; - } else { - $WoQty = 0; - } - if ($k==1){ echo '<tr class="EvenTableRows">'; $k=0; Modified: trunk/SelectProduct.php =================================================================== --- trunk/SelectProduct.php 2014-10-04 03:40:57 UTC (rev 6906) +++ trunk/SelectProduct.php 2014-10-05 13:14:49 UTC (rev 6907) @@ -11,6 +11,7 @@ $BookMark = 'SelectingInventory'; include ('includes/header.inc'); +include ('includes/SQL_CommonFunctions.inc'); if (isset($_GET['StockID'])) { //The page is called with a StockID @@ -262,35 +263,12 @@ WHERE stockid = '" . $StockID . "'", $db); $QOHRow = DB_fetch_row($QOHResult); $QOH = locale_number_format($QOHRow[0], $myrow['decimalplaces']); - $QOOSQL="SELECT SUM(purchorderdetails.quantityord -purchorderdetails.quantityrecd) AS QtyOnOrder - FROM purchorders INNER JOIN purchorderdetails - ON purchorders.orderno=purchorderdetails.orderno - INNER JOIN locationusers ON locationusers.loccode=purchorders.intostocklocation AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 - WHERE purchorderdetails.itemcode='" . $StockID . "' - AND purchorderdetails.completed =0 - AND purchorders.status<>'Cancelled' - AND purchorders.status<>'Pending' - AND purchorders.status<>'Rejected'"; - $QOOResult = DB_query($QOOSQL, $db); - if (DB_num_rows($QOOResult) == 0) { - $QOO = 0; - } else { - $QOORow = DB_fetch_row($QOOResult); - $QOO = $QOORow[0]; - } - //Also the on work order quantities - $sql = "SELECT SUM(woitems.qtyreqd-woitems.qtyrecd) AS qtywo - FROM woitems INNER JOIN workorders - ON woitems.wo=workorders.wo - INNER JOIN locationusers ON locationusers.loccode=workorders.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 - WHERE workorders.closed=0 - AND woitems.stockid='" . $StockID . "'"; - $ErrMsg = _('The quantity on work orders for this product cannot be retrieved because'); - $QOOResult = DB_query($sql, $db, $ErrMsg); - if (DB_num_rows($QOOResult) == 1) { - $QOORow = DB_fetch_row($QOOResult); - $QOO+= $QOORow[0]; - } + + // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc + $QOO = GetQuantityOnOrderDueToPurchaseOrders($StockID, "", $db); + // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc + $QOO += GetQuantityOnOrderDueToWorkOrders($StockID, "", $db); + $QOO = locale_number_format($QOO, $myrow['decimalplaces']); break; } Modified: trunk/StockLocStatus.php =================================================================== --- trunk/StockLocStatus.php 2014-10-04 03:40:57 UTC (rev 6906) +++ trunk/StockLocStatus.php 2014-10-05 13:14:49 UTC (rev 6907) @@ -7,6 +7,7 @@ $Title = _('All Stock Status By Location/Category'); include('includes/header.inc'); +include ('includes/SQL_CommonFunctions.inc'); if (isset($_GET['StockID'])){ $StockID = trim(mb_strtoupper($_GET['StockID'])); @@ -14,7 +15,6 @@ $StockID = trim(mb_strtoupper($_POST['StockID'])); } - echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">'; echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; @@ -239,25 +239,11 @@ $DemandQty += $DemandRow[0]; } + // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc + $QOO = GetQuantityOnOrderDueToPurchaseOrders($StockID, $myrow['loccode'], $db); + // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc + $QOO += GetQuantityOnOrderDueToWorkOrders($StockID, $myrow['loccode'], $db); - $sql = "SELECT SUM(purchorderdetails.quantityord - purchorderdetails.quantityrecd) AS qoo - FROM purchorderdetails - INNER JOIN purchorders - ON purchorderdetails.orderno=purchorders.orderno - WHERE purchorders.intostocklocation='" . $myrow['loccode'] . "' - AND purchorderdetails.itemcode='" . $StockID . "' - AND (purchorders.status = 'Authorised' OR purchorders.status='Printed')"; - - $ErrMsg = _('The quantity on order for this product to be received into') . ' ' . $myrow['loccode'] . ' ' . _('cannot be retrieved because'); - $QOOResult = DB_query($sql,$db,$ErrMsg); - - if (DB_num_rows($QOOResult)==1){ - $QOORow = DB_fetch_row($QOOResult); - $QOO = $QOORow[0]; - } else { - $QOO = 0; - } - if (($_POST['BelowReorderQuantity']=='Below' AND ($myrow['quantity']-$myrow['reorderlevel']-$DemandQty)<0) OR $_POST['BelowReorderQuantity']=='All' OR $_POST['BelowReorderQuantity']=='NotZero' OR ($_POST['BelowReorderQuantity']=='OnOrder' AND $QOO != 0)){ Modified: trunk/StockStatus.php =================================================================== --- trunk/StockStatus.php 2014-10-04 03:40:57 UTC (rev 6906) +++ trunk/StockStatus.php 2014-10-05 13:14:49 UTC (rev 6907) @@ -7,6 +7,7 @@ $Title = _('Stock Status'); include('includes/header.inc'); +include ('includes/SQL_CommonFunctions.inc'); if (isset($_GET['StockID'])){ $StockID = trim(mb_strtoupper($_GET['StockID'])); @@ -175,41 +176,11 @@ } if ($Its_A_KitSet_Assembly_Or_Dummy == False){ + // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc + $QOO = GetQuantityOnOrderDueToPurchaseOrders($StockID, $myrow['loccode'], $db); + // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc + $QOO += GetQuantityOnOrderDueToWorkOrders($StockID, $myrow['loccode'], $db); - $sql="SELECT SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) - FROM purchorders LEFT JOIN purchorderdetails - ON purchorders.orderno=purchorderdetails.orderno - WHERE purchorderdetails.itemcode='" . $StockID . "' - AND purchorders.intostocklocation='" . $myrow['loccode'] . "' - AND (purchorders.status<>'Cancelled' - AND purchorders.status<>'Pending' - AND purchorders.status<>'Rejected' - AND purchorders.status<>'Completed')"; - $ErrMsg = _('The quantity on order for this product to be received into') . ' ' . $myrow['loccode'] . ' ' . _('cannot be retrieved because'); - $QOOResult = DB_query($sql,$db,$ErrMsg, $DbgMsg); - - if (DB_num_rows($QOOResult)==1){ - $QOORow = DB_fetch_row($QOOResult); - $QOO = $QOORow[0]; - } else { - $QOO = 0; - } - - //Also the on work order quantities - $sql = "SELECT SUM(woitems.qtyreqd-woitems.qtyrecd) AS qtywo - FROM woitems INNER JOIN workorders - ON woitems.wo=workorders.wo - WHERE workorders.closed=0 - AND workorders.loccode='" . $myrow['loccode'] . "' - AND woitems.stockid='" . $StockID . "'"; - $ErrMsg = _('The quantity on work orders for this product to be received into') . ' ' . $myrow['loccode'] . ' ' . _('cannot be retrieved because'); - $QOOResult = DB_query($sql,$db,$ErrMsg, $DbgMsg); - - if (DB_num_rows($QOOResult)==1){ - $QOORow = DB_fetch_row($QOOResult); - $QOO += $QOORow[0]; - } - $InTransitSQL="SELECT SUM(shipqty-recqty) as intransit FROM loctransfers WHERE stockid='" . $StockID . "' Modified: trunk/TopItems.php =================================================================== --- trunk/TopItems.php 2014-10-04 03:40:57 UTC (rev 6906) +++ trunk/TopItems.php 2014-10-05 13:14:49 UTC (rev 6907) @@ -7,6 +7,8 @@ include ('includes/session.inc'); $Title = _('Top Items Searching'); include ('includes/header.inc'); +include ('includes/SQL_CommonFunctions.inc'); + //check if input already if (!(isset($_POST['Search']))) { @@ -198,35 +200,11 @@ WHERE stockid = '" . DB_escape_string($myrow['stkcode']) . "'", $db); $QOHRow = DB_fetch_row($QOHResult); $QOH = $QOHRow[0]; - $QOOSQL="SELECT SUM(purchorderdetails.quantityord -purchorderdetails.quantityrecd) AS QtyOnOrder - FROM purchorders INNER JOIN purchorderdetails - ON purchorders.orderno=purchorderdetails.orderno - INNER JOIN locationusers ON locationusers.loccode=purchorders.intostocklocation AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 - WHERE purchorderdetails.itemcode='" . DB_escape_string($myrow['stkcode']) . "' - AND purchorderdetails.completed =0 - AND purchorders.status<>'Cancelled' - AND purchorders.status<>'Pending' - AND purchorders.status<>'Rejected'"; - $QOOResult = DB_query($QOOSQL, $db); - if (DB_num_rows($QOOResult) == 0) { - $QOO = 0; - } else { - $QOORow = DB_fetch_row($QOOResult); - $QOO = $QOORow[0]; - } - //Also the on work order quantities - $sql = "SELECT SUM(woitems.qtyreqd-woitems.qtyrecd) AS qtywo - FROM woitems INNER JOIN workorders - ON woitems.wo=workorders.wo - INNER JOIN locationusers ON locationusers.loccode=workorders.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 - WHERE workorders.closed=0 - AND woitems.stockid='" . DB_escape_string($myrow['stkcode']) . "'"; - $ErrMsg = _('The quantity on work orders for this product cannot be retrieved because'); - $QOOResult = DB_query($sql, $db, $ErrMsg); - if (DB_num_rows($QOOResult) == 1) { - $QOORow = DB_fetch_row($QOOResult); - $QOO+= $QOORow[0]; - } + + // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc + $QOO = GetQuantityOnOrderDueToPurchaseOrders($myrow['stkcode'], "", $db); + // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc + $QOO += GetQuantityOnOrderDueToWorkOrders($myrow['stkcode'], "", $db); break; } if(is_numeric($QOH) and is_numeric($QOO)){ Modified: trunk/includes/SQL_CommonFunctions.inc =================================================================== --- trunk/includes/SQL_CommonFunctions.inc 2014-10-04 03:40:57 UTC (rev 6906) +++ trunk/includes/SQL_CommonFunctions.inc 2014-10-05 13:14:49 UTC (rev 6907) @@ -369,4 +369,83 @@ } } +/* GetQuantityOnOrderDueToPurchaseOrders return the QOO for an item due to Purchase orders (not WO). + If Location is empty, it returns the QOO for all locations + If location is NOT empty, returns the QOO for that specific location. +*/ +function GetQuantityOnOrderDueToPurchaseOrders($StockID, $Location, $db){ + if ($Location == ""){ + // All locations to be considered + $WhereLocation = ""; + $ErrMsg = _('The quantity on order due to purchase orders for') . ' ' . $StockID . ' ' . _('to be received into all locations cannot be retrieved because'); + }else{ + // Just 1 location to consider + $WhereLocation = " AND purchorders.intostocklocation = '" . $Location . "'"; + $ErrMsg = _('The quantity on order due to purchase orders for') . ' ' . $StockID . ' ' . _('to be received into') . ' ' . $Location . ' ' . _('cannot be retrieved because'); + } + + $SQL="SELECT SUM(purchorderdetails.quantityord -purchorderdetails.quantityrecd) AS QtyOnOrder + FROM purchorders + INNER JOIN purchorderdetails + ON purchorders.orderno=purchorderdetails.orderno + INNER JOIN locationusers + ON locationusers.loccode=purchorders.intostocklocation + AND locationusers.userid='" . $_SESSION['UserID'] . "' + AND locationusers.canview=1 + WHERE purchorderdetails.itemcode='" . $StockID . "' + AND purchorderdetails.completed = 0 + AND purchorders.status<>'Cancelled' + AND purchorders.status<>'Pending' + AND purchorders.status<>'Rejected' + AND purchorders.status<>'Completed'" . + $WhereLocation; + + $QOOResult = DB_query($SQL, $db, $ErrMsg); + if (DB_num_rows($QOOResult) == 0) { + $QOO = 0; + } else { + $QOORow = DB_fetch_row($QOOResult); + $QOO = $QOORow[0]; + } + return $QOO; +} + + +/* GetQuantityOnOrderDueToWorkOrders return the QOO for an item due to Work orders (not PO). + If Location is empty, it returns the QOO for all locations + If location is NOT empty, returns the QOO for that specific location. +*/ +function GetQuantityOnOrderDueToWorkOrders($StockID, $Location, $db){ + if ($Location == ""){ + // All locations to be considered + $WhereLocation = ""; + $ErrMsg = _('The quantity on order due to work orders for') . ' ' . $StockID . ' ' . _('to be received into all locations cannot be retrieved because'); + }else{ + // Just 1 location to consider + $WhereLocation = " AND workorders.loccode='" . $Location . "'"; + $ErrMsg = _('The quantity on order due to work orders for') . ' ' . $StockID . ' ' . _('to be received into') . ' ' . $Location . ' ' . _('cannot be retrieved because'); + } + + $SQL="SELECT SUM(woitems.qtyreqd-woitems.qtyrecd) AS qtywo + FROM woitems + INNER JOIN workorders + ON woitems.wo=workorders.wo + INNER JOIN locationusers + ON locationusers.loccode=workorders.loccode + AND locationusers.userid='" . $_SESSION['UserID'] . "' + AND locationusers.canview=1 + WHERE workorders.closed=0 + AND woitems.stockid='" . $StockID . "'" . + $WhereLocation; + + $QOOResult = DB_query($SQL, $db, $ErrMsg); + if (DB_num_rows($QOOResult) == 0) { + $QOO = 0; + } else { + $QOORow = DB_fetch_row($QOOResult); + $QOO = $QOORow[0]; + } + return $QOO; +} + ?> \ No newline at end of file |
From: <dai...@us...> - 2014-10-06 05:13:33
|
Revision: 6908 http://sourceforge.net/p/web-erp/reponame/6908 Author: daintree Date: 2014-10-06 05:13:27 +0000 (Mon, 06 Oct 2014) Log Message: ----------- Remove db parameter from the new functions Modified Paths: -------------- trunk/CounterReturns.php trunk/CounterSales.php trunk/InventoryPlanning.php trunk/InventoryPlanningPrefSupplier.php trunk/SelectOrderItems.php trunk/SelectProduct.php trunk/StockLocStatus.php trunk/StockStatus.php trunk/TopItems.php trunk/includes/SQL_CommonFunctions.inc Modified: trunk/CounterReturns.php =================================================================== --- trunk/CounterReturns.php 2014-10-05 13:14:49 UTC (rev 6907) +++ trunk/CounterReturns.php 2014-10-06 05:13:27 UTC (rev 6908) @@ -824,7 +824,7 @@ echo '</select></td></tr>'; $BankAccountsResult = DB_query("SELECT bankaccountname, accountcode FROM bankaccounts",$db); - + echo '<tr> <td style="color:red">' . _('Bank Account') . ':</td> <td><select name="BankAccount">'; @@ -1725,9 +1725,9 @@ } // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc - $QOO= GetQuantityOnOrderDueToPurchaseOrders($myrow['stockid'], "", $db); + $QOO= GetQuantityOnOrderDueToPurchaseOrders($myrow['stockid'], ''); // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc - $QOO += GetQuantityOnOrderDueToWorkOrders($myrow['stockid'], "", $db); + $QOO += GetQuantityOnOrderDueToWorkOrders($myrow['stockid'], ''); if ($k==1){ echo '<tr class="EvenTableRows">'; Modified: trunk/CounterSales.php =================================================================== --- trunk/CounterSales.php 2014-10-05 13:14:49 UTC (rev 6907) +++ trunk/CounterSales.php 2014-10-06 05:13:27 UTC (rev 6908) @@ -1184,9 +1184,9 @@ $QuantityAssemblyDemand = $AssemblyDemandRow[0]; // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc - $QuantityPurchOrders= GetQuantityOnOrderDueToPurchaseOrders($StockItem->StockID, "", $db); + $QuantityPurchOrders= GetQuantityOnOrderDueToPurchaseOrders($StockItem->StockID, ''); // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc - $QuantityWorkOrders = GetQuantityOnOrderDueToWorkOrders($StockItem->StockID, "", $db); + $QuantityWorkOrders = GetQuantityOnOrderDueToWorkOrders($StockItem->StockID, ''); //Now we have the data - do we need to make any more? $ShortfallQuantity = $QOH-$QuantityDemand-$QuantityAssemblyDemand+$QuantityPurchOrders+$QuantityWorkOrders; @@ -1278,7 +1278,7 @@ //Send email to the Factory Manager if($_SESSION['SmtpSetting']==0){ mail($_SESSION['FactoryManagerEmail'],$EmailSubject,$FactoryManagerEmail); - + }else{ include('includes/htmlMimeMail.php'); $mail = new htmlMimeMail(); @@ -2137,9 +2137,9 @@ } // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc - $QOO = GetQuantityOnOrderDueToPurchaseOrders($myrow['stockid'], "", $db); - // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc - $QOO += GetQuantityOnOrderDueToWorkOrders($myrow['stockid'], "", $db); + $QOO = GetQuantityOnOrderDueToPurchaseOrders($myrow['stockid'], ''); + // Get the QOO due to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc + $QOO += GetQuantityOnOrderDueToWorkOrders($myrow['stockid'], ''); if ($k==1){ echo '<tr class="EvenTableRows">'; @@ -2288,9 +2288,9 @@ } // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc - $QOO = GetQuantityOnOrderDueToPurchaseOrders($myrow['stockid'], "", $db); + $QOO = GetQuantityOnOrderDueToPurchaseOrders($myrow['stockid'], ''); // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc - $QOO += GetQuantityOnOrderDueToWorkOrders($myrow['stockid'], "", $db); + $QOO += GetQuantityOnOrderDueToWorkOrders($myrow['stockid'], ''); if ($k==1){ echo '<tr class="EvenTableRows">'; Modified: trunk/InventoryPlanning.php =================================================================== --- trunk/InventoryPlanning.php 2014-10-05 13:14:49 UTC (rev 6907) +++ trunk/InventoryPlanning.php 2014-10-06 05:13:27 UTC (rev 6908) @@ -279,11 +279,11 @@ // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc if ($_POST['Location']=='All'){ - $QOO = GetQuantityOnOrderDueToPurchaseOrders($InventoryPlan['stockid'], "", $db); - $QOO += GetQuantityOnOrderDueToWorkOrders($InventoryPlan['stockid'], "", $db); + $QOO = GetQuantityOnOrderDueToPurchaseOrders($InventoryPlan['stockid'], ''); + $QOO += GetQuantityOnOrderDueToWorkOrders($InventoryPlan['stockid'], ''); } else { - $QOO = GetQuantityOnOrderDueToPurchaseOrders($InventoryPlan['stockid'], $_POST['Location'], $db); - $QOO += GetQuantityOnOrderDueToWorkOrders($InventoryPlan['stockid'], $_POST['Location'], $db); + $QOO = GetQuantityOnOrderDueToPurchaseOrders($InventoryPlan['stockid'], $_POST['Location']); + $QOO += GetQuantityOnOrderDueToWorkOrders($InventoryPlan['stockid'], $_POST['Location']); } $DemandRow = DB_fetch_array($DemandResult); Modified: trunk/InventoryPlanningPrefSupplier.php =================================================================== --- trunk/InventoryPlanningPrefSupplier.php 2014-10-05 13:14:49 UTC (rev 6907) +++ trunk/InventoryPlanningPrefSupplier.php 2014-10-06 05:13:27 UTC (rev 6908) @@ -150,9 +150,9 @@ suppliers.suppname, purchdata.leadtime/30 AS monthsleadtime, SUM(locstock.quantity) AS qoh - FROM locstock - INNER JOIN locationusers - ON locationusers.loccode=locstock.loccode + FROM locstock + INNER JOIN locationusers + ON locationusers.loccode=locstock.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1, stockmaster, purchdata, @@ -224,9 +224,9 @@ SUM(CASE WHEN prd='" . $Period_3 . "' THEN -qty ELSE 0 END) AS prd3, SUM(CASE WHEN prd='" . $Period_4 . "' THEN -qty ELSE 0 END) AS prd4 FROM stockmoves - INNER JOIN locationusers - ON locationusers.loccode=stockmoves.loccode - AND locationusers.userid='" . $_SESSION['UserID'] . "' + INNER JOIN locationusers + ON locationusers.loccode=stockmoves.loccode + AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 WHERE stockid='" . $InventoryPlan['stockid'] . "' AND (stockmoves.type=10 OR stockmoves.type=11) @@ -312,11 +312,11 @@ // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc if ($_POST['Location']=='All'){ - $QOO = GetQuantityOnOrderDueToPurchaseOrders($InventoryPlan['stockid'], "", $db); - $QOO += GetQuantityOnOrderDueToWorkOrders($InventoryPlan['stockid'], "", $db); + $QOO = GetQuantityOnOrderDueToPurchaseOrders($InventoryPlan['stockid'], ''); + $QOO += GetQuantityOnOrderDueToWorkOrders($InventoryPlan['stockid'], ''); } else { - $QOO = GetQuantityOnOrderDueToPurchaseOrders($InventoryPlan['stockid'], $_POST['Location'], $db); - $QOO += GetQuantityOnOrderDueToWorkOrders($InventoryPlan['stockid'], $_POST['Location'], $db); + $QOO = GetQuantityOnOrderDueToPurchaseOrders($InventoryPlan['stockid'], $_POST['Location']); + $QOO += GetQuantityOnOrderDueToWorkOrders($InventoryPlan['stockid'], $_POST['Location']); } $DemandRow = DB_fetch_array($DemandResult); Modified: trunk/SelectOrderItems.php =================================================================== --- trunk/SelectOrderItems.php 2014-10-05 13:14:49 UTC (rev 6907) +++ trunk/SelectOrderItems.php 2014-10-06 05:13:27 UTC (rev 6908) @@ -326,7 +326,7 @@ debtorsmaster.name FROM custbranch LEFT JOIN debtorsmaster - ON custbranch.debtorno=debtorsmaster.debtorno + ON custbranch.debtorno=debtorsmaster.debtorno WHERE custbranch.disabletrans=0 "; if (($_POST['CustKeywords']=='') AND ($_POST['CustCode']=='') AND ($_POST['CustPhone']=='')) { @@ -339,7 +339,7 @@ $SQL .= "AND custbranch.brname " . LIKE . " '%" . $SearchString . "%' AND custbranch.branchcode " . LIKE . " '%" . mb_strtoupper(trim($_POST['CustCode'])) . "%' AND custbranch.phoneno " . LIKE . " '%" . trim($_POST['CustPhone']) . "%'"; - + } /*one of keywords or custcode was more than a zero length string */ if ($_SESSION['SalesmanLogin']!=''){ $SQL .= " AND custbranch.salesman='" . $_SESSION['SalesmanLogin'] . "'"; @@ -573,9 +573,9 @@ <td>' . _('Part of the Branch Phone Number') . ':</td> <td><input tabindex="3" type="text" name="CustPhone" size="15" maxlength="18" title="' . _('Enter a part of a customer\'s phone number that you wish to search for then click the Search Now button to find matching customers') . '"/></td> </tr> - + </table> - + <div class="centre"> <input tabindex="4" type="submit" name="SearchCust" value="' . _('Search Now') . '" /> <input tabindex="5" type="submit" name="reset" value="' . _('Reset') . '" /> @@ -706,13 +706,13 @@ $RawMaterialSellable = ''; } if(!empty($_POST['CustItemFlag'])){ - $IncludeCustItem = " INNER JOIN custitem ON custitem.stockid=stockmaster.stockid + $IncludeCustItem = " INNER JOIN custitem ON custitem.stockid=stockmaster.stockid AND custitem.debtorno='" . $_SESSION['Items'.$identifier]->DebtorNo . "'"; }else{ - $IncludeCustItem = " LEFT OUTER JOIN custitem ON custitem.stockid=stockmaster.stockid + $IncludeCustItem = " LEFT OUTER JOIN custitem ON custitem.stockid=stockmaster.stockid AND custitem.debtorno='" . $_SESSION['Items'.$identifier]->DebtorNo . "'"; } - + if ($_POST['Keywords']!='' AND $_POST['StockCode']=='') { $msg='<div class="page_help_text">' . _('Order Item description has been used in search') . '.</div>'; } elseif ($_POST['StockCode']!='' AND $_POST['Keywords']=='') { @@ -1495,9 +1495,9 @@ $DemandQty = 0; } // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc - $PurchQty = GetQuantityOnOrderDueToPurchaseOrders($myrow['stockid'], "", $db); + $PurchQty = GetQuantityOnOrderDueToPurchaseOrders($myrow['stockid'], ''); // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc - $WoQty = GetQuantityOnOrderDueToWorkOrders($myrow['stockid'], "", $db); + $WoQty = GetQuantityOnOrderDueToWorkOrders($myrow['stockid'], ''); if ($k==1){ echo '<tr class="EvenTableRows">'; @@ -1584,7 +1584,7 @@ echo '" /></td> <td><input type="checkbox" name="RawMaterialFlag" value="M" />'._('Raw material flag').' <br/><span class="dpTbl">'._('If checked, Raw material will be shown on search result').'</span> </td> - <td><input type="checkbox" name="CustItemFlag" value="C" />'._('Customer Item flag').' <br/><span class="dpTbl">'._('If checked, only items for this customer will show').'</span> </td> + <td><input type="checkbox" name="CustItemFlag" value="C" />'._('Customer Item flag').' <br/><span class="dpTbl">'._('If checked, only items for this customer will show').'</span> </td> </tr>'; echo '<tr> @@ -1659,9 +1659,9 @@ } // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc - $PurchQty = GetQuantityOnOrderDueToPurchaseOrders($myrow['stockid'], "", $db); + $PurchQty = GetQuantityOnOrderDueToPurchaseOrders($myrow['stockid'], ''); // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc - $WoQty = GetQuantityOnOrderDueToWorkOrders($myrow['stockid'], "", $db); + $WoQty = GetQuantityOnOrderDueToWorkOrders($myrow['stockid'], ''); if ($k==1){ echo '<tr class="EvenTableRows">'; @@ -1820,7 +1820,7 @@ ON custbranch.defaultlocation=locations.loccode WHERE custbranch.branchcode='" . $_SESSION['Items'.$identifier]->Branch . "' AND custbranch.debtorno = '" . $_SESSION['Items'.$identifier]->DebtorNo . "'"; - + $ErrMsg = _('The customer branch record of the customer selected') . ': ' . $_SESSION['Items'.$identifier]->DebtorNo . ' ' . _('cannot be retrieved because'); $DbgMsg = _('SQL used to retrieve the branch details was') . ':'; $result = DB_query($sql,$db,$ErrMsg,$DbgMsg); Modified: trunk/SelectProduct.php =================================================================== --- trunk/SelectProduct.php 2014-10-05 13:14:49 UTC (rev 6907) +++ trunk/SelectProduct.php 2014-10-06 05:13:27 UTC (rev 6908) @@ -263,11 +263,11 @@ WHERE stockid = '" . $StockID . "'", $db); $QOHRow = DB_fetch_row($QOHResult); $QOH = locale_number_format($QOHRow[0], $myrow['decimalplaces']); - + // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc - $QOO = GetQuantityOnOrderDueToPurchaseOrders($StockID, "", $db); + $QOO = GetQuantityOnOrderDueToPurchaseOrders($StockID, ''); // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc - $QOO += GetQuantityOnOrderDueToWorkOrders($StockID, "", $db); + $QOO += GetQuantityOnOrderDueToWorkOrders($StockID, ''); $QOO = locale_number_format($QOO, $myrow['decimalplaces']); break; Modified: trunk/StockLocStatus.php =================================================================== --- trunk/StockLocStatus.php 2014-10-05 13:14:49 UTC (rev 6907) +++ trunk/StockLocStatus.php 2014-10-06 05:13:27 UTC (rev 6908) @@ -240,9 +240,9 @@ } // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc - $QOO = GetQuantityOnOrderDueToPurchaseOrders($StockID, $myrow['loccode'], $db); + $QOO = GetQuantityOnOrderDueToPurchaseOrders($StockID, $myrow['loccode']); // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc - $QOO += GetQuantityOnOrderDueToWorkOrders($StockID, $myrow['loccode'], $db); + $QOO += GetQuantityOnOrderDueToWorkOrders($StockID, $myrow['loccode']); if (($_POST['BelowReorderQuantity']=='Below' AND ($myrow['quantity']-$myrow['reorderlevel']-$DemandQty)<0) OR $_POST['BelowReorderQuantity']=='All' OR $_POST['BelowReorderQuantity']=='NotZero' Modified: trunk/StockStatus.php =================================================================== --- trunk/StockStatus.php 2014-10-05 13:14:49 UTC (rev 6907) +++ trunk/StockStatus.php 2014-10-06 05:13:27 UTC (rev 6908) @@ -177,9 +177,9 @@ if ($Its_A_KitSet_Assembly_Or_Dummy == False){ // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc - $QOO = GetQuantityOnOrderDueToPurchaseOrders($StockID, $myrow['loccode'], $db); + $QOO = GetQuantityOnOrderDueToPurchaseOrders($StockID, $myrow['loccode']); // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc - $QOO += GetQuantityOnOrderDueToWorkOrders($StockID, $myrow['loccode'], $db); + $QOO += GetQuantityOnOrderDueToWorkOrders($StockID, $myrow['loccode']); $InTransitSQL="SELECT SUM(shipqty-recqty) as intransit FROM loctransfers Modified: trunk/TopItems.php =================================================================== --- trunk/TopItems.php 2014-10-05 13:14:49 UTC (rev 6907) +++ trunk/TopItems.php 2014-10-06 05:13:27 UTC (rev 6908) @@ -132,7 +132,7 @@ debtorsmaster.currcode, fromstkloc, stockmaster.decimalplaces - FROM salesorderdetails, salesorders INNER JOIN locationusers ON locationusers.loccode=salesorders.fromstkloc AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1, + FROM salesorderdetails, salesorders INNER JOIN locationusers ON locationusers.loccode=salesorders.fromstkloc AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1, debtorsmaster,stockmaster, currencies WHERE salesorderdetails.orderno = salesorders.orderno AND salesorderdetails.stkcode = stockmaster.stockid @@ -202,9 +202,9 @@ $QOH = $QOHRow[0]; // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc - $QOO = GetQuantityOnOrderDueToPurchaseOrders($myrow['stkcode'], "", $db); - // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc - $QOO += GetQuantityOnOrderDueToWorkOrders($myrow['stkcode'], "", $db); + $QOO = GetQuantityOnOrderDueToPurchaseOrders($myrow['stkcode'], ''); + // Get the QOO due to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc + $QOO += GetQuantityOnOrderDueToWorkOrders($myrow['stkcode'], ''); break; } if(is_numeric($QOH) and is_numeric($QOO)){ Modified: trunk/includes/SQL_CommonFunctions.inc =================================================================== --- trunk/includes/SQL_CommonFunctions.inc 2014-10-05 13:14:49 UTC (rev 6907) +++ trunk/includes/SQL_CommonFunctions.inc 2014-10-06 05:13:27 UTC (rev 6908) @@ -276,8 +276,8 @@ ON bom.component=stockmaster.stockid WHERE bom.parent='" . $StockID . "' AND bom.loccode ='" . $LocCode . "' - AND bom.effectiveafter<='" . Date('Y-m-d') . "' - AND bom.effectiveto>='" . Date('Y-m-d') . "' + AND bom.effectiveafter<='" . Date('Y-m-d') . "' + AND bom.effectiveto>='" . Date('Y-m-d') . "' AND stockmaster.mbflag<>'G' AND bom.component NOT IN ( SELECT stockid @@ -373,7 +373,10 @@ If Location is empty, it returns the QOO for all locations If location is NOT empty, returns the QOO for that specific location. */ -function GetQuantityOnOrderDueToPurchaseOrders($StockID, $Location, $db){ +function GetQuantityOnOrderDueToPurchaseOrders($StockID, $Location){ + + global $db; + if ($Location == ""){ // All locations to be considered $WhereLocation = ""; @@ -385,12 +388,12 @@ } $SQL="SELECT SUM(purchorderdetails.quantityord -purchorderdetails.quantityrecd) AS QtyOnOrder - FROM purchorders + FROM purchorders INNER JOIN purchorderdetails ON purchorders.orderno=purchorderdetails.orderno - INNER JOIN locationusers - ON locationusers.loccode=purchorders.intostocklocation - AND locationusers.userid='" . $_SESSION['UserID'] . "' + INNER JOIN locationusers + ON locationusers.loccode=purchorders.intostocklocation + AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 WHERE purchorderdetails.itemcode='" . $StockID . "' AND purchorderdetails.completed = 0 @@ -399,7 +402,7 @@ AND purchorders.status<>'Rejected' AND purchorders.status<>'Completed'" . $WhereLocation; - + $QOOResult = DB_query($SQL, $db, $ErrMsg); if (DB_num_rows($QOOResult) == 0) { $QOO = 0; @@ -415,29 +418,32 @@ If Location is empty, it returns the QOO for all locations If location is NOT empty, returns the QOO for that specific location. */ -function GetQuantityOnOrderDueToWorkOrders($StockID, $Location, $db){ - if ($Location == ""){ +function GetQuantityOnOrderDueToWorkOrders($StockID, $Location){ + + global $db; + + if ($Location == ''){ // All locations to be considered - $WhereLocation = ""; + $WhereLocation = ''; $ErrMsg = _('The quantity on order due to work orders for') . ' ' . $StockID . ' ' . _('to be received into all locations cannot be retrieved because'); }else{ // Just 1 location to consider $WhereLocation = " AND workorders.loccode='" . $Location . "'"; $ErrMsg = _('The quantity on order due to work orders for') . ' ' . $StockID . ' ' . _('to be received into') . ' ' . $Location . ' ' . _('cannot be retrieved because'); } - + $SQL="SELECT SUM(woitems.qtyreqd-woitems.qtyrecd) AS qtywo - FROM woitems + FROM woitems INNER JOIN workorders ON woitems.wo=workorders.wo - INNER JOIN locationusers - ON locationusers.loccode=workorders.loccode - AND locationusers.userid='" . $_SESSION['UserID'] . "' + INNER JOIN locationusers + ON locationusers.loccode=workorders.loccode + AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 WHERE workorders.closed=0 AND woitems.stockid='" . $StockID . "'" . $WhereLocation; - + $QOOResult = DB_query($SQL, $db, $ErrMsg); if (DB_num_rows($QOOResult) == 0) { $QOO = 0; |
From: <ex...@us...> - 2014-10-06 11:14:26
|
Revision: 6909 http://sourceforge.net/p/web-erp/reponame/6909 Author: exsonqu Date: 2014-10-06 11:14:18 +0000 (Mon, 06 Oct 2014) Log Message: ----------- 06/10/14 Exson: Fixed the prices or line total variance in invoice for foreign currencies. Modified Paths: -------------- trunk/ConfirmDispatch_Invoice.php trunk/sql/mysql/upgrade4.11-4.12.sql Modified: trunk/ConfirmDispatch_Invoice.php =================================================================== --- trunk/ConfirmDispatch_Invoice.php 2014-10-06 05:13:27 UTC (rev 6908) +++ trunk/ConfirmDispatch_Invoice.php 2014-10-06 11:14:18 UTC (rev 6909) @@ -1071,7 +1071,8 @@ } /* end of its an assembly */ // Insert stock movements - with unit cost - $LocalCurrencyPrice = round(($OrderLine->Price / $_SESSION['CurrencyRate']),$_SESSION['CompanyRecord']['decimalplaces']); + //$LocalCurrencyPrice = round(($OrderLine->Price / $_SESSION['CurrencyRate']),$_SESSION['CompanyRecord']['decimalplaces']); change decimalplaces to 5 to avoid price or lines total variance on invoice. And the decimal places should not be over 5 since the stockmoves table defined it as decimal(21,5) now. + $LocalCurrencyPrice = round(($OrderLine->Price / $_SESSION['CurrencyRate']),5); if (empty($OrderLine->StandardCost)) { $OrderLine->StandardCost=0; Modified: trunk/sql/mysql/upgrade4.11-4.12.sql =================================================================== --- trunk/sql/mysql/upgrade4.11-4.12.sql 2014-10-06 05:13:27 UTC (rev 6908) +++ trunk/sql/mysql/upgrade4.11-4.12.sql 2014-10-06 11:14:18 UTC (rev 6909) @@ -83,6 +83,7 @@ ALTER TABLE `locations` ADD `usedforwo` TINYINT( 4 ) NOT NULL DEFAULT '1' AFTER `internalrequest`; ALTER TABLE `bankaccounts` ADD `importformat` VARCHAR( 10 ) NOT NULL DEFAULT ''; ALTER TABLE `audittrail` ADD INDEX ( `transactiondate` ); +ALTER TABLE stockmoves MODIFY price DECIMAL(21,5) NOT NULL DEFAULT '0.00000'; UPDATE config SET confvalue='4.12' WHERE confname='VersionNumber'; |
From: <rc...@us...> - 2014-10-10 03:49:05
|
Revision: 6911 http://sourceforge.net/p/web-erp/reponame/6911 Author: rchacon Date: 2014-10-10 03:49:01 +0000 (Fri, 10 Oct 2014) Log Message: ----------- Add transaccion type name translation, transaccion type number and link to GL transaction inquiry. Modified Paths: -------------- trunk/DailyBankTransactions.php trunk/doc/Change.log Modified: trunk/DailyBankTransactions.php =================================================================== --- trunk/DailyBankTransactions.php 2014-10-06 11:15:02 UTC (rev 6910) +++ trunk/DailyBankTransactions.php 2014-10-10 03:49:01 UTC (rev 6911) @@ -1,19 +1,14 @@ <?php - /* $Id: DailyBankTransactions.php 4556 2011-04-26 11:03:36Z daintree $ */ include ('includes/session.inc'); $Title = _('Bank Transactions Inquiry'); - $ViewTopic= 'GeneralLedger'; $BookMark = 'DailyBankTransactions'; include('includes/header.inc'); -echo '<p class="page_title_text"> - <img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . - _('Search') . '" alt="" />' . ' ' . $Title.' - </p>'; +echo '<p class="page_title_text"><img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/money_add.png" title="' . _('Search') . '" />' . ' ' . $Title . '</p>'; if (!isset($_POST['Show'])) { echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">'; @@ -102,6 +97,7 @@ banktrans.exrate, banktrans.banktranstype, banktrans.transdate, + banktrans.transno, banktrans.ref, bankaccounts.bankaccountname, systypes.typename, @@ -122,11 +118,12 @@ $BankDetailRow = DB_fetch_array($BankResult); echo '<table class="selection"> <tr> - <th colspan="9"><h3>' . _('Account Transactions For').' '.$BankDetailRow['bankaccountname'].' '._('Between').' '.$_POST['FromTransDate'] . ' ' . _('and') . ' ' . $_POST['ToTransDate'] . '</h3></th> + <th colspan="10"><h3>' . _('Account Transactions For').' '.$BankDetailRow['bankaccountname'].' '._('Between').' '.$_POST['FromTransDate'] . ' ' . _('and') . ' ' . $_POST['ToTransDate'] . '</h3></th> </tr> <tr> <th>' . ('Date') . '</th> <th>' . _('Transaction type') . '</th> + <th>' . _('Number') . '</th> <th>' . _('Type') . '</th> <th>' . _('Reference') . '</th> <th>' . _('Amount in').' '.$BankDetailRow['currcode'] . '</th> @@ -152,7 +149,8 @@ echo '<tr> <td>' . ConvertSQLDate($myrow['transdate']) . '</td> - <td>' . $myrow['typename'] . '</td> + <td>' . _($myrow['typename']) . '</td> + <td class="number"><a href="' . $RootPath . '/GLTransInquiry.php?TypeID=' . $myrow['typeid'] . '&TransNo=' . $myrow['transno'] . '">' . $myrow['transno'] . '</a></td> <td>' . $myrow['banktranstype'] . '</td> <td>' . $myrow['ref'] . '</td> <td class="number">' . locale_number_format($myrow['amount'],$BankDetailRow['decimalplaces']) . '</td> Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2014-10-06 11:15:02 UTC (rev 6910) +++ trunk/doc/Change.log 2014-10-10 03:49:01 UTC (rev 6911) @@ -1,5 +1,6 @@ webERP Change Log +09/10/14 RChacon: Add transaccion type name translation, transaccion type number and link to GL transaction inquiry in DailyBankTransactions.php. 06/10/14 Exson: Fixed the prices or line total variance in invoice for foreign currencies. 4/10/14 Andrew Galuski: defaulted factory location from WO record 30/09/14 Exson: Fixed the purchase order details status to be right when the PO is recovered from Cancelled status. |
From: <dai...@us...> - 2014-10-13 08:56:25
|
Revision: 6914 http://sourceforge.net/p/web-erp/reponame/6914 Author: daintree Date: 2014-10-13 08:56:08 +0000 (Mon, 13 Oct 2014) Log Message: ----------- Pre 4.11.5 Modified Paths: -------------- trunk/UpgradeDatabase.php trunk/build/make_release.sh trunk/doc/Change.log trunk/includes/ConnectDB.inc trunk/includes/UserLogin.php trunk/includes/session.inc trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo trunk/locale/en_US.utf8/LC_MESSAGES/messages.po trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po trunk/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.11-4.12.sql Modified: trunk/UpgradeDatabase.php =================================================================== --- trunk/UpgradeDatabase.php 2014-10-13 02:57:58 UTC (rev 6913) +++ trunk/UpgradeDatabase.php 2014-10-13 08:56:08 UTC (rev 6914) @@ -181,6 +181,9 @@ $SQLScripts[] = './sql/mysql/upgrade4.11.1-4.11.2.sql'; case '4.11.2': $SQLScripts[] = './sql/mysql/upgrade4.11.2-4.11.3.sql'; + case '4.11.3': + case '4.11.4': + $SQLScripts[] = './sql/mysql/upgrade4.11.3-4.11.4.sql'; break; } //end switch } Modified: trunk/build/make_release.sh =================================================================== --- trunk/build/make_release.sh 2014-10-13 02:57:58 UTC (rev 6913) +++ trunk/build/make_release.sh 2014-10-13 08:56:08 UTC (rev 6914) @@ -3,7 +3,7 @@ BASE_DIR=/var/www/webERP; OUTPUT_DIR=/home/phil/Documents/webERP; MYSQL_USER=root; -MYSQL_PWD=woofwoof; +MYSQL_PWD=a; cd $BASE_DIR; @@ -50,7 +50,7 @@ msgfmt -o locale/es_ES.utf8/LC_MESSAGES/messages.mo locale/es_ES.utf8/LC_MESSAGES/messages.po msgfmt -o locale/et_EE.utf8/LC_MESSAGES/messages.mo locale/et_EE.utf8/LC_MESSAGES/messages.po msgfmt -o locale/fa_IR.utf8/LC_MESSAGES/messages.mo locale/fa_IR.utf8/LC_MESSAGES/messages.po -msgfmt -o locale/fr_FR.utf8/LC_MESSAGES/messages.mo locale/fr_FR.utf8/LC_MESSAGES/messages.po +msgfmt -o locale/fr_FR.utf8/LC_MESSAGES/messages.mo locale/fr_FR.utf8/LC_MESSAGES/messages.po msgfmt -o locale/hr_HR.utf8/LC_MESSAGES/messages.mo locale/hr_HR.utf8/LC_MESSAGES/messages.po msgfmt -o locale/hi_IN.utf8/LC_MESSAGES/messages.mo locale/hi_IN.utf8/LC_MESSAGES/messages.po msgfmt -o locale/hu_HU.utf8/LC_MESSAGES/messages.mo locale/hu_HU.utf8/LC_MESSAGES/messages.po Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2014-10-13 02:57:58 UTC (rev 6913) +++ trunk/doc/Change.log 2014-10-13 08:56:08 UTC (rev 6914) @@ -1,5 +1,12 @@ webERP Change Log -13/10/14: Exson: Fixed the bugs in pattern properties with extra blank which leads to the patterns checking failed for all fields. Report from webERP Chinese community QQ group DongDong. + + +12/10/14 Version 4.11.5 release + +13/10/14: Exson: Fixed the bugs in pattern properties with extra blank which leads to the patterns checking failed for all fields. Report from webERP Chinese community QQ group DongDong. + +12/10/14 Version 4.11.4 release + 09/10/14 RChacon: Add transaccion type name translation, transaccion type number and link to GL transaction inquiry in DailyBankTransactions.php. 06/10/14 Exson: Fixed the prices or line total variance in invoice for foreign currencies. 4/10/14 Andrew Galuski: defaulted factory location from WO record Modified: trunk/includes/ConnectDB.inc =================================================================== --- trunk/includes/ConnectDB.inc 2014-10-13 02:57:58 UTC (rev 6913) +++ trunk/includes/ConnectDB.inc 2014-10-13 08:56:08 UTC (rev 6914) @@ -4,7 +4,7 @@ * this value is saved in the $_SESSION['Versionumber'] when includes/GetConfig.php is run * if VersionNumber is < $Version then the DB update script is run */ -$Version='4.11.3'; //must update manually every time there is a DB change +$Version='4.11.5'; //must update manually every time there is a DB change require_once ($PathPrefix .'includes/MiscFunctions.php'); if (!isset($_SESSION['DatabaseName'])){ //need to get the database name from the file structure Modified: trunk/includes/UserLogin.php =================================================================== --- trunk/includes/UserLogin.php 2014-10-13 02:57:58 UTC (rev 6913) +++ trunk/includes/UserLogin.php 2014-10-13 08:56:08 UTC (rev 6914) @@ -21,7 +21,6 @@ global $debug; global $PathPrefix; - global $Version; if (!isset($_SESSION['AccessLevel']) OR $_SESSION['AccessLevel'] == '' OR (isset($Name) AND $Name != '')) { @@ -152,11 +151,6 @@ include($PathPrefix . 'includes/GetConfig.php'); - /*If the Code $Version - held in ConnectDB.inc is > than the Database VersionNumber held in config table then do upgrades */ - if (strcmp($Version,$_SESSION['VersionNumber'])>0 AND (basename($_SERVER['SCRIPT_NAME'])!='UpgradeDatabase.php')) { - header('Location: UpgradeDatabase.php'); - } - if(isset($_SESSION['DB_Maintenance'])){ if ($_SESSION['DB_Maintenance']>0) { //run the DB maintenance script if (DateDiff(Date($_SESSION['DefaultDateFormat']), Modified: trunk/includes/session.inc =================================================================== --- trunk/includes/session.inc 2014-10-13 02:57:58 UTC (rev 6913) +++ trunk/includes/session.inc 2014-10-13 08:56:08 UTC (rev 6914) @@ -130,6 +130,10 @@ header('Location: index.php'); } +/*If the Code $Version - held in ConnectDB.inc is > than the Database VersionNumber held in config table then do upgrades */ +if (strcmp($Version,$_SESSION['VersionNumber'])>0 AND (basename($_SERVER['SCRIPT_NAME'])!='UpgradeDatabase.php')) { + header('Location: UpgradeDatabase.php'); +} If (isset($_POST['Theme']) AND ($_SESSION['UsersRealName'] == $_POST['RealName'])) { 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 2014-10-13 02:57:58 UTC (rev 6913) +++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2014-10-13 08:56:08 UTC (rev 6914) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: web-erp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-11 08:16-0600\n" +"POT-Creation-Date: 2014-10-13 21:09+1300\n" "PO-Revision-Date: 2013-06-01 11:19-0600\n" "Last-Translator: Rafael Chacon <raf...@gm...>\n" "Language-Team: Arabic <ar...@li...>\n" @@ -18,11 +18,11 @@ "X-Generator: Poedit 1.5.4\n" "X-Launchpad-Export-Date: 2012-03-07 23:01+0000\n" -#: AccountGroups.php:7 includes/MainMenuLinksArray.php:374 +#: AccountGroups.php:5 includes/MainMenuLinksArray.php:374 msgid "Account Groups" msgstr "مجموعات العضوية" -#: AccountGroups.php:20 +#: AccountGroups.php:19 msgid "" "An error occurred in retrieving the account groups of the parent account " "group during the check for recursion" @@ -30,69 +30,69 @@ "لقد حدث خطأ فى استرجاع بيانات مجموعات العضو الخاصة باعضوية الأب اثناء " "االتحقق من وجود استدعاء ذاتي" -#: AccountGroups.php:21 +#: AccountGroups.php:20 msgid "" "The SQL that was used to retrieve the account groups of the parent account " "group and that failed in the process was" msgstr "" -#: AccountGroups.php:50 +#: AccountGroups.php:49 msgid "An error occurred in moving the account group" msgstr "" -#: AccountGroups.php:51 +#: AccountGroups.php:50 msgid "The SQL that was used to move the account group was" msgstr "" -#: AccountGroups.php:53 AccountGroups.php:334 +#: AccountGroups.php:52 AccountGroups.php:334 msgid "Review Account Groups" msgstr "" -#: AccountGroups.php:54 +#: AccountGroups.php:53 msgid "All accounts in the account group:" msgstr "" -#: AccountGroups.php:54 +#: AccountGroups.php:53 msgid "have been changed to the account group:" msgstr "" -#: AccountGroups.php:73 AccountGroups.php:110 AccountGroups.php:211 -#: AccountGroups.php:246 +#: AccountGroups.php:72 AccountGroups.php:109 AccountGroups.php:210 +#: AccountGroups.php:245 msgid "The SQL that was used to retrieve the information was" msgstr "الطلب المستخدم لإسترجاع المعلومات كان" -#: AccountGroups.php:74 +#: AccountGroups.php:73 msgid "Could not check whether the group exists because" msgstr "لم يتم التحقق من وجود المجموعة بسبب" -#: AccountGroups.php:81 +#: AccountGroups.php:80 msgid "The account group name already exists in the database" msgstr "اسم المجموعة موجود مسبقاً" -#: AccountGroups.php:87 +#: AccountGroups.php:86 msgid "The account group name cannot contain the character" msgstr "لا يمكن وضع هذا الحرف في اسم المجموعة" -#: AccountGroups.php:87 Departments.php:30 TaxCategories.php:32 +#: AccountGroups.php:86 Departments.php:30 TaxCategories.php:32 msgid "or the character" msgstr "او الحرف" -#: AccountGroups.php:93 +#: AccountGroups.php:92 msgid "The account group name must be at least one character long" msgstr "اسم المجموعة يجب ان يحتوي علي الأقل علي حرف واحد" -#: AccountGroups.php:100 +#: AccountGroups.php:99 msgid "" "The parent account group selected appears to result in a recursive account " "structure - select an alternative parent account group or make this group a " "top level account group" msgstr "" -#: AccountGroups.php:111 +#: AccountGroups.php:110 msgid "Could not check whether the group is recursive because" msgstr "لم أستطيع التخقق اذا كانت المجموعة ذاتيى الأسترجاع لأن" -#: AccountGroups.php:119 +#: AccountGroups.php:118 msgid "" "Since this account group is a child group, the sequence in the trial " "balance, the section in the accounts and whether or not the account group " @@ -101,226 +101,226 @@ "will have no effect." msgstr "" -#: AccountGroups.php:124 +#: AccountGroups.php:123 msgid "The section in accounts must be an integer" msgstr "يجب ان يكون القسم فى الحساب عدد صحيح" -#: AccountGroups.php:130 +#: AccountGroups.php:129 msgid "The sequence in the trial balance must be an integer" msgstr "التسلسل فى الحساب التجريبى يجب ان يكون عدد صحيح" -#: AccountGroups.php:136 +#: AccountGroups.php:135 msgid "The sequence in the TB must be numeric and less than" msgstr "" -#: AccountGroups.php:152 +#: AccountGroups.php:151 msgid "An error occurred in renaming the account group" msgstr "" -#: AccountGroups.php:153 +#: AccountGroups.php:152 msgid "The SQL that was used to rename the account group was" msgstr "" -#: AccountGroups.php:172 +#: AccountGroups.php:171 msgid "An error occurred in updating the account group" msgstr "حدث خطأ اثناء تحديث مجموعة العضو" -#: AccountGroups.php:173 +#: AccountGroups.php:172 msgid "The SQL that was used to update the account group was" msgstr "" -#: AccountGroups.php:175 AccountSections.php:101 PaymentMethods.php:83 +#: AccountGroups.php:174 AccountSections.php:98 PaymentMethods.php:84 msgid "Record Updated" msgstr "تم التحديث" -#: AccountGroups.php:191 +#: AccountGroups.php:190 msgid "An error occurred in inserting the account group" msgstr "حدث خطأ ما اثناء اضافة المجموعة" -#: AccountGroups.php:192 +#: AccountGroups.php:191 msgid "The SQL that was used to insert the account group was" msgstr "الطلب المستخدم لإضافة مجموعة الحسابات هي" -#: AccountGroups.php:193 AccountSections.php:111 +#: AccountGroups.php:192 AccountSections.php:108 msgid "Record inserted" msgstr "تمت الإضافة بنجاح" -#: AccountGroups.php:210 +#: AccountGroups.php:209 msgid "An error occurred in retrieving the group information from chartmaster" msgstr "" -#: AccountGroups.php:215 +#: AccountGroups.php:214 msgid "" "Cannot delete this account group because general ledger accounts have been " "created using this group" msgstr "" -#: AccountGroups.php:216 AccountGroups.php:251 AccountSections.php:133 -#: Areas.php:115 Areas.php:124 BankAccounts.php:159 CreditStatus.php:125 +#: AccountGroups.php:215 AccountGroups.php:250 AccountSections.php:130 +#: Areas.php:115 Areas.php:124 BankAccounts.php:163 CreditStatus.php:125 #: Currencies.php:244 Currencies.php:252 Currencies.php:260 #: CustomerBranches.php:301 CustomerBranches.php:311 CustomerBranches.php:321 -#: CustomerBranches.php:331 CustomerBranches.php:341 CustomerTypes.php:146 -#: CustomerTypes.php:156 Customers.php:296 Customers.php:305 Customers.php:313 -#: Customers.php:324 Customers.php:334 Departments.php:141 Factors.php:134 -#: FixedAssetCategories.php:137 GLAccounts.php:80 GLAccounts.php:96 -#: Locations.php:279 Locations.php:287 Locations.php:298 Locations.php:307 -#: Locations.php:316 Locations.php:325 Locations.php:334 Locations.php:343 -#: Locations.php:351 MRPDemandTypes.php:87 Manufacturers.php:154 -#: PaymentMethods.php:142 PaymentTerms.php:146 PaymentTerms.php:153 -#: PcExpenses.php:161 SalesCategories.php:128 SalesCategories.php:135 -#: SalesPeople.php:150 SalesPeople.php:157 SalesPeople.php:163 -#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 Shippers.php:93 -#: StockCategories.php:209 Stocks.php:738 Stocks.php:747 Stocks.php:755 -#: Stocks.php:763 Stocks.php:771 Stocks.php:779 Stocks.php:787 Stocks.php:795 -#: SupplierTypes.php:126 Suppliers.php:647 Suppliers.php:656 Suppliers.php:664 -#: TaxCategories.php:132 TaxGroups.php:134 TaxGroups.php:142 -#: TaxProvinces.php:129 UnitsOfMeasure.php:135 WWW_Access.php:86 -#: WorkCentres.php:89 WorkCentres.php:95 +#: CustomerBranches.php:331 CustomerBranches.php:341 Customers.php:296 +#: Customers.php:305 Customers.php:313 Customers.php:324 Customers.php:334 +#: CustomerTypes.php:146 CustomerTypes.php:156 Departments.php:141 +#: Factors.php:134 FixedAssetCategories.php:137 GLAccounts.php:79 +#: GLAccounts.php:95 Locations.php:265 Locations.php:273 Locations.php:284 +#: Locations.php:293 Locations.php:302 Locations.php:311 Locations.php:320 +#: Locations.php:329 Locations.php:337 Manufacturers.php:154 +#: MRPDemandTypes.php:87 PaymentMethods.php:143 PaymentTerms.php:146 +#: PaymentTerms.php:153 PcExpenses.php:161 SalesCategories.php:128 +#: SalesCategories.php:135 SalesPeople.php:150 SalesPeople.php:157 +#: SalesPeople.php:163 SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 +#: Shippers.php:93 StockCategories.php:209 Stocks.php:738 Stocks.php:747 +#: Stocks.php:755 Stocks.php:763 Stocks.php:771 Stocks.php:779 Stocks.php:787 +#: Stocks.php:795 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663 +#: SupplierTypes.php:126 TaxCategories.php:132 TaxGroups.php:134 +#: TaxGroups.php:142 TaxProvinces.php:129 UnitsOfMeasure.php:135 +#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:86 msgid "There are" msgstr "يوجد" -#: AccountGroups.php:216 +#: AccountGroups.php:215 msgid "general ledger accounts that refer to this account group" msgstr "" -#: AccountGroups.php:223 AccountGroups.php:294 AccountGroups.php:407 +#: AccountGroups.php:222 AccountGroups.php:293 AccountGroups.php:407 msgid "Parent Group" msgstr "" -#: AccountGroups.php:239 +#: AccountGroups.php:238 msgid "Move Group" msgstr "" -#: AccountGroups.php:245 +#: AccountGroups.php:244 msgid "An error occurred in retrieving the parent group information" msgstr "" -#: AccountGroups.php:250 +#: AccountGroups.php:249 msgid "" "Cannot delete this account group because it is a parent account group of " "other account group(s)" msgstr "" -#: AccountGroups.php:251 +#: AccountGroups.php:250 msgid "account groups that have this group as its/there parent account group" msgstr "" -#: AccountGroups.php:255 +#: AccountGroups.php:254 msgid "An error occurred in deleting the account group" msgstr "حدث خطأ ما اثناء حذف مجموعة الحسابات" -#: AccountGroups.php:256 +#: AccountGroups.php:255 msgid "The SQL that was used to delete the account group was" msgstr "" -#: AccountGroups.php:258 +#: AccountGroups.php:257 msgid "group has been deleted" msgstr "تم حذف المجموعة" -#: AccountGroups.php:283 +#: AccountGroups.php:282 msgid "The sql that was used to retrieve the account group information was " msgstr "" -#: AccountGroups.php:284 +#: AccountGroups.php:283 msgid "Could not get account groups because" msgstr "لم يتمكن الحصول على مجموات العضو لان" -#: AccountGroups.php:286 AccountSections.php:172 AddCustomerContacts.php:25 +#: AccountGroups.php:285 AccountSections.php:169 AddCustomerContacts.php:25 #: AddCustomerContacts.php:27 AddCustomerNotes.php:101 #: AddCustomerTypeNotes.php:94 AgedDebtors.php:454 AgedSuppliers.php:276 -#: Areas.php:144 AuditTrail.php:11 BOMExtendedQty.php:256 BOMIndented.php:248 -#: BOMIndentedReverse.php:236 BOMInquiry.php:188 BOMListing.php:110 -#: BOMs.php:237 BOMs.php:881 BankReconciliation.php:17 COGSGLPostings.php:19 -#: CompanyPreferences.php:102 CounterReturns.php:1623 CounterSales.php:2108 -#: CounterSales.php:2231 CreditStatus.php:21 Credit_Invoice.php:276 -#: Currencies.php:30 CustEDISetup.php:17 CustItem.php:120 CustItem.php:210 -#: CustItem.php:238 DailyBankTransactions.php:15 DebtorsAtPeriodEnd.php:129 -#: DiscountCategories.php:12 DiscountCategories.php:149 DiscountMatrix.php:16 -#: EDIMessageFormat.php:105 FixedAssetLocations.php:13 -#: FixedAssetRegister.php:16 FixedAssetRegister.php:256 -#: FixedAssetTransfer.php:14 FormDesigner.php:185 GLBalanceSheet.php:387 -#: GLBudgets.php:32 GLJournal.php:250 GLJournalInquiry.php:11 -#: InternalStockRequest.php:311 InventoryPlanning.php:388 -#: InventoryPlanningPrefSupplier.php:479 MRPReport.php:516 -#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 NoSalesItems.php:91 -#: PDFPickingList.php:29 PDFStockLocTransfer.php:16 POReport.php:60 -#: POReport.php:64 POReport.php:68 PO_AuthorisationLevels.php:10 -#: PO_SelectOSPurchOrder.php:148 PcAssignCashToTab.php:59 -#: PcAssignCashToTab.php:133 PcAssignCashToTab.php:149 -#: PcAssignCashToTab.php:193 PriceMatrix.php:16 Prices.php:11 -#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 PurchData.php:241 -#: PurchData.php:373 PurchData.php:401 PurchaseByPrefSupplier.php:305 -#: RecurringSalesOrders.php:320 RelatedItemsUpdate.php:24 -#: SalesAnalReptCols.php:51 SalesAnalRepts.php:14 SalesCategories.php:11 -#: SalesGLPostings.php:19 SalesGraph.php:39 SalesPeople.php:20 -#: SalesTypes.php:20 SelectAsset.php:48 SelectCompletedOrder.php:11 -#: SelectContract.php:69 SelectCreditItems.php:220 SelectCreditItems.php:291 -#: SelectCustomer.php:265 SelectGLAccount.php:65 SelectOrderItems.php:559 -#: SelectOrderItems.php:1444 SelectOrderItems.php:1572 SelectProduct.php:534 -#: SelectSalesOrder.php:508 SelectSupplier.php:14 SelectSupplier.php:220 -#: SelectWorkOrder.php:9 SelectWorkOrder.php:174 SellThroughSupport.php:229 -#: ShipmentCosting.php:11 Shipments.php:17 Shippers.php:123 Shippers.php:160 -#: Shipt_Select.php:8 StockLocMovements.php:14 StockLocStatus.php:29 +#: Areas.php:144 AuditTrail.php:11 BankReconciliation.php:17 +#: BOMExtendedQty.php:256 BOMIndented.php:248 BOMIndentedReverse.php:236 +#: BOMInquiry.php:188 BOMListing.php:110 BOMs.php:237 BOMs.php:888 +#: COGSGLPostings.php:19 CompanyPreferences.php:102 CounterReturns.php:1623 +#: CounterSales.php:2090 CounterSales.php:2186 Credit_Invoice.php:276 +#: CreditStatus.php:21 Currencies.php:30 CustEDISetup.php:17 CustItem.php:120 +#: CustItem.php:210 CustItem.php:238 DailyBankTransactions.php:11 +#: DebtorsAtPeriodEnd.php:129 DiscountCategories.php:12 +#: DiscountCategories.php:149 DiscountMatrix.php:16 EDIMessageFormat.php:105 +#: FixedAssetLocations.php:13 FixedAssetRegister.php:16 +#: FixedAssetRegister.php:256 FixedAssetTransfer.php:14 FormDesigner.php:185 +#: GLBalanceSheet.php:387 GLBudgets.php:32 GLJournalInquiry.php:11 +#: GLJournal.php:250 InternalStockRequest.php:311 InventoryPlanning.php:360 +#: InventoryPlanningPrefSupplier.php:386 MaintenanceTasks.php:14 +#: MaintenanceUserSchedule.php:16 MRPReport.php:516 NoSalesItems.php:91 +#: PcAssignCashToTab.php:59 PcAssignCashToTab.php:133 +#: PcAssignCashToTab.php:149 PcAssignCashToTab.php:193 PDFPickingList.php:29 +#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:60 +#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:148 +#: PriceMatrix.php:16 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 +#: Prices.php:11 PurchaseByPrefSupplier.php:305 PurchData.php:241 +#: PurchData.php:373 PurchData.php:401 RecurringSalesOrders.php:320 +#: RelatedItemsUpdate.php:24 SalesAnalReptCols.php:51 SalesAnalRepts.php:14 +#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:40 +#: SalesPeople.php:20 SalesTypes.php:20 SelectAsset.php:48 +#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:220 +#: SelectCreditItems.php:291 SelectCustomer.php:265 SelectGLAccount.php:65 +#: SelectOrderItems.php:559 SelectOrderItems.php:1444 +#: SelectOrderItems.php:1544 SelectProduct.php:512 SelectSalesOrder.php:508 +#: SelectSupplier.php:14 SelectSupplier.php:220 SelectWorkOrder.php:9 +#: SelectWorkOrder.php:174 SellThroughSupport.php:229 ShipmentCosting.php:11 +#: Shipments.php:17 Shippers.php:123 Shippers.php:160 Shipt_Select.php:8 +#: StockLocMovements.php:14 StockLocStatus.php:29 #: StockSerialItemResearch.php:30 SupplierPriceList.php:14 #: SupplierPriceList.php:224 SupplierPriceList.php:394 #: SupplierPriceList.php:398 SupplierPriceList.php:449 -#: SupplierPriceList.php:499 SupplierTenderCreate.php:556 +#: SupplierPriceList.php:499 Suppliers.php:304 SupplierTenderCreate.php:556 #: SupplierTenderCreate.php:664 SupplierTenders.php:322 -#: SupplierTenders.php:388 SupplierTransInquiry.php:10 Suppliers.php:305 -#: TopItems.php:115 UnitsOfMeasure.php:10 WWW_Access.php:11 WWW_Users.php:36 -#: WhereUsedInquiry.php:18 WorkCentres.php:111 WorkCentres.php:163 -#: WorkOrderCosting.php:22 WorkOrderEntry.php:11 WorkOrderIssue.php:22 -#: WorkOrderReceive.php:31 WorkOrderStatus.php:59 Z_BottomUpCosts.php:57 -#: ../webSHOP/includes/header.php:251 +#: SupplierTenders.php:388 SupplierTransInquiry.php:10 TopItems.php:117 +#: UnitsOfMeasure.php:10 WhereUsedInquiry.php:18 WorkCentres.php:111 +#: WorkCentres.php:163 WorkOrderCosting.php:22 WorkOrderEntry.php:11 +#: WorkOrderIssue.php:22 WorkOrderReceive.php:31 WorkOrderStatus.php:59 +#: WWW_Access.php:11 WWW_Users.php:36 Z_BottomUpCosts.php:57 +#: ../webSHOP/includes/header.php:216 msgid "Search" msgstr "إبحث" -#: AccountGroups.php:290 +#: AccountGroups.php:289 msgid "Group Name" msgstr "إسم المجموعة" -#: AccountGroups.php:291 EDIMessageFormat.php:129 EDIMessageFormat.php:208 +#: AccountGroups.php:290 EDIMessageFormat.php:129 EDIMessageFormat.php:208 msgid "Section" msgstr "قسم" -#: AccountGroups.php:292 AccountGroups.php:461 +#: AccountGroups.php:291 AccountGroups.php:461 msgid "Sequence In TB" msgstr "" -#: AccountGroups.php:293 AccountGroups.php:444 GLProfit_Loss.php:6 +#: AccountGroups.php:292 AccountGroups.php:444 GLProfit_Loss.php:6 #: GLProfit_Loss.php:133 GLProfit_Loss.php:134 GLProfit_Loss.php:185 #: SelectGLAccount.php:23 SelectGLAccount.php:37 SelectGLAccount.php:51 msgid "Profit and Loss" msgstr "" #: AccountGroups.php:310 AccountGroups.php:313 AccountGroups.php:448 -#: AccountGroups.php:450 BOMs.php:126 BOMs.php:793 BOMs.php:795 +#: AccountGroups.php:450 BOMs.php:126 BOMs.php:800 BOMs.php:802 #: CompanyPreferences.php:427 CompanyPreferences.php:429 #: CompanyPreferences.php:442 CompanyPreferences.php:444 #: CompanyPreferences.php:457 CompanyPreferences.php:459 #: ContractCosting.php:202 Currencies.php:330 Currencies.php:508 #: Currencies.php:510 CustomerBranches.php:451 Customers.php:659 #: Customers.php:1049 Customers.php:1055 Customers.php:1058 -#: DailyBankTransactions.php:148 DeliveryDetails.php:1148 +#: DailyBankTransactions.php:145 DeliveryDetails.php:1148 #: DeliveryDetails.php:1191 DeliveryDetails.php:1194 FormDesigner.php:101 #: GLTransInquiry.php:74 Labels.php:603 Labels.php:605 Labels.php:630 -#: Locations.php:660 Locations.php:662 Locations.php:675 Locations.php:677 -#: MRP.php:546 MRP.php:550 MRP.php:554 MRP.php:558 MRP.php:562 -#: MRPCalendar.php:224 PDFChequeListing.php:65 PDFDIFOT.php:80 -#: PDFDeliveryDifferences.php:76 PDFWOPrint.php:601 PDFWOPrint.php:605 -#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139 -#: PO_Header.php:804 PO_PDFPurchOrder.php:413 PO_PDFPurchOrder.php:416 -#: PaymentMethods.php:204 PaymentMethods.php:205 PaymentMethods.php:206 -#: PaymentMethods.php:207 PaymentMethods.php:273 PaymentMethods.php:280 -#: PaymentMethods.php:287 PaymentMethods.php:294 PcAuthorizeExpenses.php:248 -#: PurchData.php:296 PurchData.php:667 PurchData.php:670 -#: RecurringSalesOrders.php:493 RecurringSalesOrders.php:496 +#: Locations.php:646 Locations.php:648 Locations.php:661 Locations.php:663 +#: MRPCalendar.php:224 MRP.php:546 MRP.php:550 MRP.php:554 MRP.php:558 +#: MRP.php:562 PaymentMethods.php:206 PaymentMethods.php:207 +#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:275 +#: PaymentMethods.php:282 PaymentMethods.php:289 PaymentMethods.php:296 +#: PcAuthorizeExpenses.php:248 PDFChequeListing.php:65 +#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:80 PDFWOPrint.php:601 +#: PDFWOPrint.php:605 PO_AuthorisationLevels.php:134 +#: PO_AuthorisationLevels.php:139 PO_Header.php:807 PO_PDFPurchOrder.php:413 +#: PO_PDFPurchOrder.php:416 PurchData.php:296 PurchData.php:667 +#: PurchData.php:670 RecurringSalesOrders.php:493 RecurringSalesOrders.php:496 #: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419 #: SalesAnalReptCols.php:422 SalesAnalRepts.php:420 SalesAnalRepts.php:423 #: SalesAnalRepts.php:448 SalesAnalRepts.php:451 SalesAnalRepts.php:476 #: SalesAnalRepts.php:479 SalesCategories.php:264 SalesCategories.php:351 #: SalesCategories.php:355 SalesPeople.php:219 SalesPeople.php:359 -#: SalesPeople.php:361 SelectProduct.php:238 SelectProduct.php:386 +#: SalesPeople.php:361 SelectProduct.php:239 SelectProduct.php:364 #: ShipmentCosting.php:667 ShopParameters.php:289 ShopParameters.php:293 #: ShopParameters.php:337 ShopParameters.php:341 ShopParameters.php:391 #: ShopParameters.php:395 ShopParameters.php:413 ShopParameters.php:417 @@ -338,39 +338,38 @@ #: SystemParameters.php:1124 SystemParameters.php:1126 TaxGroups.php:310 #: TaxGroups.php:313 TaxGroups.php:364 WWW_Users.php:505 WWW_Users.php:507 #: WWW_Users.php:678 WWW_Users.php:680 -#: reportwriter/languages/en_US/reports.php:114 msgid "Yes" msgstr "موافق" #: AccountGroups.php:316 AccountGroups.php:453 AccountGroups.php:455 -#: BOMs.php:128 BOMs.php:792 BOMs.php:796 BankAccounts.php:210 -#: BankAccounts.php:379 BankAccounts.php:381 BankAccounts.php:385 -#: BankAccounts.php:393 CompanyPreferences.php:426 CompanyPreferences.php:430 +#: BankAccounts.php:216 BankAccounts.php:410 BankAccounts.php:412 +#: BankAccounts.php:416 BankAccounts.php:424 BOMs.php:128 BOMs.php:799 +#: BOMs.php:803 CompanyPreferences.php:426 CompanyPreferences.php:430 #: CompanyPreferences.php:441 CompanyPreferences.php:445 #: CompanyPreferences.php:456 CompanyPreferences.php:460 #: ContractCosting.php:200 Currencies.php:332 Currencies.php:513 #: Currencies.php:515 CustomerBranches.php:451 Customers.php:658 #: Customers.php:1047 Customers.php:1054 Customers.php:1057 -#: DailyBankTransactions.php:150 DeliveryDetails.php:1149 +#: DailyBankTransactions.php:147 DeliveryDetails.php:1149 #: DeliveryDetails.php:1192 DeliveryDetails.php:1195 FormDesigner.php:99 #: GLTransInquiry.php:93 Labels.php:602 Labels.php:606 Labels.php:631 -#: Locations.php:665 Locations.php:667 Locations.php:680 Locations.php:682 -#: MRP.php:544 MRP.php:548 MRP.php:552 MRP.php:556 MRP.php:560 -#: MRPCalendar.php:226 NoSalesItems.php:191 PDFChequeListing.php:64 -#: PDFDIFOT.php:79 PDFDeliveryDifferences.php:75 PDFWOPrint.php:602 +#: Locations.php:651 Locations.php:653 Locations.php:666 Locations.php:668 +#: MRPCalendar.php:226 MRP.php:544 MRP.php:548 MRP.php:552 MRP.php:556 +#: MRP.php:560 NoSalesItems.php:191 PaymentMethods.php:206 +#: PaymentMethods.php:207 PaymentMethods.php:208 PaymentMethods.php:209 +#: PaymentMethods.php:276 PaymentMethods.php:283 PaymentMethods.php:290 +#: PaymentMethods.php:297 PcAuthorizeExpenses.php:246 PDFChequeListing.php:64 +#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:79 PDFWOPrint.php:602 #: PDFWOPrint.php:606 PO_AuthorisationLevels.php:136 -#: PO_AuthorisationLevels.php:141 PO_Header.php:803 PO_PDFPurchOrder.php:414 -#: PO_PDFPurchOrder.php:417 PaymentMethods.php:204 PaymentMethods.php:205 -#: PaymentMethods.php:206 PaymentMethods.php:207 PaymentMethods.php:274 -#: PaymentMethods.php:281 PaymentMethods.php:288 PaymentMethods.php:295 -#: PcAuthorizeExpenses.php:246 PurchData.php:299 PurchData.php:668 +#: PO_AuthorisationLevels.php:141 PO_Header.php:806 PO_PDFPurchOrder.php:414 +#: PO_PDFPurchOrder.php:417 PurchData.php:299 PurchData.php:668 #: PurchData.php:671 RecurringSalesOrders.php:492 RecurringSalesOrders.php:495 #: SalesAnalReptCols.php:282 SalesAnalReptCols.php:420 #: SalesAnalReptCols.php:423 SalesAnalRepts.php:419 SalesAnalRepts.php:422 #: SalesAnalRepts.php:447 SalesAnalRepts.php:450 SalesAnalRepts.php:475 #: SalesAnalRepts.php:478 SalesCategories.php:266 SalesCategories.php:352 #: SalesCategories.php:354 SalesPeople.php:221 SalesPeople.php:364 -#: SalesPeople.php:366 SelectProduct.php:240 SelectProduct.php:388 +#: SalesPeople.php:366 SelectProduct.php:241 SelectProduct.php:366 #: ShipmentCosting.php:668 ShopParameters.php:290 ShopParameters.php:292 #: ShopParameters.php:338 ShopParameters.php:340 ShopParameters.php:392 #: ShopParameters.php:394 ShopParameters.php:414 ShopParameters.php:416 @@ -388,39 +387,36 @@ #: SystemParameters.php:1123 SystemParameters.php:1127 TaxGroups.php:311 #: TaxGroups.php:314 TaxGroups.php:366 WWW_Users.php:504 WWW_Users.php:508 #: WWW_Users.php:677 WWW_Users.php:681 includes/PDFLowGPPageHeader.inc:44 -#: reportwriter/languages/en_US/reports.php:82 msgid "No" msgstr "ﻻ" -#: AccountGroups.php:325 AccountSections.php:193 AddCustomerContacts.php:148 +#: AccountGroups.php:325 AccountSections.php:191 AddCustomerContacts.php:148 #: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164 -#: BOMs.php:155 BankAccounts.php:223 COGSGLPostings.php:112 +#: BankAccounts.php:241 BOMs.php:155 COGSGLPostings.php:112 #: COGSGLPostings.php:216 CreditStatus.php:175 Currencies.php:362 #: Currencies.php:379 CustItem.php:166 CustomerBranches.php:455 -#: CustomerTypes.php:205 Customers.php:1132 Customers.php:1166 +#: Customers.php:1132 Customers.php:1166 CustomerTypes.php:205 #: Departments.php:186 EDIMessageFormat.php:150 Factors.php:334 #: FixedAssetCategories.php:190 FixedAssetLocations.php:111 -#: FreightCosts.php:253 GLAccounts.php:317 GLTags.php:96 GeocodeSetup.php:173 -#: ImportBankTransAnalysis.php:224 InternalStockRequest.php:293 Labels.php:335 -#: Labels.php:360 Locations.php:434 MRPDemandTypes.php:120 MRPDemands.php:309 -#: MailingGroupMaintenance.php:178 MaintenanceTasks.php:118 -#: Manufacturers.php:217 PO_AuthorisationLevels.php:151 PaymentMethods.php:208 -#: PaymentTerms.php:205 PcAssignCashToTab.php:277 -#: PcClaimExpensesFromTab.php:276 PcExpenses.php:226 PcTabs.php:236 -#: PcTypeTabs.php:180 PriceMatrix.php:287 Prices.php:253 -#: Prices_Customer.php:286 PurchData.php:312 SalesCategories.php:272 -#: SalesGLPostings.php:137 SalesGLPostings.php:253 SalesPeople.php:232 -#: SalesTypes.php:206 SecurityTokens.php:130 SelectCustomer.php:614 -#: SelectCustomer.php:633 SelectCustomer.php:663 SelectCustomer.php:681 -#: SelectCustomer.php:705 SelectCustomer.php:722 SelectGLAccount.php:117 -#: SelectGLAccount.php:132 SellThroughSupport.php:298 Shippers.php:144 -#: StockCategories.php:289 SuppTransGLAnalysis.php:125 +#: FreightCosts.php:253 GeocodeSetup.php:173 GLAccounts.php:317 GLTags.php:96 +#: ImportBankTransAnalysis.php:223 InternalStockRequest.php:293 Labels.php:335 +#: Labels.php:360 Locations.php:420 MailingGroupMaintenance.php:178 +#: MaintenanceTasks.php:118 Manufacturers.php:217 MRPDemands.php:309 +#: MRPDemandTypes.php:120 PaymentMethods.php:210 PaymentTerms.php:205 +#: PcAssignCashToTab.php:277 PcClaimExpensesFromTab.php:276 PcExpenses.php:226 +#: PcTabs.php:236 PcTypeTabs.php:180 PO_AuthorisationLevels.php:151 +#: PriceMatrix.php:287 Prices_Customer.php:286 Prices.php:253 +#: PurchData.php:312 SalesCategories.php:272 SalesGLPostings.php:137 +#: SalesGLPostings.php:253 SalesPeople.php:232 SalesTypes.php:206 +#: SecurityTokens.php:130 SelectCustomer.php:614 SelectCustomer.php:633 +#: SelectCustomer.php:663 SelectCustomer.php:681 SelectCustomer.php:705 +#: SelectCustomer.php:722 SelectGLAccount.php:117 SelectGLAccount.php:132 +#: SellThroughSupport.php:298 Shippers.php:144 StockCategories.php:289 #: SupplierContacts.php:165 SupplierTenderCreate.php:157 SupplierTypes.php:170 -#: TaxAuthorities.php:172 TaxCategories.php:184 TaxGroups.php:190 -#: TaxProvinces.php:179 UnitsOfMeasure.php:185 WWW_Access.php:126 -#: WWW_Users.php:341 WorkCentres.php:142 includes/InputSerialItems.php:110 -#: includes/OutputSerialItems.php:20 -#: reportwriter/languages/en_US/reports.php:143 +#: SuppTransGLAnalysis.php:125 TaxAuthorities.php:172 TaxCategories.php:184 +#: TaxGroups.php:190 TaxProvinces.php:179 UnitsOfMeasure.php:185 +#: WorkCentres.php:142 WWW_Access.php:126 WWW_Users.php:341 +#: includes/InputSerialItems.php:110 includes/OutputSerialItems.php:20 #, php-format msgid "Edit" msgstr "تحرير" @@ -429,43 +425,42 @@ msgid "Are you sure you wish to delete this account group?" msgstr "" -#: AccountGroups.php:326 AccountSections.php:197 AddCustomerContacts.php:149 +#: AccountGroups.php:326 AccountSections.php:195 AddCustomerContacts.php:149 #: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165 -#: BOMs.php:157 BankAccounts.php:224 COGSGLPostings.php:113 +#: BankAccounts.php:242 BOMs.php:157 COGSGLPostings.php:113 #: COGSGLPostings.php:217 ContractBOM.php:272 ContractOtherReqts.php:124 -#: CounterReturns.php:740 CounterSales.php:836 CreditStatus.php:176 -#: Credit_Invoice.php:404 Currencies.php:365 CustItem.php:167 -#: CustomerReceipt.php:989 CustomerTypes.php:206 Customers.php:1167 +#: CounterReturns.php:740 CounterSales.php:836 Credit_Invoice.php:404 +#: CreditStatus.php:176 Currencies.php:365 CustItem.php:167 +#: CustomerReceipt.php:989 Customers.php:1167 CustomerTypes.php:206 #: Departments.php:187 DiscountCategories.php:238 DiscountMatrix.php:183 #: EDIMessageFormat.php:151 FixedAssetCategories.php:191 FreightCosts.php:254 -#: GLAccounts.php:318 GLJournal.php:430 GLTags.php:97 GeocodeSetup.php:174 -#: ImportBankTransAnalysis.php:225 InternalStockCategoriesByRole.php:184 +#: GeocodeSetup.php:174 GLAccounts.php:318 GLJournal.php:430 GLTags.php:97 +#: ImportBankTransAnalysis.php:224 InternalStockCategoriesByRole.php:184 #: InternalStockRequest.php:294 Labels.php:336 Labels.php:361 Labels.php:609 -#: Locations.php:435 MRPDemandTypes.php:121 MRPDemands.php:310 -#: MailingGroupMaintenance.php:179 MaintenanceTasks.php:119 -#: Manufacturers.php:218 PO_AuthorisationLevels.php:153 PO_Items.php:768 -#: PaymentMethods.php:209 PaymentTerms.php:206 Payments.php:1104 +#: Locations.php:421 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119 +#: Manufacturers.php:218 MRPDemands.php:310 MRPDemandTypes.php:121 +#: PaymentMethods.php:211 Payments.php:1104 PaymentTerms.php:206 #: PcAssignCashToTab.php:281 PcClaimExpensesFromTab.php:277 PcExpenses.php:227 #: PcExpensesTypeTab.php:187 PcTabs.php:237 PcTypeTabs.php:181 -#: PriceMatrix.php:286 Prices.php:254 Prices_Customer.php:287 -#: PurchData.php:314 PurchData.php:721 RelatedItemsUpdate.php:155 -#: RelatedItemsUpdate.php:170 SalesAnalReptCols.php:299 SalesAnalRepts.php:307 -#: SalesCategories.php:273 SalesGLPostings.php:138 SalesGLPostings.php:254 -#: SalesPeople.php:233 SalesTypes.php:207 SecurityTokens.php:131 -#: SelectCreditItems.php:778 SelectCustomer.php:615 SelectCustomer.php:634 -#: SelectCustomer.php:664 SelectCustomer.php:682 SelectCustomer.php:706 -#: SelectCustomer.php:723 SelectOrderItems.php:1359 SellThroughSupport.php:299 -#: Shipments.php:440 Shippers.php:145 SpecialOrder.php:668 -#: StockCategories.php:290 StockCategories.php:619 StockLocTransfer.php:327 -#: SuppContractChgs.php:99 SuppCreditGRNs.php:117 SuppFixedAssetChgs.php:90 -#: SuppInvGRNs.php:147 SuppShiptChgs.php:90 SuppTransGLAnalysis.php:126 +#: PO_AuthorisationLevels.php:153 PO_Items.php:768 PriceMatrix.php:286 +#: Prices_Customer.php:287 Prices.php:254 PurchData.php:314 PurchData.php:721 +#: RelatedItemsUpdate.php:155 RelatedItemsUpdate.php:170 +#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:273 +#: SalesGLPostings.php:138 SalesGLPostings.php:254 SalesPeople.php:233 +#: SalesTypes.php:207 SecurityTokens.php:131 SelectCreditItems.php:778 +#: SelectCustomer.php:615 SelectCustomer.php:634 SelectCustomer.php:664 +#: SelectCustomer.php:682 SelectCustomer.php:706 SelectCustomer.php:723 +#: SelectOrderItems.php:1359 SellThroughSupport.php:299 Shipments.php:440 +#: Shippers.php:145 SpecialOrder.php:668 StockCategories.php:290 +#: StockCategories.php:619 StockLocTransfer.php:327 SuppContractChgs.php:99 +#: SuppCreditGRNs.php:117 SuppFixedAssetChgs.php:90 SuppInvGRNs.php:147 #: SupplierContacts.php:166 SupplierTenderCreate.php:422 -#: SupplierTenderCreate.php:452 SupplierTypes.php:172 TaxAuthorities.php:173 -#: TaxCategories.php:186 TaxGroups.php:191 TaxProvinces.php:180 -#: UnitsOfMeasure.php:186 WOSerialNos.php:327 WWW_Access.php:127 -#: WWW_Users.php:342 WorkCentres.php:143 includes/InputSerialItemsKeyed.php:60 +#: SupplierTenderCreate.php:452 SupplierTypes.php:172 SuppShiptChgs.php:90 +#: SuppTransGLAnalysis.php:126 TaxAuthorities.php:173 TaxCategories.php:186 +#: TaxGroups.php:191 TaxProvinces.php:180 UnitsOfMeasure.php:186 +#: WorkCentres.php:143 WOSerialNos.php:327 WWW_Access.php:127 +#: WWW_Users.php:342 includes/InputSerialItemsKeyed.php:60 #: includes/OutputSerialItems.php:99 -#: reportwriter/languages/en_US/reports.php:141 #, php-format msgid "Delete" msgstr "حذف" @@ -528,80 +523,80 @@ "ledger accounts should display in the trial balance" msgstr "" -#: AccountGroups.php:465 AccountSections.php:264 AddCustomerContacts.php:260 +#: AccountGroups.php:465 AccountSections.php:262 AddCustomerContacts.php:260 #: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229 -#: BOMs.php:809 BankAccounts.php:399 COGSGLPostings.php:365 +#: BankAccounts.php:431 BOMs.php:816 COGSGLPostings.php:365 #: CreditStatus.php:259 Currencies.php:522 CustLoginSetup.php:273 #: Departments.php:258 DiscountMatrix.php:142 EDIMessageFormat.php:248 #: FixedAssetCategories.php:350 FixedAssetLocations.php:161 -#: FreightCosts.php:371 GLAccounts.php:266 GeocodeSetup.php:271 Labels.php:643 -#: Locations.php:694 MRPDemandTypes.php:188 MRPDemands.php:424 -#: Manufacturers.php:312 OffersReceived.php:57 OffersReceived.php:146 -#: PO_AuthorisationLevels.php:264 PaymentMethods.php:300 PaymentTerms.php:310 +#: FreightCosts.php:371 GeocodeSetup.php:271 GLAccounts.php:265 Labels.php:643 +#: Locations.php:680 Manufacturers.php:312 MRPDemands.php:424 +#: MRPDemandTypes.php:188 OffersReceived.php:57 OffersReceived.php:146 +#: PaymentMethods.php:302 PaymentTerms.php:310 PO_AuthorisationLevels.php:264 #: PriceMatrix.php:230 Prices_Customer.php:369 SalesAnalReptCols.php:552 #: SalesAnalRepts.php:519 SalesGLPostings.php:425 SalesPeople.php:373 -#: Shippers.php:203 StockCategories.php:646 SuppLoginSetup.php:292 -#: SupplierContacts.php:284 TaxAuthorities.php:327 TaxCategories.php:244 -#: TaxProvinces.php:234 UnitsOfMeasure.php:241 WWW_Users.php:749 -#: WorkCentres.php:283 +#: Shippers.php:203 StockCategories.php:646 SupplierContacts.php:284 +#: SuppLoginSetup.php:292 TaxAuthorities.php:327 TaxCategories.php:244 +#: TaxProvinces.php:234 UnitsOfMeasure.php:241 WorkCentres.php:283 +#: WWW_Users.php:749 msgid "Enter Information" msgstr "أدخل المعلومات" -#: AccountSections.php:7 includes/MainMenuLinksArray.php:373 +#: AccountSections.php:5 includes/MainMenuLinksArray.php:373 msgid "Account Sections" msgstr "أعدادات العضو" -#: AccountSections.php:64 +#: AccountSections.php:61 msgid "The account section already exists in the database" msgstr "قسم العضو موجود مسبقا فى قاعدة البيانات" -#: AccountSections.php:71 +#: AccountSections.php:68 msgid "The account section name cannot contain any illegal characters" msgstr "" -#: AccountSections.php:77 +#: AccountSections.php:74 msgid "The account section name must contain at least one character" msgstr "يجب ان يحتوى اسم العضو على الاقل حرف واحد" -#: AccountSections.php:83 AccountSections.php:89 +#: AccountSections.php:80 AccountSections.php:86 msgid "The section number must be an integer" msgstr "قسم الرقم يجب ان يكون عدد صحيح" -#: AccountSections.php:131 +#: AccountSections.php:128 msgid "" "Cannot delete this account section because general ledger accounts groups " "have been created using this section" msgstr "" -#: AccountSections.php:133 +#: AccountSections.php:130 msgid "general ledger accounts groups that refer to this account section" msgstr "" -#: AccountSections.php:145 +#: AccountSections.php:142 msgid "section has been deleted" msgstr "" -#: AccountSections.php:170 +#: AccountSections.php:167 msgid "Could not get account group sections because" msgstr "" -#: AccountSections.php:176 AccountSections.php:236 AccountSections.php:254 +#: AccountSections.php:173 AccountSections.php:234 AccountSections.php:252 msgid "Section Number" msgstr "رقم القطاع" -#: AccountSections.php:177 AccountSections.php:259 +#: AccountSections.php:174 AccountSections.php:257 msgid "Section Description" msgstr "وصف القطاع" -#: AccountSections.php:195 +#: AccountSections.php:193 msgid "Restricted" msgstr "محظور" -#: AccountSections.php:206 +#: AccountSections.php:204 msgid "Review Account Sections" msgstr "راجع أعدادات العضوية" -#: AccountSections.php:225 +#: AccountSections.php:223 msgid "Could not retrieve the requested section please try again." msgstr "لم أستطيع استرجاع القطاع المطلوب حاول مجددا" @@ -642,11 +637,11 @@ #: AddCustomerContacts.php:59 AddCustomerNotes.php:51 #: AddCustomerTypeNotes.php:48 Areas.php:72 CustomerTypes.php:68 #: DeliveryDetails.php:801 DeliveryDetails.php:818 Factors.php:105 -#: FixedAssetItems.php:250 MRPCalendar.php:176 PO_Items.php:380 -#: PcAssignCashToTab.php:91 PcClaimExpensesFromTab.php:82 PcExpenses.php:98 -#: PcTabs.php:104 PcTypeTabs.php:63 SalesAnalReptCols.php:129 -#: SalesPeople.php:97 SalesTypes.php:66 Stocks.php:572 SupplierTypes.php:68 -#: Suppliers.php:532 +#: FixedAssetItems.php:250 MRPCalendar.php:176 PcAssignCashToTab.php:91 +#: PcClaimExpensesFromTab.php:82 PcExpenses.php:98 PcTabs.php:104 +#: PcTypeTabs.php:63 PO_Items.php:380 SalesAnalReptCols.php:129 +#: SalesPeople.php:97 SalesTypes.php:66 Stocks.php:572 Suppliers.php:531 +#: SupplierTypes.php:68 msgid "has been updated" msgstr "" @@ -663,7 +658,7 @@ #: ImportBankTransAnalysis.php:207 PrintWOItemSlip.php:185 #: PrintWOItemSlip.php:196 PrintWOItemSlip.php:207 SalesPeople.php:200 #: SelectCustomer.php:609 StockDispatch.php:275 StockDispatch.php:286 -#: StockDispatch.php:297 SuppTransGLAnalysis.php:108 SupplierContacts.php:152 +#: StockDispatch.php:297 SupplierContacts.php:152 SuppTransGLAnalysis.php:108 #: Tax.php:411 includes/InputSerialItemsFile.php:92 #: includes/InputSerialItemsFile.php:144 msgid "Name" @@ -680,32 +675,33 @@ msgstr "" #: AddCustomerContacts.php:129 AddCustomerContacts.php:241 -#: CustomerBranches.php:414 CustomerBranches.php:849 CustomerInquiry.php:313 -#: Customers.php:1122 Customers.php:1130 EmailCustTrans.php:15 -#: EmailCustTrans.php:64 Factors.php:246 Factors.php:297 Locations.php:630 -#: OrderDetails.php:115 PDFRemittanceAdvice.php:251 PDFWOPrint.php:592 -#: PDFWOPrint.php:595 PDFWOPrint.php:675 PDFWOPrint.php:678 +#: CustomerBranches.php:414 CustomerBranches.php:849 CustomerInquiry.php:418 +#: CustomerInquiry.php:460 Customers.php:1122 Customers.php:1130 +#: EmailCustTrans.php:15 EmailCustTrans.php:64 Factors.php:246 Factors.php:297 +#: Locations.php:616 OrderDetails.php:115 PDFRemittanceAdvice.php:251 +#: PDFWOPrint.php:592 PDFWOPrint.php:595 PDFWOPrint.php:675 PDFWOPrint.php:678 #: PO_PDFPurchOrder.php:400 PO_PDFPurchOrder.php:403 PrintCustTrans.php:750 #: PrintCustTrans.php:981 PrintCustTrans.php:1030 #: PrintCustTransPortrait.php:793 PrintCustTransPortrait.php:1039 -#: PrintCustTransPortrait.php:1095 SelectCustomer.php:427 -#: SelectCustomer.php:612 SelectSupplier.php:288 SupplierContacts.php:156 -#: SupplierContacts.php:277 UserSettings.php:184 WWW_Users.php:297 -#: 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 +#: PrintCustTransPortrait.php:1095 PrintCustTrans_SunlightPower.php:746 +#: PrintCustTrans_SunlightPower.php:977 PrintCustTrans_SunlightPower.php:1026 +#: SelectCustomer.php:427 SelectCustomer.php:612 SelectSupplier.php:288 +#: SupplierContacts.php:156 SupplierContacts.php:277 UserSettings.php:184 +#: WWW_Users.php:297 includes/PDFPickingListHeader.inc:25 +#: includes/PDFStatementPageHeader.inc:67 includes/PDFTransPageHeader.inc:85 +#: includes/PDFTransPageHeaderPortrait.inc:114 +#: includes/PDFTransPageHeader_SunlightPower.inc:84 +#: includes/PDFWOPageHeader.inc:19 includes/PO_PDFOrderPageHeader.inc:29 +#: ../webSHOP/Checkout.php:443 ../webSHOP/Register.php:607 msgid "Email" msgstr "" #: AddCustomerContacts.php:130 AddCustomerContacts.php:250 Customers.php:1123 -#: Customers.php:1131 PDFQuotation.php:252 PDFQuotationPortrait.php:249 -#: PcAssignCashToTab.php:242 PcAssignCashToTab.php:380 +#: Customers.php:1131 PcAssignCashToTab.php:242 PcAssignCashToTab.php:380 #: PcAuthorizeExpenses.php:97 PcClaimExpensesFromTab.php:238 -#: PcClaimExpensesFromTab.php:405 PcReportTab.php:336 SelectCustomer.php:613 -#: ShopParameters.php:198 SystemParameters.php:363 WOSerialNos.php:298 -#: WOSerialNos.php:304 +#: PcClaimExpensesFromTab.php:405 PcReportTab.php:336 PDFQuotation.php:252 +#: PDFQuotationPortrait.php:249 SelectCustomer.php:613 ShopParameters.php:198 +#: SystemParameters.php:363 WOSerialNos.php:298 WOSerialNos.php:304 msgid "Notes" msgstr "" @@ -723,17 +719,19 @@ msgstr "" #: AddCustomerContacts.php:214 Factors.php:234 SupplierContacts.php:239 -#: ../webSHOP/Checkout.php:379 ../webSHOP/Register.php:610 +#: ../webSHOP/Checkout.php:527 ../webSHOP/Register.php:622 msgid "Contact Name" msgstr "" #: AddCustomerContacts.php:232 Contracts.php:781 PDFRemittanceAdvice.php:247 -#: PO_Header.php:1022 PO_Header.php:1107 SelectCreditItems.php:245 +#: PO_Header.php:1025 PO_Header.php:1110 SelectCreditItems.php:245 #: SelectCustomer.php:425 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 +#: includes/PDFTransPageHeader_SunlightPower.inc:83 +#: ../webSHOP/Checkout.php:537 ../webSHOP/Register.php:260 +#: ../webSHOP/Register.php:735 msgid "Phone" msgstr "" @@ -775,12 +773,13 @@ #: AgedControlledInventory.php:47 BankMatching.php:282 #: BankReconciliation.php:217 BankReconciliation.php:294 #: ContractCosting.php:177 CustomerAllocations.php:348 -#: CustomerAllocations.php:378 CustomerInquiry.php:256 +#: CustomerAllocations.php:378 CustomerInquiry.php:237 #: CustomerTransInquiry.php:106 GLAccountInquiry.php:174 #: GLAccountReport.php:343 GLTransInquiry.php:47 MRPCalendar.php:219 -#: PDFRemittanceAdvice.php:308 PaymentAllocations.php:66 -#: PcAssignCashToTab.php:238 PcAuthorizeExpenses.php:93 PrintCustTrans.php:858 -#: PrintCustTransPortrait.php:907 PrintWOItemSlip.php:187 +#: PaymentAllocations.php:66 PcAssignCashToTab.php:238 +#: PcAuthorizeExpenses.php:93 PDFRemittanceAdvice.php:308 +#: PrintCustTrans.php:858 PrintCustTransPortrait.php:907 +#: PrintCustTrans_SunlightPower.php:854 PrintWOItemSlip.php:187 #: PrintWOItemSlip.php:198 PrintWOItemSlip.php:209 ReverseGRN.php:396 #: SelectCustomer.php:659 SelectCustomer.php:701 ShipmentCosting.php:538 #: ShipmentCosting.php:615 Shipments.php:491 StockDispatch.php:277 @@ -793,16 +792,16 @@ #: includes/PDFQuotationPortraitPageHeader.inc:80 #: includes/PDFStatementPageHeader.inc:169 includes/PDFTransPageHeader.inc:51 #: includes/PDFTransPageHeaderPortrait.inc:63 -#: reportwriter/languages/en_US/reports.php:64 +#: includes/PDFTransPageHeader_SunlightPower.inc:48 msgid "Date" msgstr "" #: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:181 #: SelectCustomer.php:660 SelectCustomer.php:702 StockClone.php:911 -#: Stocks.php:1220 UpgradeDatabase.php:233 UpgradeDatabase.php:236 -#: UpgradeDatabase.php:239 UpgradeDatabase.php:242 UpgradeDatabase.php:245 -#: UpgradeDatabase.php:248 UpgradeDatabase.php:251 UpgradeDatabase.php:254 -#: UpgradeDatabase.php:257 Z_Upgrade_3.10-3.11.php:62 +#: Stocks.php:1220 UpgradeDatabase.php:236 UpgradeDatabase.php:239 +#: UpgradeDatabase.php:242 UpgradeDatabase.php:245 UpgradeDatabase.php:248 +#: UpgradeDatabase.php:251 UpgradeDatabase.php:254 UpgradeDatabase.php:257 +#: UpgradeDatabase.php:260 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 @@ -895,17 +894,16 @@ msgstr "" #: AgedControlledInventory.php:12 InventoryQuantities.php:155 -#: InventoryValuation.php:231 Locations.php:406 Locations.php:467 MRP.php:534 -#: MRPCalendar.php:21 MRPCreateDemands.php:197 MRPDemandTypes.php:17 -#: MRPDemands.php:27 MRPPlannedPurchaseOrders.php:265 +#: InventoryValuation.php:231 Locations.php:392 Locations.php:453 +#: MRPCalendar.php:21 MRPCreateDemands.php:197 MRPDemands.php:27 +#: MRPDemandTypes.php:17 MRP.php:534 MRPPlannedPurchaseOrders.php:265 #: MRPPlannedWorkOrders.php:247 MRPPlannedWorkOrders.php:321 -#: PricesByCost.php:8 ReorderLevel.php:194 ReorderLevelLocation.php:12 -#: SelectProduct.php:87 StockDispatch.php:319 StockMovements.php:22 +#: PricesByCost.php:8 ReorderLevelLocation.php:12 ReorderLevel.php:194 +#: SelectProduct.php:88 StockDispatch.php:319 StockMovements.php:22 #: StockQties_csv.php:8 StockQuantityByDate.php:10 StockReorderLevel.php:20 -#: StockSerialItemResearch.php:9 StockSerialItems.php:9 StockStatus.php:45 +#: StockSerialItemResearch.php:9 StockSerialItems.php:9 StockStatus.php:46 #: StockTransferControlled.php:14 SuppLoginSetup.php:24 WWW_Users.php:16 #: includes/MainMenuLinksArray.php:26 -#: reportwriter/languages/en_US/reports.php:243 msgid "Inventory" msgstr "" @@ -915,15 +913,14 @@ #: 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 BOMIndented.php:314 #: BOMIndentedReverse.php:293 BOMInquiry.php:109 BOMInquiry.php:200 -#: BOMs.php:565 BOMs.php:905 ContractBOM.php:242 ContractBOM.php:354 -#: ContractOtherReqts.php:98 CounterReturns.php:1686 CounterSales.php:2113 -#: CounterSales.php:2294 CreditStatus.php:152 CreditStatus.php:243 +#: BOMs.php:565 BOMs.php:912 ContractBOM.php:242 ContractBOM.php:354 +#: ContractOtherReqts.php:98 CounterReturns.php:1686 CounterSales.php:2095 +#: CounterSales.php:2249 CreditStatus.php:152 CreditStatus.php:243 #: CustomerPurchases.php:76 EmailConfirmation.php:219 #: EmailConfirmation.php:349 FixedAssetCategories.php:167 #: FixedAssetDepreciation.php:91 FixedAssetRegister.php:87 @@ -933,41 +930,42 @@ #: InternalStockCategoriesByRole.php:168 InternalStockRequest.php:345 #: InternalStockRequest.php:559 InternalStockRequest.php:629 #: InventoryQuantities.php:246 InventoryValuation.php:207 Labels.php:292 -#: MRPDemandTypes.php:113 MRPDemands.php:92 MRPDemands.php:295 -#: MRPPlannedWorkOrders.php:258 MRPReport.php:536 MRPReport.php:750 -#: MRPReschedules.php:192 MRPShortages.php:350 MaintenanceTasks.php:95 -#: MaintenanceUserSchedule.php:50 MaterialsNotUsed.php:35 NoSalesItems.php:194 -#: PDFOrderStatus.php:337 PDFOrdersInvoiced.php:335 PO_Items.php:716 -#: PO_Items.php:1188 PO_SelectOSPurchOrder.php:263 PO_SelectPurchOrder.php:214 -#: PaymentTerms.php:182 PcExpenses.php:190 PcExpenses.php:296 -#: PcExpensesTypeTab.php:171 PcReportTab.php:179 PcTypeTabs.php:164 -#: PricesByCost.php:153 RelatedItemsUpdate.php:154 ReorderLevel.php:298 -#: ReorderLevelLocation.php:73 ReverseGRN.php:395 SalesCategories.php:509 -#: SecurityTokens.php:94 SecurityTokens.php:103 SecurityTokens.php:120 -#: SelectAsset.php:264 SelectCompletedOrder.php:505 SelectContract.php:147 -#: SelectCreditItems.php:1021 SelectOrderItems.php:1454 -#: SelectOrderItems.php:1644 SelectProduct.php:554 SelectProduct.php:780 +#: MaintenanceTasks.php:95 MaintenanceUserSchedule.php:50 +#: MaterialsNotUsed.php:35 MRPDemands.php:92 MRPDemands.php:295 +#: MRPDemandTypes.php:113 MRPPlannedWorkOrders.php:258 MRPReport.php:536 +#: MRPReport.php:750 MRPReschedules.php:192 MRPShortages.php:350 +#: NoSalesItems.php:194 PaymentTerms.php:182 PcExpenses.php:190 +#: PcExpenses.php:296 PcExpensesTypeTab.php:171 PcReportTab.php:179 +#: PcTypeTabs.php:164 PDFOrdersInvoiced.php:335 PDFOrderStatus.php:337 +#: PO_Items.php:716 PO_Items.php:1188 PO_SelectOSPurchOrder.php:263 +#: PO_SelectPurchOrder.php:214 PricesByCost.php:153 RelatedItemsUpdate.php:154 +#: ReorderLevelLocation.php:73 ReorderLevel.php:298 ReverseGRN.php:395 +#: SalesCategories.php:509 SecurityTokens.php:94 SecurityTokens.php:103 +#: SecurityTokens.php:120 SelectAsset.php:264 SelectCompletedOrder.php:505 +#: SelectContract.php:147 SelectCreditItems.php:1021 SelectOrderItems.php:1454 +#: SelectOrderItems.php:1616 SelectProduct.php:532 SelectProduct.php:758 #: SelectSalesOrder.php:556 SelectWorkOrder.php:219 Shipt_Select.php:191 #: StockClone.php:665 StockCounts.php:142 StockDispatch.php:504 #: StockLocStatus.php:173 StockQuantityByDate.php:109 Stocks.php:988 #: SuppCreditGRNs.php:92 SuppCreditGRNs.php:192 SuppFixedAssetChgs.php:78 -#: SuppInvGRNs.php:120 SuppInvGRNs.php:257 SuppPriceList.php:309 -#: SupplierCredit.php:317 SupplierCredit.php:385 SupplierInvoice.php:664 -#: SupplierInvoice.php:744 SupplierPriceList.php:39 SupplierPriceList.php:271 +#: SuppInvGRNs.php:120 SuppInvGRNs.php:257 SupplierCredit.php:317 +#: SupplierCredit.php:385 SupplierInvoice.php:664 SupplierInvoice.php:744 +#: SupplierPriceList.php:39 SupplierPriceList.php:271 #: SupplierPriceList.php:533 SupplierTenderCreate.php:434 #: SupplierTenderCreate.php:695 SupplierTenderCreate.php:853 #: SupplierTenders.php:326 SupplierTenders.php:421 SupplierTenders.php:687 -#: TopItems.php:167 WorkCentres.php:128 WorkOrderCosting.php:100 -#: WorkOrderCosting.php:132 WorkOrderEntry.php:739 WorkOrderIssue.php:759 -#: Z_ItemsWithoutPicture.php:33 api/api_xml-rpc.php:3489 +#: SuppPriceList.php:309 TopItems.php:169 WorkCentres.php:128 +#: WorkOrderCosting.php:100 WorkOrderCosting.php:132 WorkOrderEntry.php:738 +#: WorkOrderIssue.php:761 Z_ItemsWithoutPicture.php:33 +#: includes/DefineLabelClass.php:12 includes/DefineLabelClass.php:45 #: includes/PDFGrnHeader.inc:29 includes/PDFInventoryPlanPageHeader.inc:51 #: includes/PDFOstdgGRNsPageHeader.inc:38 #: includes/PDFStockLocTransferHeader.inc:65 #: includes/PDFStockTransferHeader.inc:36 includes/PDFTopItemsHeader.inc:50 #: includes/PDFTransPageHeader.inc:211 #: includes/PDFTransPageHeaderPortrait.inc:267 -#: includes/DefineLabelClass.php:12 includes/DefineLabelClass.php:45 -#: ../webSHOP/includes/PlaceOrder.php:236 +#: includes/PDFTransPageHeader_SunlightPower.inc:210 api/api_xml-rpc.php:3489 +#: ../webSHOP/includes/PlaceOrder.php:250 msgid "Description" msgstr "" @@ -992,7 +990,7 @@ #: CounterReturns.php:756 CounterSales.php:759 CounterSales.php:853 #: CounterSales.php:855 Credit_Invoice.php:298 Credit_Invoice.php:302 #: CustomerAllocations.php:349 CustomerAllocations.php:379 -#: CustomerInquiry.php:261 DeliveryDetails.php:876 DeliveryDetails.php:945 +#: CustomerInquiry.php:242 DeliveryDetails.php:876 DeliveryDetails.php:945 #: GLBalanceSheet.php:191 GLBalanceSheet.php:203 GLBalanceSheet.php:293 #: GLBalanceSheet.php:302 GLBudgets.php:213 GLJournal.php:435 #: GLTransInquiry.php:195 GLTrialBalance.php:225 GLTrialBalance.php:245 @@ -1007,18 +1005,16 @@ #: SalesByTypePeriodInquiry.php:465 SalesByTypePeriodInquiry.php:500 #: SalesByTypePeriodInquiry.php:561 SelectCreditItems.php:692 #: SelectCreditItems.php:696 SelectOrderItems.php:1301 -#: SuppContractChgs.php:107 SuppFixedAssetChgs.php:97 SuppShiptChgs.php:97 -#: SuppTransGLAnalysis.php:139 SupplierAllocations.php:458 -#: SupplierAllocations.php:570 SupplierAllocations.php:645 -#: SupplierCredit.php:407 SupplierInquiry.php:214 Tax.php:250 -#: Z_CheckDebtorsControl.php:149 api/api_debtortransactions.php:1271 +#: SuppContractChgs.php:107 SuppFixedAssetChgs.php:97 +#: SupplierAllocations.php:458 SupplierAllocations.php:570 +#: SupplierAllocations.php:645 SupplierCredit.php:407 SupplierInquiry.php:214 +#: SuppShiptChgs.php:97 SuppTransGLAnalysis.php:139 Tax.php:250 +#: Z_CheckDebtorsControl.php:149 includes/PDFQuotationPageHeader.inc:109 +#: includes/PDFQuotationPortraitPageHeader.inc:100 +#: includes/PO_PDFOrderPageHeader.inc:81 api/api_debtortransactions.php:1271 #: api/api_d... [truncated message content] |
From: <rc...@us...> - 2014-10-17 21:08:18
|
Revision: 6922 http://sourceforge.net/p/web-erp/reponame/6922 Author: rchacon Date: 2014-10-17 21:08:14 +0000 (Fri, 17 Oct 2014) Log Message: ----------- Remove translation of tax category 'Freight' inside database. Modified Paths: -------------- trunk/doc/Change.log trunk/includes/DefineCartClass.php Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2014-10-17 06:23:51 UTC (rev 6921) +++ trunk/doc/Change.log 2014-10-17 21:08:14 UTC (rev 6922) @@ -1,4 +1,5 @@ webERP Change Log +17/10/14 RChacon: Remove translation of tax category 'Freight' inside database. 17/10/14 Exson: Add po line and due date result in OrderDetails.php. 15/10/14 Exson: Fixed no receipt data displayed retrieved bugs for sales login in CustomerInquiry.php. 14/10/14 Jiro Akits: Update Chinese traditional translation. Modified: trunk/includes/DefineCartClass.php =================================================================== --- trunk/includes/DefineCartClass.php 2014-10-17 06:23:51 UTC (rev 6921) +++ trunk/includes/DefineCartClass.php 2014-10-17 21:08:14 UTC (rev 6922) @@ -374,7 +374,7 @@ /*Gets the Taxes and rates applicable to the freight based on the tax group of the branch combined with the tax category for this particular freight and SESSION['FreightTaxCategory'] the taxprovince of the dispatch location */ - $sql = "SELECT taxcatid FROM taxcategories WHERE taxcatname='" . _('Freight') . "'";// To allow translations of tax category "Freight". + $sql = "SELECT taxcatid FROM taxcategories WHERE taxcatname='" . 'Freight' . "'";// To allow translations of tax category "Freight".*********************** $TaxCatQuery = DB_query($sql, $db); if ($TaxCatRow = DB_fetch_array($TaxCatQuery)) { |
From: <dai...@us...> - 2014-10-18 02:03:26
|
Revision: 6924 http://sourceforge.net/p/web-erp/reponame/6924 Author: daintree Date: 2014-10-18 02:03:22 +0000 (Sat, 18 Oct 2014) Log Message: ----------- Setup mods infrastructure Modified Paths: -------------- trunk/SystemParameters.php trunk/doc/Change.log trunk/includes/DefineCartClass.php trunk/includes/MainMenuLinksArray.php trunk/includes/MiscFunctions.php trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot trunk/sql/mysql/country_sql/default.sql trunk/sql/mysql/country_sql/demo.sql trunk/sql/mysql/upgrade4.11-4.12.sql Added Paths: ----------- trunk/mods/ trunk/mods/includes/ Modified: trunk/SystemParameters.php =================================================================== --- trunk/SystemParameters.php 2014-10-17 21:22:39 UTC (rev 6923) +++ trunk/SystemParameters.php 2014-10-18 02:03:22 UTC (rev 6924) @@ -243,6 +243,9 @@ if ($_SESSION['ProhibitJournalsToControlAccounts'] != $_POST['X_ProhibitJournalsToControlAccounts'] ) { $sql[] = "UPDATE config SET confvalue = '". $_POST['X_ProhibitJournalsToControlAccounts']."' WHERE confname = 'ProhibitJournalsToControlAccounts'"; } + if ($_SESSION['InvoiceQuantityDefault'] != $_POST['X_InvoiceQuantityDefault'] ) { + $sql[] = "UPDATE config SET confvalue = '". $_POST['X_InvoiceQuantityDefault']."' WHERE confname = 'InvoiceQuantityDefault'"; + } if ($_SESSION['InvoicePortraitFormat'] != $_POST['X_InvoicePortraitFormat'] ) { $sql[] = "UPDATE config SET confvalue = '". $_POST['X_InvoicePortraitFormat']."' WHERE confname = 'InvoicePortraitFormat'"; } @@ -321,11 +324,11 @@ foreach ($_POST['X_ItemDescriptionLanguages'] as $ItemLanguage){ $ItemDescriptionLanguages .= $ItemLanguage .','; } - + if ($_SESSION['ItemDescriptionLanguages'] != $ItemDescriptionLanguages){ $sql[] = "UPDATE config SET confvalue='" . $ItemDescriptionLanguages . "' WHERE confname='ItemDescriptionLanguages'"; } - } + } if ($_SESSION['SmtpSetting'] != $_POST['X_SmtpSetting']){ $sql[] = "UPDATE config SET confvalue = '" . $_POST['X_SmtpSetting'] . "' WHERE confname='SmtpSetting'"; @@ -505,6 +508,15 @@ <td>' . _('Select the invoice layout') . '</td> </tr>'; +//Default Invoice Quantity +echo '<tr style="outline: 1px solid"><td>' . _('Invoice Quantity Default') . ':</td> + <td><select name="X_InvoicePortraitFormat"> + <option '.($_SESSION['InvoiceQuantityDefault']=='0'?'selected="selected" ':'').'value="0">' . _('0') . '</option> + <option '.($_SESSION['InvoiceQuantityDefault']=='1'?'selected="selected" ':'').'value="1">' . _('Outstanding') . '</option> + </select></td> + <td>' . _('This setting controls the default behaviour of invoicing. Setting to 0 defaults the invocie quantity to zero to force entry. Set to outstanding to default the invoice quantity to the balance outstanding, after previous deliveries, on the sales order') . '</td> + </tr>'; + //Blind packing note echo '<tr style="outline: 1px solid"><td>' . _('Show company details on packing slips') . ':</td> <td><select name="X_DefaultBlindPackNote"> @@ -623,8 +635,8 @@ echo '</select></td> <td>' . _('Set to Automatic - Supplier codes are automatically created - as a sequential number') . '</td></tr>'; - - + + //==HJ== drop down list for tax category $sql = "SELECT taxcatid, taxcatname FROM taxcategories ORDER BY taxcatname"; $ErrMsg = _('Could not load tax categories table'); Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2014-10-17 21:22:39 UTC (rev 6923) +++ trunk/doc/Change.log 2014-10-18 02:03:22 UTC (rev 6924) @@ -3,7 +3,7 @@ 17/10/14 Exson: Add po line and due date result in OrderDetails.php. 15/10/14 Exson: Fixed no receipt data displayed retrieved bugs for sales login in CustomerInquiry.php. 14/10/14 Jiro Akits: Update Chinese traditional translation. -12/10/14 Version 4.11.5 release +13/10/14 Version 4.11.5 release 13/10/14: Exson: Fixed the bugs in pattern properties with extra blank which leads to the patterns checking failed for all fields. Report from webERP Chinese community QQ group DongDong. Modified: trunk/includes/DefineCartClass.php =================================================================== --- trunk/includes/DefineCartClass.php 2014-10-17 21:22:39 UTC (rev 6923) +++ trunk/includes/DefineCartClass.php 2014-10-18 02:03:22 UTC (rev 6924) @@ -490,7 +490,11 @@ if ($Controlled==1){ $this->QtyDispatched = 0; } else { - $this->QtyDispatched = $Qty - $QtyInvoiced; + if ($_SESSION['InvoiceQuantityDefault']==1){ + $this->QtyDispatched = $Qty - $QtyInvoiced; + } else { + $this->QtyDispathced = 0; + } } $this->QOHatLoc = $QOHatLoc; $this->MBflag = $MBflag; Modified: trunk/includes/MainMenuLinksArray.php =================================================================== --- trunk/includes/MainMenuLinksArray.php 2014-10-17 21:22:39 UTC (rev 6923) +++ trunk/includes/MainMenuLinksArray.php 2014-10-18 02:03:22 UTC (rev 6924) @@ -40,14 +40,14 @@ _('Recurring Order Template'), _('Process Recurring Orders')); -$MenuItems['orders']['Transactions']['URL'] = array('/SelectOrderItems.php?NewOrder=Yes', - '/CounterSales.php', - '/CounterReturns.php', - '/PDFPickingList.php', - '/SelectSalesOrder.php', - '/SpecialOrder.php', - '/SelectRecurringSalesOrder.php', - '/RecurringSalesOrdersProcess.php'); +$MenuItems['orders']['Transactions']['URL'] = array(CheckMods('/SelectOrderItems.php') . '?NewOrder=Yes', + CheckMods('/CounterSales.php'), + CheckMods('/CounterReturns.php'), + CheckMods('/PDFPickingList.php'), + CheckMods('/SelectSalesOrder.php'), + CheckMods('/SpecialOrder.php'), + CheckMods('/SelectRecurringSalesOrder.php'), + CheckMods('/RecurringSalesOrdersProcess.php')); $MenuItems['orders']['Reports']['Caption'] = array( _('Sales Order Inquiry'), _('Print Price Lists'), @@ -66,39 +66,39 @@ _('Sales With Low Gross Profit Report'), _('Sell Through Support Claims Report')); -$MenuItems['orders']['Reports']['URL'] = array( '/SelectCompletedOrder.php', - '/PDFPriceList.php', - '/PDFOrderStatus.php', - '/PDFOrdersInvoiced.php', - '/DailySalesInquiry.php', - '/SalesByTypePeriodInquiry.php', - '/SalesCategoryPeriodInquiry.php', - '/SalesTopItemsInquiry.php', - '/PDFDeliveryDifferences.php', - '/PDFDIFOT.php', - '/SalesInquiry.php', - '/TopItems.php', - '/SalesTopCustomersInquiry.php', - '/NoSalesItems.php', - '/PDFLowGP.php', - '/PDFSellThroughSupportClaim.php'); +$MenuItems['orders']['Reports']['URL'] = array( CheckMods('/SelectCompletedOrder.php'), + CheckMods('/PDFPriceList.php'), + CheckMods('/PDFOrderStatus.php'), + CheckMods('/PDFOrdersInvoiced.php'), + CheckMods('/DailySalesInquiry.php'), + CheckMods('/SalesByTypePeriodInquiry.php'), + CheckMods('/SalesCategoryPeriodInquiry.php'), + CheckMods('/SalesTopItemsInquiry.php'), + CheckMods('/PDFDeliveryDifferences.php'), + CheckMods('/PDFDIFOT.php'), + CheckMods('/SalesInquiry.php'), + CheckMods('/TopItems.php'), + CheckMods('/SalesTopCustomersInquiry.php'), + CheckMods('/NoSalesItems.php'), + CheckMods('/PDFLowGP.php'), + CheckMods('/PDFSellThroughSupportClaim.php') ); $MenuItems['orders']['Maintenance']['Caption'] = array( _('Create Contract'), _('Select Contract'), _('Sell Through Support Deals')); -$MenuItems['orders']['Maintenance']['URL'] = array( '/Contracts.php', - '/SelectContract.php', - '/SellThroughSupport.php'); +$MenuItems['orders']['Maintenance']['URL'] = array( CheckMods('/Contracts.php'), + CheckMods('/SelectContract.php'), + CheckMods('/SellThroughSupport.php')); $MenuItems['AR']['Transactions']['Caption'] = array(_('Select Order to Invoice'), _('Create A Credit Note'), _('Enter Receipts'), _('Allocate Receipts or Credit Notes')); -$MenuItems['AR']['Transactions']['URL'] = array('/SelectSalesOrder.php', - '/SelectCreditItems.php?NewCredit=Yes', - '/CustomerReceipt.php?NewReceipt=Yes&Type=Customer', - '/CustomerAllocations.php'); +$MenuItems['AR']['Transactions']['URL'] = array(CheckMods('/SelectSalesOrder.php'), + CheckMods('/SelectCreditItems.php') . '?NewCredit=Yes', + CheckMods('/CustomerReceipt.php') . '?NewReceipt=Yes&Type=Customer', + CheckMods('/CustomerAllocations.php') ); $MenuItems['AR']['Reports']['Caption'] = array( _('Where Allocated Inquiry'), _('Print Invoices or Credit Notes'), @@ -113,32 +113,32 @@ _('Customer Transaction Inquiries') ); if ($_SESSION['InvoicePortraitFormat']==0){ - $PrintInvoicesOrCreditNotesScript = '/PrintCustTrans.php'; + $PrintInvoicesOrCreditNotesScript = CheckMods('/PrintCustTrans.php'); } else { - $PrintInvoicesOrCreditNotesScript = '/PrintCustTransPortrait.php'; + $PrintInvoicesOrCreditNotesScript = CheckMods('/PrintCustTransPortrait.php'); } -$MenuItems['AR']['Reports']['URL'] = array( '/CustWhereAlloc.php', +$MenuItems['AR']['Reports']['URL'] = array( CheckMods('/CustWhereAlloc.php'), $PrintInvoicesOrCreditNotesScript, - '/PrintCustStatements.php', - '/SalesAnalRepts.php', - '/AgedDebtors.php', - '/PDFBankingSummary.php', - '/DebtorsAtPeriodEnd.php', - '/PDFCustomerList.php', - '/SalesGraph.php', - '/PDFCustTransListing.php', - '/CustomerTransInquiry.php'); + CheckMods('/PrintCustStatements.php'), + CheckMods('/SalesAnalRepts.php'), + CheckMods('/AgedDebtors.php'), + CheckMods('/PDFBankingSummary.php'), + CheckMods('/DebtorsAtPeriodEnd.php'), + CheckMods('/PDFCustomerList.php'), + CheckMods('/SalesGraph.php'), + CheckMods('/PDFCustTransListing.php'), + CheckMods('/CustomerTransInquiry.php') ); $MenuItems['AR']['Maintenance']['Caption'] = array( _('Add Customer'), _('Select Customer')); -$MenuItems['AR']['Maintenance']['URL'] = array( '/Customers.php', - '/SelectCustomer.php'); +$MenuItems['AR']['Maintenance']['URL'] = array( CheckMods('/Customers.php'), + CheckMods('/SelectCustomer.php') ); $MenuItems['AP']['Transactions']['Caption'] = array(_('Select Supplier'), _('Supplier Allocations')); -$MenuItems['AP']['Transactions']['URL'] = array('/SelectSupplier.php', - '/SupplierAllocations.php'); +$MenuItems['AP']['Transactions']['URL'] = array(CheckMods('/SelectSupplier.php'), + CheckMods('/SupplierAllocations.php') ); $MenuItems['AP']['Reports']['Caption'] = array( _('Aged Supplier Report'), _('Payment Run Report'), @@ -148,20 +148,20 @@ _('List Daily Transactions'), _('Supplier Transaction Inquiries')); -$MenuItems['AP']['Reports']['URL'] = array( '/AgedSuppliers.php', - '/SuppPaymentRun.php', - '/PDFRemittanceAdvice.php', - '/OutstandingGRNs.php', - '/SupplierBalsAtPeriodEnd.php', - '/PDFSuppTransListing.php', - '/SupplierTransInquiry.php'); +$MenuItems['AP']['Reports']['URL'] = array( CheckMods('/AgedSuppliers.php'), + CheckMods('/SuppPaymentRun.php'), + CheckMods('/PDFRemittanceAdvice.php'), + CheckMods('/OutstandingGRNs.php'), + CheckMods('/SupplierBalsAtPeriodEnd.php'), + CheckMods('/PDFSuppTransListing.php'), + CheckMods('/SupplierTransInquiry.php') ); $MenuItems['AP']['Maintenance']['Caption'] = array( _('Add Supplier'), _('Select Supplier'), _('Maintain Factor Companies')); -$MenuItems['AP']['Maintenance']['URL'] = array( '/Suppliers.php', - '/SelectSupplier.php', - '/Factors.php'); +$MenuItems['AP']['Maintenance']['URL'] = array( CheckMods('/Suppliers.php'), + CheckMods('/SelectSupplier.php'), + CheckMods('/Factors.php') ); $MenuItems['PO']['Transactions']['Caption'] = array(_('New Purchase Order'), _('Purchase Orders'), @@ -172,27 +172,27 @@ _('Orders to Authorise'), _('Shipment Entry'), _('Select A Shipment')); -$MenuItems['PO']['Transactions']['URL'] = array( '/PO_Header.php?NewOrder=Yes', - '/PO_SelectOSPurchOrder.php', - '/PurchaseByPrefSupplier.php', - '/SupplierTenderCreate.php?New=Yes', - '/SupplierTenderCreate.php?Edit=Yes', - '/OffersReceived.php', - '/PO_AuthoriseMyOrders.php', - '/SelectSupplier.php', - '/Shipt_Select.php'); +$MenuItems['PO']['Transactions']['URL'] = array(CheckMods('/PO_Header.php') . '?NewOrder=Yes', + CheckMods('/PO_SelectOSPurchOrder.php'), + CheckMods('/PurchaseByPrefSupplier.php'), + CheckMods('/SupplierTenderCreate.php') . '?New=Yes', + CheckMods('/SupplierTenderCreate.php') . '?Edit=Yes', + CheckMods('/OffersReceived.php'), + CheckMods('/PO_AuthoriseMyOrders.php'), + CheckMods('/SelectSupplier.php'), + CheckMods('/Shipt_Select.php') ); $MenuItems['PO']['Reports']['Caption'] = array( _('Purchase Order Inquiry'), _('Purchase Order Detail Or Summary Inquiries'), _('Supplier Price List')); -$MenuItems['PO']['Reports']['URL'] = array( '/PO_SelectPurchOrder.php', - '/POReport.php', - '/SuppPriceList.php'); +$MenuItems['PO']['Reports']['URL'] = array( CheckMods('/PO_SelectPurchOrder.php'), + CheckMods('/POReport.php'), + CheckMods('/SuppPriceList.php') ); $MenuItems['PO']['Maintenance']['Caption'] = array(_('Maintain Supplier Price Lists')); -$MenuItems['PO']['Maintenance']['URL'] = array('/SupplierPriceList.php'); +$MenuItems['PO']['Maintenance']['URL'] = array(CheckMods('/SupplierPriceList.php')); $MenuItems['stock']['Transactions']['Caption'] = array( _('Receive Purchase Orders'), _('Inventory Location Transfers'), //"Inventory Transfer - Item Dispatch" @@ -205,16 +205,16 @@ _('Authorise Internal Stock Requests'), _('Fulfill Internal Stock Requests')); -$MenuItems['stock']['Transactions']['URL'] = array( '/PO_SelectOSPurchOrder.php', - '/StockTransfers.php?New=Yes', - '/StockLocTransfer.php', - '/StockLocTransferReceive.php', - '/StockAdjustments.php?NewAdjustment=Yes', - '/ReverseGRN.php', - '/StockCounts.php', - '/InternalStockRequest.php?New=Yes', - '/InternalStockRequestAuthorisation.php', - '/InternalStockRequestFulfill.php'); +$MenuItems['stock']['Transactions']['URL'] = array( CheckMods('/PO_SelectOSPurchOrder.php'), + CheckMods('/StockTransfers.php') . '?New=Yes', + CheckMods('/StockLocTransfer.php'), + CheckMods('/StockLocTransferReceive.php'), + CheckMods('/StockAdjustments.php') . '?NewAdjustment=Yes', + CheckMods('/ReverseGRN.php'), + CheckMods('/StockCounts.php'), + CheckMods('/InternalStockRequest.php') . '?New=Yes', + CheckMods('/InternalStockRequestAuthorisation.php'), + CheckMods('/InternalStockRequestFulfill.php') ); $MenuItems['stock']['Reports']['Caption'] = array( _('Serial Item Research Tool'), _('Print Price Labels'), @@ -240,29 +240,29 @@ _('Stock Transfer Note'), _('Aged Controlled Stock Report')); -$MenuItems['stock']['Reports']['URL'] = array( '/StockSerialItemResearch.php', - '/PDFPrintLabel.php', - '/ReprintGRN.php', - '/StockMovements.php', - '/StockStatus.php', - '/StockUsage.php', - '/InventoryQuantities.php', - '/ReorderLevel.php', - '/StockDispatch.php', - '/InventoryValuation.php', - '/MailInventoryValuation.php', - '/InventoryPlanning.php', - '/InventoryPlanningPrefSupplier.php', - '/StockCheck.php', - '/StockQties_csv.php', - '/PDFStockCheckComparison.php', - '/StockLocMovements.php', - '/StockLocStatus.php', - '/StockQuantityByDate.php', - '/PDFStockNegatives.php', - '/PDFPeriodStockTransListing.php', - '/PDFStockTransfer.php', - '/AgedControlledInventory.php'); +$MenuItems['stock']['Reports']['URL'] = array( CheckMods('/StockSerialItemResearch.php'), + CheckMods('/PDFPrintLabel.php'), + CheckMods('/ReprintGRN.php'), + CheckMods('/StockMovements.php'), + CheckMods('/StockStatus.php'), + CheckMods('/StockUsage.php'), + CheckMods('/InventoryQuantities.php'), + CheckMods('/ReorderLevel.php'), + CheckMods('/StockDispatch.php'), + CheckMods('/InventoryValuation.php'), + CheckMods('/MailInventoryValuation.php'), + CheckMods('/InventoryPlanning.php'), + CheckMods('/InventoryPlanningPrefSupplier.php'), + CheckMods('/StockCheck.php'), + CheckMods('/StockQties_csv.php'), + CheckMods('/PDFStockCheckComparison.php'), + CheckMods('/StockLocMovements.php'), + CheckMods('/StockLocStatus.php'), + CheckMods('/StockQuantityByDate.php'), + CheckMods('/PDFStockNegatives.php'), + CheckMods('/PDFPeriodStockTransListing.php'), + CheckMods('/PDFStockTransfer.php'), + CheckMods('/AgedControlledInventory.php') ); $MenuItems['stock']['Maintenance']['Caption'] = array( _('Add A New Item'), _('Select An Item'), @@ -272,19 +272,19 @@ _('View or Update Prices Based On Costs'), _('Reorder Level By Category/Location')); -$MenuItems['stock']['Maintenance']['URL'] = array( '/Stocks.php', - '/SelectProduct.php', - '/SalesCategories.php', - '/Manufacturers.php', - '/PricesBasedOnMarkUp.php', - '/PricesByCost.php', - '/ReorderLevelLocation.php'); +$MenuItems['stock']['Maintenance']['URL'] = array( CheckMods('/Stocks.php'), + CheckMods('/SelectProduct.php'), + CheckMods('/SalesCategories.php'), + CheckMods('/Manufacturers.php'), + CheckMods('/PricesBasedOnMarkUp.php'), + CheckMods('/PricesByCost.php'), + CheckMods('/ReorderLevelLocation.php') ); $MenuItems['manuf']['Transactions']['Caption'] = array( _('Work Order Entry'), _('Select A Work Order')); -$MenuItems['manuf']['Transactions']['URL'] = array( '/WorkOrderEntry.php', - '/SelectWorkOrder.php'); +$MenuItems['manuf']['Transactions']['URL'] = array( CheckMods('/WorkOrderEntry.php'), + CheckMods('/SelectWorkOrder.php') ); $MenuItems['manuf']['Reports']['Caption'] = array( _('Select A Work Order'), _('Costed Bill Of Material Inquiry'), @@ -301,20 +301,20 @@ _('MRP Suggested Work Orders'), _('MRP Reschedules Required')); -$MenuItems['manuf']['Reports']['URL'] = array( '/SelectWorkOrder.php', - '/BOMInquiry.php', - '/WhereUsedInquiry.php', - '/BOMListing.php', - '/BOMIndented.php', - '/BOMExtendedQty.php', - '/MaterialsNotUsed.php', - '/BOMIndentedReverse.php', - '/WOCanBeProducedNow.php', - '/MRPReport.php', - '/MRPShortages.php', - '/MRPPlannedPurchaseOrders.php', - '/MRPPlannedWorkOrders.php', - '/MRPReschedules.php'); +$MenuItems['manuf']['Reports']['URL'] = array( CheckMods('/SelectWorkOrder.php'), + CheckMods('/BOMInquiry.php'), + CheckMods('/WhereUsedInquiry.php'), + CheckMods('/BOMListing.php'), + CheckMods('/BOMIndented.php'), + CheckMods('/BOMExtendedQty.php'), + CheckMods('/MaterialsNotUsed.php'), + CheckMods('/BOMIndentedReverse.php'), + CheckMods('/WOCanBeProducedNow.php'), + CheckMods('/MRPReport.php'), + CheckMods('/MRPShortages.php'), + CheckMods('/MRPPlannedPurchaseOrders.php'), + CheckMods('/MRPPlannedWorkOrders.php'), + CheckMods('/MRPReschedules.php') ); $MenuItems['manuf']['Maintenance']['Caption'] = array( _('Work Centre'), _('Bills Of Material'), @@ -323,12 +323,12 @@ _('Auto Create Master Schedule'), _('MRP Calculation')); -$MenuItems['manuf']['Maintenance']['URL'] = array( '/WorkCentres.php', - '/BOMs.php', - '/CopyBOM.php', - '/MRPDemands.php', - '/MRPCreateDemands.php', - '/MRP.php'); +$MenuItems['manuf']['Maintenance']['URL'] = array( CheckMods('/WorkCentres.php'), + CheckMods('/BOMs.php'), + CheckMods('/CopyBOM.php'), + CheckMods('/MRPDemands.php'), + CheckMods('/MRPCreateDemands.php'), + CheckMods('/MRP.php') ); $MenuItems['GL']['Transactions']['Caption'] = array( _('Bank Account Payments Entry'), _('Bank Account Receipts Entry'), @@ -337,12 +337,12 @@ _('Bank Account Receipts Matching'), _('Journal Entry')); -$MenuItems['GL']['Transactions']['URL'] = array('/Payments.php?NewPayment=Yes', - '/CustomerReceipt.php?NewReceipt=Yes&Type=GL', - '/ImportBankTrans.php', - '/BankMatching.php?Type=Payments', - '/BankMatching.php?Type=Receipts', - '/GLJournal.php?NewJournal=Yes'); +$MenuItems['GL']['Transactions']['URL'] = array(CheckMods('/Payments.php') . '?NewPayment=Yes', + CheckMods('/CustomerReceipt.php') . '?NewReceipt=Yes&Type=GL', + CheckMods('/ImportBankTrans.php'), + CheckMods('/BankMatching.php') . '?Type=Payments', + CheckMods('/BankMatching.php') . '?Type=Receipts', + CheckMods('/GLJournal.php') . '?NewJournal=Yes'); $MenuItems['GL']['Reports']['Caption'] = array( _('Trial Balance'), _('Account Inquiry'), @@ -357,18 +357,18 @@ _('Tag Reports'), _('Tax Reports')); -$MenuItems['GL']['Reports']['URL'] = array( '/GLTrialBalance.php', - '/SelectGLAccount.php', - '/GLAccountReport.php', - '/GLAccountCSV.php', - '/GLJournalInquiry.php', - '/BankReconciliation.php', - '/PDFChequeListing.php', - '/DailyBankTransactions.php', - '/GLProfit_Loss.php', - '/GLBalanceSheet.php', - '/GLTagProfit_Loss.php', - '/Tax.php'); +$MenuItems['GL']['Reports']['URL'] = array( CheckMods('/GLTrialBalance.php'), + CheckMods('/SelectGLAccount.php'), + CheckMods('/GLAccountReport.php'), + CheckMods('/GLAccountCSV.php'), + CheckMods('/GLJournalInquiry.php'), + CheckMods('/BankReconciliation.php'), + CheckMods('/PDFChequeListing.php'), + CheckMods('/DailyBankTransactions.php'), + CheckMods('/GLProfit_Loss.php'), + CheckMods('/GLBalanceSheet.php'), + CheckMods('/GLTagProfit_Loss.php'), + CheckMods('/Tax.php')); $MenuItems['GL']['Maintenance']['Caption'] = array( _('Account Sections'), _('Account Groups'), @@ -378,61 +378,61 @@ _('Bank Accounts'), _('Bank Account Authorised Users')); -$MenuItems['GL']['Maintenance']['URL'] = array( '/AccountSections.php', - '/AccountGroups.php', - '/GLAccounts.php', - '/GLBudgets.php', - '/GLTags.php', - '/BankAccounts.php', - '/BankAccountUsers.php'); +$MenuItems['GL']['Maintenance']['URL'] = array( CheckMods('/AccountSections.php'), + CheckMods('/AccountGroups.php'), + CheckMods('/GLAccounts.php'), + CheckMods('/GLBudgets.php'), + CheckMods('/GLTags.php'), + CheckMods('/BankAccounts.php'), + CheckMods('/BankAccountUsers.php') ); $MenuItems['FA']['Transactions']['Caption'] = array(_('Add a new Asset'), _('Select an Asset'), _('Change Asset Location'), _('Depreciation Journal')); -$MenuItems['FA']['Transactions']['URL'] = array('/FixedAssetItems.php', - '/SelectAsset.php', - '/FixedAssetTransfer.php', - '/FixedAssetDepreciation.php'); +$MenuItems['FA']['Transactions']['URL'] = array(CheckMods('/FixedAssetItems.php'), + CheckMods('/SelectAsset.php'), + CheckMods('/FixedAssetTransfer.php'), + CheckMods('/FixedAssetDepreciation.php') ); $MenuItems['FA']['Reports']['Caption'] = array( _('Asset Register'), _('My Maintenance Schedule'), _('Maintenance Reminder Emails')); -$MenuItems['FA']['Reports']['URL'] = array( '/FixedAssetRegister.php', - '/MaintenanceUserSchedule.php', - '/MaintenanceReminders.php'); +$MenuItems['FA']['Reports']['URL'] = array( CheckMods('/FixedAssetRegister.php'), + CheckMods('/MaintenanceUserSchedule.php'), + CheckMods('/MaintenanceReminders.php') ); $MenuItems['FA']['Maintenance']['Caption'] = array( _('Fixed Asset Category Maintenance'), _('Add or Maintain Asset Locations'), _('Fixed Asset Maintenance Tasks')); -$MenuItems['FA']['Maintenance']['URL'] = array( '/FixedAssetCategories.php', - '/FixedAssetLocations.php', - '/MaintenanceTasks.php'); +$MenuItems['FA']['Maintenance']['URL'] = array( CheckMods('/FixedAssetCategories.php'), + CheckMods('/FixedAssetLocations.php'), + CheckMods('/MaintenanceTasks.php') ); $MenuItems['PC']['Transactions']['Caption'] = array(_('Assign Cash to PC Tab'), _('Claim Expenses From PC Tab'), _('Expenses Authorisation')); -$MenuItems['PC']['Transactions']['URL'] = array('/PcAssignCashToTab.php', - '/PcClaimExpensesFromTab.php', - '/PcAuthorizeExpenses.php'); +$MenuItems['PC']['Transactions']['URL'] = array(CheckMods('/PcAssignCashToTab.php'), + CheckMods('/PcClaimExpensesFromTab.php'), + CheckMods('/PcAuthorizeExpenses.php') ); $MenuItems['PC']['Reports']['Caption'] = array(_('PC Tab General Report'), ); -$MenuItems['PC']['Reports']['URL'] = array('/PcReportTab.php', ); +$MenuItems['PC']['Reports']['URL'] = array(CheckMods('/PcReportTab.php'), ); $MenuItems['PC']['Maintenance']['Caption'] = array( _('Types of PC Tabs'), _('PC Tabs'), _('PC Expenses'), _('Expenses for Type of PC Tab')); -$MenuItems['PC']['Maintenance']['URL'] = array( '/PcTypeTabs.php', - '/PcTabs.php', - '/PcExpenses.php', - '/PcExpensesTypeTab.php'); +$MenuItems['PC']['Maintenance']['URL'] = array( CheckMods('/PcTypeTabs.php'), + CheckMods('/PcTabs.php'), + CheckMods('/PcExpenses.php'), + CheckMods('/PcExpensesTypeTab.php') ); $MenuItems['system']['Transactions']['Caption'] = array(_('Company Preferences'), _('System Parameters'), @@ -454,25 +454,25 @@ _('SMTP Server Details'), _('Mailing Group Maintenance')); -$MenuItems['system']['Transactions']['URL'] = array('/CompanyPreferences.php', - '/SystemParameters.php', - '/WWW_Users.php', - '/SecurityTokens.php', - '/WWW_Access.php', - '/PageSecurity.php', - '/Currencies.php', - '/TaxAuthorities.php', - '/TaxGroups.php', - '/TaxProvinces.php', - '/TaxCategories.php', - '/PeriodsInquiry.php', +$MenuItems['system']['Transactions']['URL'] = array(CheckMods('/CompanyPreferences.php'), + CheckMods('/SystemParameters.php'), + CheckMods('/WWW_Users.php'), + CheckMods('/SecurityTokens.php'), + CheckMods('/WWW_Access.php'), + CheckMods('/PageSecurity.php'), + CheckMods('/Currencies.php'), + CheckMods('/TaxAuthorities.php'), + CheckMods('/TaxGroups.php'), + CheckMods('/TaxProvinces.php'), + CheckMods('/TaxCategories.php'), + CheckMods('/PeriodsInquiry.php'), '/reportwriter/admin/ReportCreator.php', - '/AuditTrail.php', - '/GeocodeSetup.php', - '/FormDesigner.php', - '/ShopParameters.php', - '/SMTPServer.php', - '/MailingGroupMaintenance.php'); + CheckMods('/AuditTrail.php'), + CheckMods('/GeocodeSetup.php'), + CheckMods('/FormDesigner.php'), + CheckMods('/ShopParameters.php'), + CheckMods('/SMTPServer.php'), + CheckMods('/MailingGroupMaintenance.php') ); $MenuItems['system']['Reports']['Caption'] = array( _('Sales Types'), _('Customer Types'), @@ -489,20 +489,20 @@ _('Freight Costs Maintenance'), _('Discount Matrix')); -$MenuItems['system']['Reports']['URL'] = array( '/SalesTypes.php', - '/CustomerTypes.php', - '/SupplierTypes.php', - '/CreditStatus.php', - '/PaymentTerms.php', - '/PO_AuthorisationLevels.php', - '/PaymentMethods.php', - '/SalesPeople.php', - '/Areas.php', - '/Shippers.php', - '/SalesGLPostings.php', - '/COGSGLPostings.php', - '/FreightCosts.php', - '/DiscountMatrix.php'); +$MenuItems['system']['Reports']['URL'] = array( CheckMods('/SalesTypes.php'), + CheckMods('/CustomerTypes.php'), + CheckMods('/SupplierTypes.php'), + CheckMods('/CreditStatus.php'), + CheckMods('/PaymentTerms.php'), + CheckMods('/PO_AuthorisationLevels.php'), + CheckMods('/PaymentMethods.php'), + CheckMods('/SalesPeople.php'), + CheckMods('/Areas.php'), + CheckMods('/Shippers.php'), + CheckMods('/SalesGLPostings.php'), + CheckMods('/COGSGLPostings.php'), + CheckMods('/FreightCosts.php'), + CheckMods('/DiscountMatrix.php') ); $MenuItems['system']['Maintenance']['Caption'] = array( _('Inventory Categories Maintenance'), _('Inventory Locations Maintenance'), @@ -515,16 +515,16 @@ _('Maintain Internal Stock Categories to User Roles'), _('Label Templates Maintenance')); -$MenuItems['system']['Maintenance']['URL'] = array( '/StockCategories.php', - '/Locations.php', - '/LocationUsers.php', - '/DiscountCategories.php', - '/UnitsOfMeasure.php', - '/MRPCalendar.php', - '/MRPDemandTypes.php', - '/Departments.php', - '/InternalStockCategoriesByRole.php', - '/Labels.php'); +$MenuItems['system']['Maintenance']['URL'] = array( CheckMods('/StockCategories.php'), + CheckMods('/Locations.php'), + CheckMods('/LocationUsers.php'), + CheckMods('/DiscountCategories.php'), + CheckMods('/UnitsOfMeasure.php'), + CheckMods('/MRPCalendar.php'), + CheckMods('/MRPDemandTypes.php'), + CheckMods('/Departments.php'), + CheckMods('/InternalStockCategoriesByRole.php'), + CheckMods('/Labels.php') ); $MenuItems['Utilities']['Transactions']['Caption'] = array( _('Change A Customer Code'), _('Change A Customer Branch Code'), @@ -539,28 +539,28 @@ _('Reverse all supplier payments on a specified date'), _('Update sales analysis with latest customer data')); -$MenuItems['Utilities']['Transactions']['URL'] = array( '/Z_ChangeCustomerCode.php', - '/Z_ChangeBranchCode.php', - '/Z_ChangeSupplierCode.php', - '/Z_ChangeStockCategory.php', - '/Z_ChangeStockCode.php', - '/Z_ChangeGLAccountCode.php', - '/Z_ChangeLocationCode.php', - '/Z_BottomUpCosts.php', - '/Z_ReApplyCostToSA.php', - '/Z_DeleteSalesTransActions.php', - '/Z_ReverseSuppPaymentRun.php', - '/Z_UpdateSalesAnalysisWithLatestCustomerData.php'); +$MenuItems['Utilities']['Transactions']['URL'] = array( CheckMods('/Z_ChangeCustomerCode.php'), + CheckMods('/Z_ChangeBranchCode.php'), + CheckMods('/Z_ChangeSupplierCode.php'), + CheckMods('/Z_ChangeStockCategory.php'), + CheckMods('/Z_ChangeStockCode.php'), + CheckMods('/Z_ChangeGLAccountCode.php'), + CheckMods('/Z_ChangeLocationCode.php'), + CheckMods('/Z_BottomUpCosts.php'), + CheckMods('/Z_ReApplyCostToSA.php'), + CheckMods('/Z_DeleteSalesTransActions.php'), + CheckMods('/Z_ReverseSuppPaymentRun.php'), + CheckMods('/Z_UpdateSalesAnalysisWithLatestCustomerData.php') ); $MenuItems['Utilities']['Reports']['Caption'] = array( _('Show Local Currency Total Debtor Balances'), _('Show Local Currency Total Suppliers Balances'), _('Show General Transactions That Do Not Balance'), _('List of items without picture')); -$MenuItems['Utilities']['Reports']['URL'] = array( '/Z_CurrencyDebtorsBalances.php', - '/Z_CurrencySuppliersBalances.php', - '/Z_CheckGLTransBalance.php', - '/Z_ItemsWithoutPicture.php'); +$MenuItems['Utilities']['Reports']['URL'] = array( CheckMods('/Z_CurrencyDebtorsBalances.php'), + CheckMods('/Z_CurrencySuppliersBalances.php'), + CheckMods('/Z_CheckGLTransBalance.php'), + CheckMods('/Z_ItemsWithoutPicture.php') ); $MenuItems['Utilities']['Maintenance']['Caption'] = array( _('Maintain Language Files'), _('Make New Company'), @@ -575,16 +575,15 @@ _('Re-Post all GL transactions from a specified period'), _('Purge all old prices')); -$MenuItems['Utilities']['Maintenance']['URL'] = array( '/Z_poAdmin.php', - '/Z_MakeNewCompany.php', - '/Z_DataExport.php', - '/Z_ImportDebtors.php', - '/Z_ImportStocks.php', - '/Z_ImportPriceList.php', - '/Z_ImportFixedAssets.php', - '/Z_ImportGLTransactions.php', - '/Z_CreateCompanyTemplateFile.php', - '/Z_UpdateChartDetailsBFwd.php', - '/Z_RePostGLFromPeriod.php', - '/Z_DeleteOldPrices.php'); -?> +$MenuItems['Utilities']['Maintenance']['URL'] = array( CheckMods('/Z_poAdmin.php'), + CheckMods('/Z_MakeNewCompany.php'), + CheckMods('/Z_DataExport.php'), + CheckMods('/Z_ImportDebtors.php'), + CheckMods('/Z_ImportStocks.php'), + CheckMods('/Z_ImportPriceList.php'), + CheckMods('/Z_ImportFixedAssets.php'), + CheckMods('/Z_ImportGLTransactions.php'), '/Z_CreateCompanyTemplateFile.php', + CheckMods('/Z_UpdateChartDetailsBFwd.php'), + CheckMods('/Z_RePostGLFromPeriod.php'), + CheckMods('/Z_DeleteOldPrices.php') ); +?> \ No newline at end of file Modified: trunk/includes/MiscFunctions.php =================================================================== --- trunk/includes/MiscFunctions.php 2014-10-17 21:22:39 UTC (rev 6923) +++ trunk/includes/MiscFunctions.php 2014-10-18 02:03:22 UTC (rev 6924) @@ -406,7 +406,7 @@ }else{//user only set it's name instead of fully mail address if(strpos($_SESSION['SMTPSettings']['host'],'mail') !== false){ $SubStr = 'mail'; - + }elseif(strpos($_SESSION['SMTPSettings']['host'],'smtp') !== false){ $SubStr = 'smtp'; } @@ -426,13 +426,13 @@ $ErrMsg = _('Failed to retrieve mail lists'); $result = DB_query($sql,$db,$ErrMsg); if(DB_num_rows($result) != 0){ - + //Create the string which meets the Recipients requirements while($myrow = DB_fetch_array($result)){ $ToList[]= $myrow['realname'] . '<'.$myrow['email'].'>'; } - + } return $ToList; } @@ -448,15 +448,12 @@ echo ' ... ' . _('completed'); } -function TableRows($k) { - // Outputs a html's table row with class (Odd|Even). - if($k) {//Is it an even table row? - echo '<tr class="EvenTableRows">'; - return False; +function CheckMods($ScriptName) { + if (file_exists('mods' . $ScriptName)){ + return '/mods' . $ScriptName; } else { - echo '<tr class="OddTableRows">'; - return True; + return $ScriptName; } -}// End function TableRows(). +} ?> \ No newline at end of file Modified: trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot =================================================================== --- trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2014-10-17 21:22:39 UTC (rev 6923) +++ trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2014-10-18 02:03:22 UTC (rev 6924) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-13 21:09+1300\n" +"POT-Creation-Date: 2014-10-13 22:12+1300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" Modified: trunk/sql/mysql/country_sql/default.sql =================================================================== --- trunk/sql/mysql/country_sql/default.sql 2014-10-17 21:22:39 UTC (rev 6923) +++ trunk/sql/mysql/country_sql/default.sql 2014-10-18 02:03:22 UTC (rev 6924) @@ -3239,7 +3239,7 @@ /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2014-10-13 21:09:28 +-- Dump completed on 2014-10-13 22:12:31 -- MySQL dump 10.13 Distrib 5.5.38, for debian-linux-gnu (x86_64) -- -- Host: localhost Database: weberpdemo @@ -6304,7 +6304,7 @@ -- Dumping data for table `www_users` -- -INSERT INTO `www_users` VALUES ('admin','$2y$10$UFTZlhBzJAYzA1QPllfEwOeh2qIRvFqtXhAMEVNNKwxHGC/DIXHnC','Demonstration user','','','','','ad...@we...','MEL',8,1,'2014-10-13 21:08:52','','A4','1,1,1,1,1,1,1,1,1,1,1,',0,50,'xenos','en_GB.utf8',0,0); +INSERT INTO `www_users` VALUES ('admin','$2y$10$UFTZlhBzJAYzA1QPllfEwOeh2qIRvFqtXhAMEVNNKwxHGC/DIXHnC','Demonstration user','','','','','ad...@we...','MEL',8,1,'2014-10-13 22:09:27','','A4','1,1,1,1,1,1,1,1,1,1,1,',0,50,'xenos','en_GB.utf8',0,0); -- -- Dumping data for table `edi_orders_segs` @@ -7099,7 +7099,7 @@ /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2014-10-13 21:09:28 +-- Dump completed on 2014-10-13 22:12:31 SET FOREIGN_KEY_CHECKS = 1; UPDATE systypes SET typeno=0; INSERT INTO shippers VALUES (1,'Default Shipper',0); Modified: trunk/sql/mysql/country_sql/demo.sql =================================================================== --- trunk/sql/mysql/country_sql/demo.sql 2014-10-17 21:22:39 UTC (rev 6923) +++ trunk/sql/mysql/country_sql/demo.sql 2014-10-18 02:03:22 UTC (rev 6924) @@ -3241,7 +3241,7 @@ /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2014-10-13 21:09:28 +-- Dump completed on 2014-10-13 22:12:31 -- MySQL dump 10.13 Distrib 5.5.38, for debian-linux-gnu (x86_64) -- -- Host: localhost Database: weberpdemo @@ -11856,7 +11856,7 @@ -- Dumping data for table `www_users` -- -INSERT INTO `www_users` VALUES ('admin','$2y$10$UFTZlhBzJAYzA1QPllfEwOeh2qIRvFqtXhAMEVNNKwxHGC/DIXHnC','Demonstration user','','','','','ad...@we...','MEL',8,1,'2014-10-13 21:08:52','','A4','1,1,1,1,1,1,1,1,1,1,1,',0,50,'xenos','en_GB.utf8',0,0); +INSERT INTO `www_users` VALUES ('admin','$2y$10$UFTZlhBzJAYzA1QPllfEwOeh2qIRvFqtXhAMEVNNKwxHGC/DIXHnC','Demonstration user','','','','','ad...@we...','MEL',8,1,'2014-10-13 22:09:27','','A4','1,1,1,1,1,1,1,1,1,1,1,',0,50,'xenos','en_GB.utf8',0,0); /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; @@ -11864,5 +11864,5 @@ /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2014-10-13 21:09:29 +-- Dump completed on 2014-10-13 22:12:31 SET FOREIGN_KEY_CHECKS = 1; Modified: trunk/sql/mysql/upgrade4.11-4.12.sql =================================================================== --- trunk/sql/mysql/upgrade4.11-4.12.sql 2014-10-17 21:22:39 UTC (rev 6923) +++ trunk/sql/mysql/upgrade4.11-4.12.sql 2014-10-18 02:03:22 UTC (rev 6924) @@ -1,5 +1,5 @@ +INSERT INTO `config` VALUES ('InvoiceQuantityDefault','1'); - UPDATE config SET confvalue='4.12' WHERE confname='VersionNumber'; |
From: <dai...@us...> - 2014-10-20 04:28:33
|
Revision: 6925 http://sourceforge.net/p/web-erp/reponame/6925 Author: daintree Date: 2014-10-20 04:28:24 +0000 (Mon, 20 Oct 2014) Log Message: ----------- Dont bother with mods idea Modified Paths: -------------- trunk/doc/Change.log trunk/includes/MainMenuLinksArray.php Removed Paths: ------------- trunk/mods/ Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2014-10-18 02:03:22 UTC (rev 6924) +++ trunk/doc/Change.log 2014-10-20 04:28:24 UTC (rev 6925) @@ -1,8 +1,11 @@ webERP Change Log + +18/10/14 Phil: Setup a mods folder inside webERP folder structure for modified scripts. New function in MiscFunctions.php CheckMods() looks for a modified script first before using the normal script for those links that use the CheckMods() function 17/10/14 RChacon: Remove translation of tax category 'Freight' inside database. 17/10/14 Exson: Add po line and due date result in OrderDetails.php. -15/10/14 Exson: Fixed no receipt data displayed retrieved bugs for sales login in CustomerInquiry.php. +15/10/14 Exson: Fixed no receipt data displayed retrieved bugs for sales login in CustomerInquiry.php. 14/10/14 Jiro Akits: Update Chinese traditional translation. + 13/10/14 Version 4.11.5 release 13/10/14: Exson: Fixed the bugs in pattern properties with extra blank which leads to the patterns checking failed for all fields. Report from webERP Chinese community QQ group DongDong. Modified: trunk/includes/MainMenuLinksArray.php =================================================================== --- trunk/includes/MainMenuLinksArray.php 2014-10-18 02:03:22 UTC (rev 6924) +++ trunk/includes/MainMenuLinksArray.php 2014-10-20 04:28:24 UTC (rev 6925) @@ -40,14 +40,14 @@ _('Recurring Order Template'), _('Process Recurring Orders')); -$MenuItems['orders']['Transactions']['URL'] = array(CheckMods('/SelectOrderItems.php') . '?NewOrder=Yes', - CheckMods('/CounterSales.php'), - CheckMods('/CounterReturns.php'), - CheckMods('/PDFPickingList.php'), - CheckMods('/SelectSalesOrder.php'), - CheckMods('/SpecialOrder.php'), - CheckMods('/SelectRecurringSalesOrder.php'), - CheckMods('/RecurringSalesOrdersProcess.php')); +$MenuItems['orders']['Transactions']['URL'] = array('/SelectOrderItems.php?NewOrder=Yes', + '/CounterSales.php', + '/CounterReturns.php', + '/PDFPickingList.php', + '/SelectSalesOrder.php', + '/SpecialOrder.php', + '/SelectRecurringSalesOrder.php', + '/RecurringSalesOrdersProcess.php'); $MenuItems['orders']['Reports']['Caption'] = array( _('Sales Order Inquiry'), _('Print Price Lists'), @@ -66,39 +66,39 @@ _('Sales With Low Gross Profit Report'), _('Sell Through Support Claims Report')); -$MenuItems['orders']['Reports']['URL'] = array( CheckMods('/SelectCompletedOrder.php'), - CheckMods('/PDFPriceList.php'), - CheckMods('/PDFOrderStatus.php'), - CheckMods('/PDFOrdersInvoiced.php'), - CheckMods('/DailySalesInquiry.php'), - CheckMods('/SalesByTypePeriodInquiry.php'), - CheckMods('/SalesCategoryPeriodInquiry.php'), - CheckMods('/SalesTopItemsInquiry.php'), - CheckMods('/PDFDeliveryDifferences.php'), - CheckMods('/PDFDIFOT.php'), - CheckMods('/SalesInquiry.php'), - CheckMods('/TopItems.php'), - CheckMods('/SalesTopCustomersInquiry.php'), - CheckMods('/NoSalesItems.php'), - CheckMods('/PDFLowGP.php'), - CheckMods('/PDFSellThroughSupportClaim.php') ); +$MenuItems['orders']['Reports']['URL'] = array( '/SelectCompletedOrder.php', + '/PDFPriceList.php', + '/PDFOrderStatus.php', + '/PDFOrdersInvoiced.php', + '/DailySalesInquiry.php', + '/SalesByTypePeriodInquiry.php', + '/SalesCategoryPeriodInquiry.php', + '/SalesTopItemsInquiry.php', + '/PDFDeliveryDifferences.php', + '/PDFDIFOT.php', + '/SalesInquiry.php', + '/TopItems.php', + '/SalesTopCustomersInquiry.php', + '/NoSalesItems.php', + '/PDFLowGP.php', + '/PDFSellThroughSupportClaim.php'); $MenuItems['orders']['Maintenance']['Caption'] = array( _('Create Contract'), _('Select Contract'), _('Sell Through Support Deals')); -$MenuItems['orders']['Maintenance']['URL'] = array( CheckMods('/Contracts.php'), - CheckMods('/SelectContract.php'), - CheckMods('/SellThroughSupport.php')); +$MenuItems['orders']['Maintenance']['URL'] = array( '/Contracts.php', + '/SelectContract.php', + '/SellThroughSupport.php'); $MenuItems['AR']['Transactions']['Caption'] = array(_('Select Order to Invoice'), _('Create A Credit Note'), _('Enter Receipts'), _('Allocate Receipts or Credit Notes')); -$MenuItems['AR']['Transactions']['URL'] = array(CheckMods('/SelectSalesOrder.php'), - CheckMods('/SelectCreditItems.php') . '?NewCredit=Yes', - CheckMods('/CustomerReceipt.php') . '?NewReceipt=Yes&Type=Customer', - CheckMods('/CustomerAllocations.php') ); +$MenuItems['AR']['Transactions']['URL'] = array('/SelectSalesOrder.php', + '/SelectCreditItems.php?NewCredit=Yes', + '/CustomerReceipt.php?NewReceipt=Yes&Type=Customer', + '/CustomerAllocations.php'); $MenuItems['AR']['Reports']['Caption'] = array( _('Where Allocated Inquiry'), _('Print Invoices or Credit Notes'), @@ -113,32 +113,32 @@ _('Customer Transaction Inquiries') ); if ($_SESSION['InvoicePortraitFormat']==0){ - $PrintInvoicesOrCreditNotesScript = CheckMods('/PrintCustTrans.php'); + $PrintInvoicesOrCreditNotesScript = '/PrintCustTrans.php'; } else { - $PrintInvoicesOrCreditNotesScript = CheckMods('/PrintCustTransPortrait.php'); + $PrintInvoicesOrCreditNotesScript = '/PrintCustTransPortrait.php'; } -$MenuItems['AR']['Reports']['URL'] = array( CheckMods('/CustWhereAlloc.php'), +$MenuItems['AR']['Reports']['URL'] = array( '/CustWhereAlloc.php', $PrintInvoicesOrCreditNotesScript, - CheckMods('/PrintCustStatements.php'), - CheckMods('/SalesAnalRepts.php'), - CheckMods('/AgedDebtors.php'), - CheckMods('/PDFBankingSummary.php'), - CheckMods('/DebtorsAtPeriodEnd.php'), - CheckMods('/PDFCustomerList.php'), - CheckMods('/SalesGraph.php'), - CheckMods('/PDFCustTransListing.php'), - CheckMods('/CustomerTransInquiry.php') ); + '/PrintCustStatements.php', + '/SalesAnalRepts.php', + '/AgedDebtors.php', + '/PDFBankingSummary.php', + '/DebtorsAtPeriodEnd.php', + '/PDFCustomerList.php', + '/SalesGraph.php', + '/PDFCustTransListing.php', + '/CustomerTransInquiry.php'); $MenuItems['AR']['Maintenance']['Caption'] = array( _('Add Customer'), _('Select Customer')); -$MenuItems['AR']['Maintenance']['URL'] = array( CheckMods('/Customers.php'), - CheckMods('/SelectCustomer.php') ); +$MenuItems['AR']['Maintenance']['URL'] = array( '/Customers.php', + '/SelectCustomer.php'); $MenuItems['AP']['Transactions']['Caption'] = array(_('Select Supplier'), _('Supplier Allocations')); -$MenuItems['AP']['Transactions']['URL'] = array(CheckMods('/SelectSupplier.php'), - CheckMods('/SupplierAllocations.php') ); +$MenuItems['AP']['Transactions']['URL'] = array('/SelectSupplier.php', + '/SupplierAllocations.php'); $MenuItems['AP']['Reports']['Caption'] = array( _('Aged Supplier Report'), _('Payment Run Report'), @@ -148,20 +148,20 @@ _('List Daily Transactions'), _('Supplier Transaction Inquiries')); -$MenuItems['AP']['Reports']['URL'] = array( CheckMods('/AgedSuppliers.php'), - CheckMods('/SuppPaymentRun.php'), - CheckMods('/PDFRemittanceAdvice.php'), - CheckMods('/OutstandingGRNs.php'), - CheckMods('/SupplierBalsAtPeriodEnd.php'), - CheckMods('/PDFSuppTransListing.php'), - CheckMods('/SupplierTransInquiry.php') ); +$MenuItems['AP']['Reports']['URL'] = array( '/AgedSuppliers.php', + '/SuppPaymentRun.php', + '/PDFRemittanceAdvice.php', + '/OutstandingGRNs.php', + '/SupplierBalsAtPeriodEnd.php', + '/PDFSuppTransListing.php', + '/SupplierTransInquiry.php'); $MenuItems['AP']['Maintenance']['Caption'] = array( _('Add Supplier'), _('Select Supplier'), _('Maintain Factor Companies')); -$MenuItems['AP']['Maintenance']['URL'] = array( CheckMods('/Suppliers.php'), - CheckMods('/SelectSupplier.php'), - CheckMods('/Factors.php') ); +$MenuItems['AP']['Maintenance']['URL'] = array( '/Suppliers.php', + '/SelectSupplier.php', + '/Factors.php'); $MenuItems['PO']['Transactions']['Caption'] = array(_('New Purchase Order'), _('Purchase Orders'), @@ -172,27 +172,27 @@ _('Orders to Authorise'), _('Shipment Entry'), _('Select A Shipment')); -$MenuItems['PO']['Transactions']['URL'] = array(CheckMods('/PO_Header.php') . '?NewOrder=Yes', - CheckMods('/PO_SelectOSPurchOrder.php'), - CheckMods('/PurchaseByPrefSupplier.php'), - CheckMods('/SupplierTenderCreate.php') . '?New=Yes', - CheckMods('/SupplierTenderCreate.php') . '?Edit=Yes', - CheckMods('/OffersReceived.php'), - CheckMods('/PO_AuthoriseMyOrders.php'), - CheckMods('/SelectSupplier.php'), - CheckMods('/Shipt_Select.php') ); +$MenuItems['PO']['Transactions']['URL'] = array( '/PO_Header.php?NewOrder=Yes', + '/PO_SelectOSPurchOrder.php', + '/PurchaseByPrefSupplier.php', + '/SupplierTenderCreate.php?New=Yes', + '/SupplierTenderCreate.php?Edit=Yes', + '/OffersReceived.php', + '/PO_AuthoriseMyOrders.php', + '/SelectSupplier.php', + '/Shipt_Select.php'); $MenuItems['PO']['Reports']['Caption'] = array( _('Purchase Order Inquiry'), _('Purchase Order Detail Or Summary Inquiries'), _('Supplier Price List')); -$MenuItems['PO']['Reports']['URL'] = array( CheckMods('/PO_SelectPurchOrder.php'), - CheckMods('/POReport.php'), - CheckMods('/SuppPriceList.php') ); +$MenuItems['PO']['Reports']['URL'] = array( '/PO_SelectPurchOrder.php', + '/POReport.php', + '/SuppPriceList.php'); $MenuItems['PO']['Maintenance']['Caption'] = array(_('Maintain Supplier Price Lists')); -$MenuItems['PO']['Maintenance']['URL'] = array(CheckMods('/SupplierPriceList.php')); +$MenuItems['PO']['Maintenance']['URL'] = array('/SupplierPriceList.php'); $MenuItems['stock']['Transactions']['Caption'] = array( _('Receive Purchase Orders'), _('Inventory Location Transfers'), //"Inventory Transfer - Item Dispatch" @@ -205,16 +205,16 @@ _('Authorise Internal Stock Requests'), _('Fulfill Internal Stock Requests')); -$MenuItems['stock']['Transactions']['URL'] = array( CheckMods('/PO_SelectOSPurchOrder.php'), - CheckMods('/StockTransfers.php') . '?New=Yes', - CheckMods('/StockLocTransfer.php'), - CheckMods('/StockLocTransferReceive.php'), - CheckMods('/StockAdjustments.php') . '?NewAdjustment=Yes', - CheckMods('/ReverseGRN.php'), - CheckMods('/StockCounts.php'), - CheckMods('/InternalStockRequest.php') . '?New=Yes', - CheckMods('/InternalStockRequestAuthorisation.php'), - CheckMods('/InternalStockRequestFulfill.php') ); +$MenuItems['stock']['Transactions']['URL'] = array( '/PO_SelectOSPurchOrder.php', + '/StockTransfers.php?New=Yes', + '/StockLocTransfer.php', + '/StockLocTransferReceive.php', + '/StockAdjustments.php?NewAdjustment=Yes', + '/ReverseGRN.php', + '/StockCounts.php', + '/InternalStockRequest.php?New=Yes', + '/InternalStockRequestAuthorisation.php', + '/InternalStockRequestFulfill.php'); $MenuItems['stock']['Reports']['Caption'] = array( _('Serial Item Research Tool'), _('Print Price Labels'), @@ -240,29 +240,29 @@ _('Stock Transfer Note'), _('Aged Controlled Stock Report')); -$MenuItems['stock']['Reports']['URL'] = array( CheckMods('/StockSerialItemResearch.php'), - CheckMods('/PDFPrintLabel.php'), - CheckMods('/ReprintGRN.php'), - CheckMods('/StockMovements.php'), - CheckMods('/StockStatus.php'), - CheckMods('/StockUsage.php'), - CheckMods('/InventoryQuantities.php'), - CheckMods('/ReorderLevel.php'), - CheckMods('/StockDispatch.php'), - CheckMods('/InventoryValuation.php'), - CheckMods('/MailInventoryValuation.php'), - CheckMods('/InventoryPlanning.php'), - CheckMods('/InventoryPlanningPrefSupplier.php'), - CheckMods('/StockCheck.php'), - CheckMods('/StockQties_csv.php'), - CheckMods('/PDFStockCheckComparison.php'), - CheckMods('/StockLocMovements.php'), - CheckMods('/StockLocStatus.php'), - CheckMods('/StockQuantityByDate.php'), - CheckMods('/PDFStockNegatives.php'), - CheckMods('/PDFPeriodStockTransListing.php'), - CheckMods('/PDFStockTransfer.php'), - CheckMods('/AgedControlledInventory.php') ); +$MenuItems['stock']['Reports']['URL'] = array( '/StockSerialItemResearch.php', + '/PDFPrintLabel.php', + '/ReprintGRN.php', + '/StockMovements.php', + '/StockStatus.php', + '/StockUsage.php', + '/InventoryQuantities.php', + '/ReorderLevel.php', + '/StockDispatch.php', + '/InventoryValuation.php', + '/MailInventoryValuation.php', + '/InventoryPlanning.php', + '/InventoryPlanningPrefSupplier.php', + '/StockCheck.php', + '/StockQties_csv.php', + '/PDFStockCheckComparison.php', + '/StockLocMovements.php', + '/StockLocStatus.php', + '/StockQuantityByDate.php', + '/PDFStockNegatives.php', + '/PDFPeriodStockTransListing.php', + '/PDFStockTransfer.php', + '/AgedControlledInventory.php'); $MenuItems['stock']['Maintenance']['Caption'] = array( _('Add A New Item'), _('Select An Item'), @@ -272,19 +272,19 @@ _('View or Update Prices Based On Costs'), _('Reorder Level By Category/Location')); -$MenuItems['stock']['Maintenance']['URL'] = array( CheckMods('/Stocks.php'), - CheckMods('/SelectProduct.php'), - CheckMods('/SalesCategories.php'), - CheckMods('/Manufacturers.php'), - CheckMods('/PricesBasedOnMarkUp.php'), - CheckMods('/PricesByCost.php'), - CheckMods('/ReorderLevelLocation.php') ); +$MenuItems['stock']['Maintenance']['URL'] = array( '/Stocks.php', + '/SelectProduct.php', + '/SalesCategories.php', + '/Manufacturers.php', + '/PricesBasedOnMarkUp.php', + '/PricesByCost.php', + '/ReorderLevelLocation.php'); $MenuItems['manuf']['Transactions']['Caption'] = array( _('Work Order Entry'), _('Select A Work Order')); -$MenuItems['manuf']['Transactions']['URL'] = array( CheckMods('/WorkOrderEntry.php'), - CheckMods('/SelectWorkOrder.php') ); +$MenuItems['manuf']['Transactions']['URL'] = array( '/WorkOrderEntry.php', + '/SelectWorkOrder.php'); $MenuItems['manuf']['Reports']['Caption'] = array( _('Select A Work Order'), _('Costed Bill Of Material Inquiry'), @@ -301,20 +301,20 @@ _('MRP Suggested Work Orders'), _('MRP Reschedules Required')); -$MenuItems['manuf']['Reports']['URL'] = array( CheckMods('/SelectWorkOrder.php'), - CheckMods('/BOMInquiry.php'), - CheckMods('/WhereUsedInquiry.php'), - CheckMods('/BOMListing.php'), - CheckMods('/BOMIndented.php'), - CheckMods('/BOMExtendedQty.php'), - CheckMods('/MaterialsNotUsed.php'), - CheckMods('/BOMIndentedReverse.php'), - CheckMods('/WOCanBeProducedNow.php'), - CheckMods('/MRPReport.php'), - CheckMods('/MRPShortages.php'), - CheckMods('/MRPPlannedPurchaseOrders.php'), - CheckMods('/MRPPlannedWorkOrders.php'), - CheckMods('/MRPReschedules.php') ); +$MenuItems['manuf']['Reports']['URL'] = array( '/SelectWorkOrder.php', + '/BOMInquiry.php', + '/WhereUsedInquiry.php', + '/BOMListing.php', + '/BOMIndented.php', + '/BOMExtendedQty.php', + '/MaterialsNotUsed.php', + '/BOMIndentedReverse.php', + '/WOCanBeProducedNow.php', + '/MRPReport.php', + '/MRPShortages.php', + '/MRPPlannedPurchaseOrders.php', + '/MRPPlannedWorkOrders.php', + '/MRPReschedules.php'); $MenuItems['manuf']['Maintenance']['Caption'] = array( _('Work Centre'), _('Bills Of Material'), @@ -323,12 +323,12 @@ _('Auto Create Master Schedule'), _('MRP Calculation')); -$MenuItems['manuf']['Maintenance']['URL'] = array( CheckMods('/WorkCentres.php'), - CheckMods('/BOMs.php'), - CheckMods('/CopyBOM.php'), - CheckMods('/MRPDemands.php'), - CheckMods('/MRPCreateDemands.php'), - CheckMods('/MRP.php') ); +$MenuItems['manuf']['Maintenance']['URL'] = array( '/WorkCentres.php', + '/BOMs.php', + '/CopyBOM.php', + '/MRPDemands.php', + '/MRPCreateDemands.php', + '/MRP.php'); $MenuItems['GL']['Transactions']['Caption'] = array( _('Bank Account Payments Entry'), _('Bank Account Receipts Entry'), @@ -337,12 +337,12 @@ _('Bank Account Receipts Matching'), _('Journal Entry')); -$MenuItems['GL']['Transactions']['URL'] = array(CheckMods('/Payments.php') . '?NewPayment=Yes', - CheckMods('/CustomerReceipt.php') . '?NewReceipt=Yes&Type=GL', - CheckMods('/ImportBankTrans.php'), - CheckMods('/BankMatching.php') . '?Type=Payments', - CheckMods('/BankMatching.php') . '?Type=Receipts', - CheckMods('/GLJournal.php') . '?NewJournal=Yes'); +$MenuItems['GL']['Transactions']['URL'] = array('/Payments.php?NewPayment=Yes', + '/CustomerReceipt.php?NewReceipt=Yes&Type=GL', + '/ImportBankTrans.php', + '/BankMatching.php?Type=Payments', + '/BankMatching.php?Type=Receipts', + '/GLJournal.php?NewJournal=Yes'); $MenuItems['GL']['Reports']['Caption'] = array( _('Trial Balance'), _('Account Inquiry'), @@ -357,18 +357,18 @@ _('Tag Reports'), _('Tax Reports')); -$MenuItems['GL']['Reports']['URL'] = array( CheckMods('/GLTrialBalance.php'), - CheckMods('/SelectGLAccount.php'), - CheckMods('/GLAccountReport.php'), - CheckMods('/GLAccountCSV.php'), - CheckMods('/GLJournalInquiry.php'), - CheckMods('/BankReconciliation.php'), - CheckMods('/PDFChequeListing.php'), - CheckMods('/DailyBankTransactions.php'), - CheckMods('/GLProfit_Loss.php'), - CheckMods('/GLBalanceSheet.php'), - CheckMods('/GLTagProfit_Loss.php'), - CheckMods('/Tax.php')); +$MenuItems['GL']['Reports']['URL'] = array( '/GLTrialBalance.php', + '/SelectGLAccount.php', + '/GLAccountReport.php', + '/GLAccountCSV.php', + '/GLJournalInquiry.php', + '/BankReconciliation.php', + '/PDFChequeListing.php', + '/DailyBankTransactions.php', + '/GLProfit_Loss.php', + '/GLBalanceSheet.php', + '/GLTagProfit_Loss.php', + '/Tax.php'); $MenuItems['GL']['Maintenance']['Caption'] = array( _('Account Sections'), _('Account Groups'), @@ -378,61 +378,61 @@ _('Bank Accounts'), _('Bank Account Authorised Users')); -$MenuItems['GL']['Maintenance']['URL'] = array( CheckMods('/AccountSections.php'), - CheckMods('/AccountGroups.php'), - CheckMods('/GLAccounts.php'), - CheckMods('/GLBudgets.php'), - CheckMods('/GLTags.php'), - CheckMods('/BankAccounts.php'), - CheckMods('/BankAccountUsers.php') ); +$MenuItems['GL']['Maintenance']['URL'] = array( '/AccountSections.php', + '/AccountGroups.php', + '/GLAccounts.php', + '/GLBudgets.php', + '/GLTags.php', + '/BankAccounts.php', + '/BankAccountUsers.php'); $MenuItems['FA']['Transactions']['Caption'] = array(_('Add a new Asset'), _('Select an Asset'), _('Change Asset Location'), _('Depreciation Journal')); -$MenuItems['FA']['Transactions']['URL'] = array(CheckMods('/FixedAssetItems.php'), - CheckMods('/SelectAsset.php'), - CheckMods('/FixedAssetTransfer.php'), - CheckMods('/FixedAssetDepreciation.php') ); +$MenuItems['FA']['Transactions']['URL'] = array('/FixedAssetItems.php', + '/SelectAsset.php', + '/FixedAssetTransfer.php', + '/FixedAssetDepreciation.php'); $MenuItems['FA']['Reports']['Caption'] = array( _('Asset Register'), _('My Maintenance Schedule'), _('Maintenance Reminder Emails')); -$MenuItems['FA']['Reports']['URL'] = array( CheckMods('/FixedAssetRegister.php'), - CheckMods('/MaintenanceUserSchedule.php'), - CheckMods('/MaintenanceReminders.php') ); +$MenuItems['FA']['Reports']['URL'] = array( '/FixedAssetRegister.php', + '/MaintenanceUserSchedule.php', + '/MaintenanceReminders.php'); $MenuItems['FA']['Maintenance']['Caption'] = array( _('Fixed Asset Category Maintenance'), _('Add or Maintain Asset Locations'), _('Fixed Asset Maintenance Tasks')); -$MenuItems['FA']['Maintenance']['URL'] = array( CheckMods('/FixedAssetCategories.php'), - CheckMods('/FixedAssetLocations.php'), - CheckMods('/MaintenanceTasks.php') ); +$MenuItems['FA']['Maintenance']['URL'] = array( '/FixedAssetCategories.php', + '/FixedAssetLocations.php', + '/MaintenanceTasks.php'); $MenuItems['PC']['Transactions']['Caption'] = array(_('Assign Cash to PC Tab'), _('Claim Expenses From PC Tab'), _('Expenses Authorisation')); -$MenuItems['PC']['Transactions']['URL'] = array(CheckMods('/PcAssignCashToTab.php'), - CheckMods('/PcClaimExpensesFromTab.php'), - CheckMods('/PcAuthorizeExpenses.php') ); +$MenuItems['PC']['Transactions']['URL'] = array('/PcAssignCashToTab.php', + '/PcClaimExpensesFromTab.php', + '/PcAuthorizeExpenses.php'); $MenuItems['PC']['Reports']['Caption'] = array(_('PC Tab General Report'), ); -$MenuItems['PC']['Reports']['URL'] = array(CheckMods('/PcReportTab.php'), ); +$MenuItems['PC']['Reports']['URL'] = array('/PcReportTab.php', ); $MenuItems['PC']['Maintenance']['Caption'] = array( _('Types of PC Tabs'), _('PC Tabs'), _('PC Expenses'), _('Expenses for Type of PC Tab')); -$MenuItems['PC']['Maintenance']['URL'] = array( CheckMods('/PcTypeTabs.php'), - CheckMods('/PcTabs.php'), - CheckMods('/PcExpenses.php'), - CheckMods('/PcExpensesTypeTab.php') ); +$MenuItems['PC']['Maintenance']['URL'] = array( '/PcTypeTabs.php', + '/PcTabs.php', + '/PcExpenses.php', + '/PcExpensesTypeTab.php'); $MenuItems['system']['Transactions']['Caption'] = array(_('Company Preferences'), _('System Parameters'), @@ -454,25 +454,25 @@ _('SMTP Server Details'), _('Mailing Group Maintenance')); -$MenuItems['system']['Transactions']['URL'] = array(CheckMods('/CompanyPreferences.php'), - CheckMods('/SystemParameters.php'), - CheckMods('/WWW_Users.php'), - CheckMods('/SecurityTokens.php'), - CheckMods('/WWW_Access.php'), - CheckMods('/PageSecurity.php'), - CheckMods('/Currencies.php'), - CheckMods('/TaxAuthorities.php'), - CheckMods('/TaxGroups.php'), - CheckMods('/TaxProvinces.php'), - CheckMods('/TaxCategories.php'), - CheckMods('/PeriodsInquiry.php'), +$MenuItems['system']['Transactions']['URL'] = array('/CompanyPreferences.php', + '/SystemParameters.php', + '/WWW_Users.php', + '/SecurityTokens.php', + '/WWW_Access.php', + '/PageSecurity.php', + '/Currencies.php', + '/TaxAuthorities.php', + '/TaxGroups.php', + '/TaxProvinces.php', + '/TaxCategories.php', + '/PeriodsInquiry.php', '/reportwriter/admin/ReportCreator.php', - CheckMods('/AuditTrail.php'), - CheckMods('/GeocodeSetup.php'), - CheckMods('/FormDesigner.php'), - CheckMods('/ShopParameters.php'), - CheckMods('/SMTPServer.php'), - CheckMods('/MailingGroupMaintenance.php') ); + '/AuditTrail.php', + '/GeocodeSetup.php', + '/FormDesigner.php', + '/ShopParameters.php', + '/SMTPServer.php', + '/MailingGroupMaintenance.php'); $MenuItems['system']['Reports']['Caption'] = array( _('Sales Types'), _('Customer Types'), @@ -489,20 +489,20 @@ _('Freight Costs Maintenance'), _('Discount Matrix')); -$MenuItems['system']['Reports']['URL'] = array( CheckMods('/SalesTypes.php'), - CheckMods('/CustomerTypes.php'), - CheckMods('/SupplierTypes.php'), - CheckMods('/CreditStatus.php'), - CheckMods('/PaymentTerms.php'), - CheckMods('/PO_AuthorisationLevels.php'), - CheckMods('/PaymentMethods.php'), - CheckMods('/SalesPeople.php'), - CheckMods('/Areas.php'), - CheckMods('/Shippers.php'), - CheckMods('/SalesGLPostings.php'), - CheckMods('/COGSGLPostings.php'), - CheckMods('/FreightCosts.php'), - CheckMods('/DiscountMatrix.php') ); +$MenuItems['system']['Reports']['URL'] = array( '/SalesTypes.php', + '/CustomerTypes.php', + '/SupplierTypes.php', + '/CreditStatus.php', + '/PaymentTerms.php', + '/PO_AuthorisationLevels.php', + '/PaymentMethods.php', + '/SalesPeople.php', + '/Areas.php', + '/Shippers.php', + '/SalesGLPostings.php', + '/COGSGLPostings.php', + '/FreightCosts.php', + '/DiscountMatrix.php'); $MenuItems['system']['Maintenance']['Caption'] = array( _('Inventory Categories Maintenance'), _('Inventory Locations Maintenance'), @@ -515,16 +515,16 @@ _('Maintain Internal Stock Categories to User Roles'), _('Label Templates Maintenance')); -$MenuItems['system']['Maintenance']['URL'] = array( CheckMods('/StockCategories.php'), - CheckMods('/Locations.php'), - CheckMods('/LocationUsers.php'), - CheckMods('/DiscountCategories.php'), - CheckMods('/UnitsOfMeasure.php'), - CheckMods('/MRPCalendar.php'), - CheckMods('/MRPDemandTypes.php'), - CheckMods('/Departments.php'), - CheckMods('/InternalStockCategoriesByRole.php'), - CheckMods('/Labels.php') ); +$MenuItems['system']['Maintenance']['URL'] = array( '/StockCategories.php', + '/Locations.php', + '/LocationUsers.php', + '/DiscountCategories.php', + '/UnitsOfMeasure.php', + '/MRPCalendar.php', + '/MRPDemandTypes.php', + '/Departments.php', + '/InternalStockCategoriesByRole.php', + '/Labels.php'); $MenuItems['Utilities']['Transactions']['Caption'] = array( _('Change A Customer Code'), _('Change A Customer Branch Code'), @@ -539,28 +539,28 @@ _('Reverse all supplier payments on a specified date'), _('Update sales analysis with latest customer data')); -$MenuItems['Utilities']['Transactions']['URL'] = array( CheckMods('/Z_ChangeCustomerCode.php'), - CheckMods('/Z_ChangeBranchCode.php'), - CheckMods('/Z_ChangeSupplierCode.php'), - CheckMods('/Z_ChangeStockCategory.php'), - CheckMods('/Z_ChangeStockCode.php'), - CheckMods('/Z_ChangeGLAccountCode.php'), - CheckMods('/Z_ChangeLocationCode.php'), - CheckMods('/Z_BottomUpCosts.php'), - CheckMods('/Z_ReApplyCostToSA.php'), - CheckMods('/Z_DeleteSalesTransActions.php'), - CheckMods('/Z_ReverseSuppPaymentRun.php'), - CheckMods('/Z_UpdateSalesAnalysisWithLatestCustomerData.php') ); +$MenuItems['Utilities']['Transactions']['URL'] = array( '/Z_ChangeCustomerCode.php', + '/Z_ChangeBranchCode.php', + '/Z_ChangeSupplierCode.php', + '/Z_ChangeStockCategory.php', + '/Z_ChangeStockCode.php', + '/Z_ChangeGLAccountCode.php', + '/Z_ChangeLocationCode.php', + '/Z_BottomUpCosts.php', + '/Z_ReApplyCostToSA.php', + '/Z_DeleteSalesTransActions.php', + '/Z_ReverseSuppPaymentRun.php', + '/Z_UpdateSalesAnalysisWithLatestCustomerData.php'); $MenuItems['Utilities']['Reports']['Caption'] = array( _('Show Local Currency Total Debtor Balances'), _('Show Local Currency Total Suppliers Balances'), _('Show General Transactions That Do Not Balance'), _('List of items without picture')); -$MenuItems['Utilities']['Reports']['URL'] = array( CheckMods('/Z_CurrencyDebtorsBalances.php'), - CheckMods('/Z_CurrencySuppliersBalances.php'), - CheckMods('/Z_CheckGLTransBalance.php'), - CheckMods('/Z_ItemsWithoutPicture.php') ); +$MenuItems['Utilities']['Reports']['URL'] = array( '/Z_CurrencyDebtorsBalances.php', + '/Z_CurrencySuppliersBalances.php', + '/Z_CheckGLTransBalance.php', + '/Z_ItemsWithoutPicture.php'); $MenuItems['Utilities']['Maintenance']['Caption'] = array( _('Maintain Language Files'), _('Make New Company'), @@ -575,15 +575,16 @@ _('Re-Post all GL transactions from a specified period'), _('Purge all old prices')); -$MenuItems['Utilities']['Maintenance']['URL'] = array( CheckMods('/Z_poAdmin.php'), - CheckMods('/Z_MakeNewCompany.php'), - CheckMods('/Z_DataExport.php'), - CheckMods('/Z_ImportDebtors.php'), - CheckMods('/Z_ImportStocks.php'), - CheckMods('/Z_ImportPriceList.php'), - CheckMods('/Z_ImportFixedAssets.php'), - CheckMods('/Z_ImportGLTransactions.php'), '/Z_CreateCompanyTemplateFile.php', - CheckMods('/Z_UpdateChartDetailsBFwd.php'), - CheckMods('/Z_RePostGLFromPeriod.php'), - CheckMods('/Z_DeleteOldPrices.php') ); -?> \ No newline at end of file +$MenuItems['Utilities']['Maintenance']['URL'] = array( '/Z_poAdmin.php', + '/Z_MakeNewCompany.php', + '/Z_DataExport.php', + '/Z_ImportDebtors.php', + '/Z_ImportStocks.php', + '/Z_ImportPriceList.php', + '/Z_ImportFixedAssets.php', + '/Z_ImportGLTransactions.php', + '/Z_CreateCompanyTemplateFile.php', + '/Z_UpdateChartDetailsBFwd.php', + '/Z_RePostGLFromPeriod.php', + '/Z_DeleteOldPrices.php'); +?> |
From: <dai...@us...> - 2014-10-20 04:32:02
|
Revision: 6926 http://sourceforge.net/p/web-erp/reponame/6926 Author: daintree Date: 2014-10-20 04:31:55 +0000 (Mon, 20 Oct 2014) Log Message: ----------- Dont bother with mods idea Modified Paths: -------------- trunk/doc/Change.log trunk/includes/MiscFunctions.php Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2014-10-20 04:28:24 UTC (rev 6925) +++ trunk/doc/Change.log 2014-10-20 04:31:55 UTC (rev 6926) @@ -1,6 +1,5 @@ webERP Change Log -18/10/14 Phil: Setup a mods folder inside webERP folder structure for modified scripts. New function in MiscFunctions.php CheckMods() looks for a modified script first before using the normal script for those links that use the CheckMods() function 17/10/14 RChacon: Remove translation of tax category 'Freight' inside database. 17/10/14 Exson: Add po line and due date result in OrderDetails.php. 15/10/14 Exson: Fixed no receipt data displayed retrieved bugs for sales login in CustomerInquiry.php. Modified: trunk/includes/MiscFunctions.php =================================================================== --- trunk/includes/MiscFunctions.php 2014-10-20 04:28:24 UTC (rev 6925) +++ trunk/includes/MiscFunctions.php 2014-10-20 04:31:55 UTC (rev 6926) @@ -448,12 +448,4 @@ echo ' ... ' . _('completed'); } -function CheckMods($ScriptName) { - if (file_exists('mods' . $ScriptName)){ - return '/mods' . $ScriptName; - } else { - return $ScriptName; - } -} - ?> \ No newline at end of file |
From: <dai...@us...> - 2014-10-25 04:45:36
|
Revision: 6936 http://sourceforge.net/p/web-erp/reponame/6936 Author: daintree Date: 2014-10-25 04:45:31 +0000 (Sat, 25 Oct 2014) Log Message: ----------- remove external xmlrpc Modified Paths: -------------- trunk/doc/Change.log Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2014-10-24 12:55:20 UTC (rev 6935) +++ trunk 2014-10-25 04:45:31 UTC (rev 6936) Property changes on: trunk ___________________________________________________________________ Deleted: svn:externals ## -1 +0,0 ## -xmlrpc http://svn.code.sf.net/p/phpxmlrpc/code/trunk/xmlrpc \ No newline at end of property Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2014-10-24 12:55:20 UTC (rev 6935) +++ trunk/doc/Change.log 2014-10-25 04:45:31 UTC (rev 6936) @@ -1,4 +1,5 @@ webERP Change Log + 24/10/14 Exson: Fixed the extra blank in pattern in TaxGroups.php which leads to input failure. 24/10/14 Exson: Correct Chinese currency code in weberpchina.sql 22/10/14 Exson: Add Order by in SalesTypes.php. |