Menu
▾
▴
web-erp-svn
|
From: <dai...@us...> - 2015-05-17 01:42:24
|
Revision: 7303
http://sourceforge.net/p/web-erp/reponame/7303
Author: daintree
Date: 2015-05-17 01:42:19 +0000 (Sun, 17 May 2015)
Log Message:
-----------
before 4.12.3 release
Modified Paths:
--------------
trunk/UpgradeDatabase.php
trunk/doc/Change.log
trunk/includes/ConnectDB.inc
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/country_sql/default.sql
trunk/sql/mysql/country_sql/demo.sql
trunk/sql/mysql/upgrade4.12.2-4.13.sql
Added Paths:
-----------
trunk/sql/mysql/upgrade4.12.2-4.12.3.sql
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2015-05-16 23:43:12 UTC (rev 7302)
+++ trunk/UpgradeDatabase.php 2015-05-17 01:42:19 UTC (rev 7303)
@@ -190,6 +190,8 @@
$SQLScripts[] = './sql/mysql/upgrade4.12-4.12.1.sql';
case '4.12.1':
$SQLScripts[] = './sql/mysql/upgrade4.12.1-4.12.2.sql';
+ case '4.12.2':
+ $SQLScripts[] = './sql/mysql/upgrade4.12.2-4.12.3.sql';
break;
} //end switch
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-05-16 23:43:12 UTC (rev 7302)
+++ trunk/doc/Change.log 2015-05-17 01:42:19 UTC (rev 7303)
@@ -1,7 +1,9 @@
webERP Change Log
+17/5/15 Version 4.12.3
17/5/15 Phil: Made currencies delete check first for bank accounts set up using the currency - as reported by Ricard
10/05/15 RChacon: New features: (1) GL account code for an inventory location, so that you can have general ledger transactions of inventory transfers to or from this location; useful for pledged inventory and goods on consignment. (2) Allow Invoicing parameter to allow or deny the availability of a location to be delivered; useful when a location stores compromised good that can not be sold.
+09/05/15 Exson: Fixed no input filtering bug which cause input failure and location quantity become mess in WorkOrderReceive.php. But the transaction failure maybe still there.
08/05/15 RChacon: In DeliveryDetails.php, add $ViewTopic and $BookMark to ManualSalesOrders.html.
07/05/15 RChacon: In CustomerInquiry.php, hide submit button and 'More Info' columns when printing. Add thead tag to enable the table header to be printed at the top of each page.
07/05/15 RChacon: In SupplierInquiry.php, hide submit button and 'More Info' columns when printing. Add thead tag to enable the table header to be printed at the top of each page.
@@ -25,10 +27,6 @@
01/4/15 Exson: Fixed the bug that when delete one gl item from the payment details, the bank account related setting will disappeared in Payments.php. Reported by Steven.
01/4/15 Thumb: Add a Z_ImportCustbranch.php script to import customer branches.
30/3/15 Vitaly: Get all taxes for the tax group, even if calculationorder is left at default value 0.
-
-
-
-09/05/15 Exson: Fixed no input filtering bug which cause input failure and location quantity become mess in WorkOrderReceive.php. But the transaction failure maybe still there.
29/3/15 Phil: Allow dummy/service items to be propogated to CounterLogic POS installs through the api
27/3/15 Exson: Remove redundant code from PrintCustTrans.php.
27/3/15 Exson: Make credit not for freight only is printable in PrintCustTrans.php.
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2015-05-16 23:43:12 UTC (rev 7302)
+++ trunk/includes/ConnectDB.inc 2015-05-17 01:42:19 UTC (rev 7303)
@@ -4,7 +4,7 @@
* this value is saved in the $_SESSION['Versionumber'] when includes/GetConfig.php is run
* if VersionNumber is < $Version then the DB update script is run */
-$Version='4.12.2'; //must update manually every time there is a DB change
+$Version='4.12.3'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
if (!isset($_SESSION['DatabaseName'])){
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2015-05-16 23:43:12 UTC (rev 7302)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2015-05-17 01:42:19 UTC (rev 7303)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-10 11:26-0600\n"
+"POT-Creation-Date: 2015-05-17 13:40+1200\n"
"PO-Revision-Date: 2013-06-01 11:19-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -157,25 +157,25 @@
#: AccountGroups.php:213 AccountGroups.php:248 AccountSections.php:130
#: Areas.php:115 Areas.php:124 BankAccounts.php:165 CreditStatus.php:125
-#: Currencies.php:247 Currencies.php:255 Currencies.php:263
+#: Currencies.php:247 Currencies.php:255 Currencies.php:263 Currencies.php:273
#: CustomerBranches.php:300 CustomerBranches.php:310 CustomerBranches.php:320
-#: CustomerBranches.php:330 CustomerBranches.php:340 CustomerTypes.php:146
-#: CustomerTypes.php:156 Customers.php:296 Customers.php:305 Customers.php:313
-#: Customers.php:324 Customers.php:334 Departments.php:141 Factors.php:134
-#: FixedAssetCategories.php:137 GLAccounts.php:79 GLAccounts.php:95
-#: Locations.php:279 Locations.php:287 Locations.php:298 Locations.php:307
-#: Locations.php:316 Locations.php:325 Locations.php:334 Locations.php:343
-#: Locations.php:351 MRPDemandTypes.php:87 Manufacturers.php:154
-#: PaymentMethods.php:143 PaymentTerms.php:146 PaymentTerms.php:153
-#: PcExpenses.php:161 SalesCategories.php:128 SalesCategories.php:135
-#: SalesPeople.php:159 SalesPeople.php:166 SalesPeople.php:172
-#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 Shippers.php:93
-#: StockCategories.php:216 Stocks.php:762 Stocks.php:771 Stocks.php:779
-#: Stocks.php:787 Stocks.php:795 Stocks.php:803 Stocks.php:811 Stocks.php:819
-#: SupplierTypes.php:126 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
-#: TaxCategories.php:132 TaxGroups.php:134 TaxGroups.php:142
-#: TaxProvinces.php:129 UnitsOfMeasure.php:135 WWW_Access.php:88
-#: WorkCentres.php:89 WorkCentres.php:95
+#: CustomerBranches.php:330 CustomerBranches.php:340 Customers.php:296
+#: Customers.php:305 Customers.php:313 Customers.php:324 Customers.php:334
+#: CustomerTypes.php:146 CustomerTypes.php:156 Departments.php:141
+#: Factors.php:134 FixedAssetCategories.php:137 GLAccounts.php:79
+#: GLAccounts.php:95 Locations.php:279 Locations.php:287 Locations.php:298
+#: Locations.php:307 Locations.php:316 Locations.php:325 Locations.php:334
+#: Locations.php:343 Locations.php:351 Manufacturers.php:154
+#: MRPDemandTypes.php:87 PaymentMethods.php:143 PaymentTerms.php:146
+#: PaymentTerms.php:153 PcExpenses.php:161 SalesCategories.php:128
+#: SalesCategories.php:135 SalesPeople.php:159 SalesPeople.php:166
+#: SalesPeople.php:172 SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81
+#: Shippers.php:93 StockCategories.php:216 Stocks.php:762 Stocks.php:771
+#: Stocks.php:779 Stocks.php:787 Stocks.php:795 Stocks.php:803 Stocks.php:811
+#: Stocks.php:819 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
+#: SupplierTypes.php:126 TaxCategories.php:132 TaxGroups.php:134
+#: TaxGroups.php:142 TaxProvinces.php:129 UnitsOfMeasure.php:135
+#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:88
msgid "There are"
msgstr "يوجد"
@@ -232,46 +232,46 @@
#: BOMIndentedReverse.php:236 BOMInquiry.php:186 BOMListing.php:110
#: BOMs.php:239 BOMs.php:890 COGSGLPostings.php:19 CompanyPreferences.php:102
#: CounterReturns.php:1629 CounterSales.php:2097 CounterSales.php:2193
-#: CreditStatus.php:21 Credit_Invoice.php:276 CustEDISetup.php:17
+#: Credit_Invoice.php:276 CreditStatus.php:21 CustEDISetup.php:17
#: CustItem.php:120 CustItem.php:210 CustItem.php:238
#: DebtorsAtPeriodEnd.php:129 DiscountCategories.php:12
#: DiscountCategories.php:149 DiscountMatrix.php:16 EDIMessageFormat.php:105
#: FixedAssetLocations.php:13 FixedAssetRegister.php:16
#: FixedAssetRegister.php:256 FixedAssetTransfer.php:14 FormDesigner.php:185
-#: GLBudgets.php:32 GLJournal.php:250 GLJournalInquiry.php:11
+#: GLBudgets.php:32 GLJournalInquiry.php:11 GLJournal.php:250
#: HistoricalTestResults.php:42 InternalStockRequest.php:311
#: InventoryPlanning.php:459 InventoryPlanningPrefSupplier.php:386
-#: MRPReport.php:544 MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16
-#: NoSalesItems.php:91 PDFPickingList.php:29 PDFStockLocTransfer.php:16
-#: POReport.php:60 POReport.php:64 POReport.php:68
-#: PO_AuthorisationLevels.php:10 PO_SelectOSPurchOrder.php:153
-#: PcAssignCashToTab.php:59 PcAssignCashToTab.php:133
-#: PcAssignCashToTab.php:149 PcAssignCashToTab.php:193 PriceMatrix.php:16
-#: Prices.php:11 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35
-#: ProductSpecs.php:38 PurchData.php:241 PurchData.php:373 PurchData.php:401
-#: PurchaseByPrefSupplier.php:305 QATests.php:22 RecurringSalesOrders.php:320
-#: RelatedItemsUpdate.php:24 SalesAnalReptCols.php:51 SalesAnalRepts.php:14
-#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:40
-#: SalesPeople.php:28 SalesTypes.php:20 SelectAsset.php:48
-#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:220
-#: SelectCreditItems.php:291 SelectCustomer.php:266 SelectGLAccount.php:65
-#: SelectOrderItems.php:559 SelectOrderItems.php:1467
-#: SelectOrderItems.php:1567 SelectProduct.php:502 SelectQASamples.php:45
-#: SelectSalesOrder.php:512 SelectSupplier.php:14 SelectSupplier.php:220
-#: SelectWorkOrder.php:9 SelectWorkOrder.php:174 SellThroughSupport.php:229
-#: ShipmentCosting.php:11 Shipments.php:17 Shippers.php:123 Shippers.php:160
-#: Shipt_Select.php:8 StockLocMovements.php:14 StockLocStatus.php:29
+#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 MRPReport.php:544
+#: NoSalesItems.php:91 PcAssignCashToTab.php:59 PcAssignCashToTab.php:133
+#: PcAssignCashToTab.php:149 PcAssignCashToTab.php:193 PDFPickingList.php:29
+#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:60
+#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:153
+#: PriceMatrix.php:16 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35
+#: Prices.php:11 ProductSpecs.php:38 PurchaseByPrefSupplier.php:305
+#: PurchData.php:241 PurchData.php:373 PurchData.php:401 QATests.php:22
+#: RecurringSalesOrders.php:320 RelatedItemsUpdate.php:24
+#: SalesAnalReptCols.php:51 SalesAnalRepts.php:14 SalesCategories.php:11
+#: SalesGLPostings.php:19 SalesGraph.php:40 SalesPeople.php:28
+#: SalesTypes.php:20 SelectAsset.php:48 SelectCompletedOrder.php:11
+#: SelectContract.php:69 SelectCreditItems.php:220 SelectCreditItems.php:291
+#: SelectCustomer.php:266 SelectGLAccount.php:65 SelectOrderItems.php:559
+#: SelectOrderItems.php:1467 SelectOrderItems.php:1567 SelectProduct.php:502
+#: SelectQASamples.php:45 SelectSalesOrder.php:512 SelectSupplier.php:14
+#: SelectSupplier.php:220 SelectWorkOrder.php:9 SelectWorkOrder.php:174
+#: SellThroughSupport.php:229 ShipmentCosting.php:11 Shipments.php:17
+#: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
+#: StockLocMovements.php:14 StockLocStatus.php:29
#: StockSerialItemResearch.php:30 SupplierPriceList.php:14
#: SupplierPriceList.php:224 SupplierPriceList.php:394
#: SupplierPriceList.php:398 SupplierPriceList.php:449
-#: SupplierPriceList.php:499 SupplierTenderCreate.php:556
+#: SupplierPriceList.php:499 Suppliers.php:304 SupplierTenderCreate.php:556
#: SupplierTenderCreate.php:664 SupplierTenders.php:322
-#: SupplierTenders.php:388 SupplierTransInquiry.php:10 Suppliers.php:304
-#: TestPlanResults.php:27 TopItems.php:118 UnitsOfMeasure.php:10
-#: WWW_Users.php:34 WhereUsedInquiry.php:18 WorkCentres.php:111
-#: WorkCentres.php:163 WorkOrderCosting.php:22 WorkOrderEntry.php:11
-#: WorkOrderIssue.php:22 WorkOrderReceive.php:34 WorkOrderStatus.php:58
-#: Z_BottomUpCosts.php:57 ../webSHOP/includes/header.php:251
+#: SupplierTenders.php:388 SupplierTransInquiry.php:10 TestPlanResults.php:27
+#: TopItems.php:118 UnitsOfMeasure.php:10 WhereUsedInquiry.php:18
+#: WorkCentres.php:111 WorkCentres.php:163 WorkOrderCosting.php:22
+#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:34
+#: WorkOrderStatus.php:58 WWW_Users.php:34 Z_BottomUpCosts.php:57
+#: ../webSHOP/includes/header.php:217
msgid "Search"
msgstr "إبحث"
@@ -298,22 +298,22 @@
#: CompanyPreferences.php:425 CompanyPreferences.php:427
#: CompanyPreferences.php:440 CompanyPreferences.php:442
#: CompanyPreferences.php:455 CompanyPreferences.php:457
-#: ContractCosting.php:202 Currencies.php:333 Currencies.php:511
-#: Currencies.php:513 CustomerBranches.php:452 Customers.php:659
+#: ContractCosting.php:202 Currencies.php:342 Currencies.php:520
+#: Currencies.php:522 CustomerBranches.php:452 Customers.php:659
#: Customers.php:1049 Customers.php:1055 Customers.php:1058
-#: DailyBankTransactions.php:156 DeliveryDetails.php:1159
-#: DeliveryDetails.php:1202 DeliveryDetails.php:1205 FormDesigner.php:101
+#: DailyBankTransactions.php:156 DeliveryDetails.php:1157
+#: DeliveryDetails.php:1198 DeliveryDetails.php:1201 FormDesigner.php:101
#: GLTransInquiry.php:74 Labels.php:601 Labels.php:603 Labels.php:628
#: Locations.php:446 Locations.php:668 Locations.php:670 Locations.php:683
-#: Locations.php:685 Locations.php:701 MRP.php:554 MRP.php:558 MRP.php:562
-#: MRP.php:566 MRP.php:570 MRPCalendar.php:224 PDFChequeListing.php:65
-#: PDFDIFOT.php:80 PDFDeliveryDifferences.php:76 PDFWOPrint.php:600
+#: Locations.php:685 Locations.php:701 MRPCalendar.php:224 MRP.php:554
+#: MRP.php:558 MRP.php:562 MRP.php:566 MRP.php:570 PaymentMethods.php:206
+#: PaymentMethods.php:207 PaymentMethods.php:208 PaymentMethods.php:209
+#: PaymentMethods.php:275 PaymentMethods.php:282 PaymentMethods.php:289
+#: PaymentMethods.php:296 PcAuthorizeExpenses.php:248 PDFChequeListing.php:65
+#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:80 PDFWOPrint.php:600
#: PDFWOPrint.php:604 PO_AuthorisationLevels.php:134
#: PO_AuthorisationLevels.php:139 PO_Header.php:807 PO_PDFPurchOrder.php:413
-#: PO_PDFPurchOrder.php:416 PaymentMethods.php:206 PaymentMethods.php:207
-#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:275
-#: PaymentMethods.php:282 PaymentMethods.php:289 PaymentMethods.php:296
-#: PcAuthorizeExpenses.php:248 ProductSpecs.php:188 ProductSpecs.php:409
+#: PO_PDFPurchOrder.php:416 ProductSpecs.php:188 ProductSpecs.php:409
#: ProductSpecs.php:414 ProductSpecs.php:420 ProductSpecs.php:425
#: ProductSpecs.php:430 ProductSpecs.php:562 ProductSpecs.php:608
#: ProductSpecs.php:610 ProductSpecs.php:621 ProductSpecs.php:623
@@ -352,32 +352,32 @@
#: TestPlanResults.php:532 TestPlanResults.php:747 TestPlanResults.php:864
#: TestPlanResults.php:924 TestPlanResults.php:928 WWW_Users.php:516
#: WWW_Users.php:518 WWW_Users.php:689 WWW_Users.php:691 WWW_Users.php:704
-#: WWW_Users.php:706 reportwriter/languages/en_US/reports.php:114
+#: WWW_Users.php:706
msgid "Yes"
msgstr "موافق"
#: AccountGroups.php:313 AccountGroups.php:450 AccountGroups.php:452
-#: BOMs.php:130 BOMs.php:801 BOMs.php:805 BankAccounts.php:218
-#: BankAccounts.php:412 BankAccounts.php:414 BankAccounts.php:418
-#: BankAccounts.php:426 CompanyPreferences.php:424 CompanyPreferences.php:428
+#: BankAccounts.php:218 BankAccounts.php:412 BankAccounts.php:414
+#: BankAccounts.php:418 BankAccounts.php:426 BOMs.php:130 BOMs.php:801
+#: BOMs.php:805 CompanyPreferences.php:424 CompanyPreferences.php:428
#: CompanyPreferences.php:439 CompanyPreferences.php:443
#: CompanyPreferences.php:454 CompanyPreferences.php:458
-#: ContractCosting.php:200 Currencies.php:335 Currencies.php:516
-#: Currencies.php:518 CustomerBranches.php:452 Customers.php:658
+#: ContractCosting.php:200 Currencies.php:344 Currencies.php:525
+#: Currencies.php:527 CustomerBranches.php:452 Customers.php:658
#: Customers.php:1047 Customers.php:1054 Customers.php:1057
-#: DailyBankTransactions.php:158 DeliveryDetails.php:1160
-#: DeliveryDetails.php:1203 DeliveryDetails.php:1206 FormDesigner.php:99
+#: DailyBankTransactions.php:158 DeliveryDetails.php:1158
+#: DeliveryDetails.php:1199 DeliveryDetails.php:1202 FormDesigner.php:99
#: GLTransInquiry.php:93 Labels.php:600 Labels.php:604 Labels.php:629
#: Locations.php:446 Locations.php:673 Locations.php:675 Locations.php:688
-#: Locations.php:690 Locations.php:702 MRP.php:552 MRP.php:556 MRP.php:560
-#: MRP.php:564 MRP.php:568 MRPCalendar.php:226 NoSalesItems.php:191
-#: PDFChequeListing.php:64 PDFDIFOT.php:79 PDFDeliveryDifferences.php:75
+#: Locations.php:690 Locations.php:702 MRPCalendar.php:226 MRP.php:552
+#: MRP.php:556 MRP.php:560 MRP.php:564 MRP.php:568 NoSalesItems.php:191
+#: PaymentMethods.php:206 PaymentMethods.php:207 PaymentMethods.php:208
+#: PaymentMethods.php:209 PaymentMethods.php:276 PaymentMethods.php:283
+#: PaymentMethods.php:290 PaymentMethods.php:297 PcAuthorizeExpenses.php:246
+#: PDFChequeListing.php:64 PDFDeliveryDifferences.php:75 PDFDIFOT.php:79
#: PDFWOPrint.php:601 PDFWOPrint.php:605 PO_AuthorisationLevels.php:136
#: PO_AuthorisationLevels.php:141 PO_Header.php:806 PO_PDFPurchOrder.php:414
-#: PO_PDFPurchOrder.php:417 PaymentMethods.php:206 PaymentMethods.php:207
-#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:276
-#: PaymentMethods.php:283 PaymentMethods.php:290 PaymentMethods.php:297
-#: PcAuthorizeExpenses.php:246 ProductSpecs.php:191 ProductSpecs.php:411
+#: PO_PDFPurchOrder.php:417 ProductSpecs.php:191 ProductSpecs.php:411
#: ProductSpecs.php:417 ProductSpecs.php:422 ProductSpecs.php:427
#: ProductSpecs.php:432 ProductSpecs.php:613 ProductSpecs.php:615
#: ProductSpecs.php:626 ProductSpecs.php:628 ProductSpecs.php:639
@@ -417,40 +417,37 @@
#: TestPlanResults.php:925 TestPlanResults.php:927 WWW_Users.php:515
#: WWW_Users.php:519 WWW_Users.php:688 WWW_Users.php:692 WWW_Users.php:703
#: WWW_Users.php:707 includes/PDFLowGPPageHeader.inc:44
-#: reportwriter/languages/en_US/reports.php:82
msgid "No"
msgstr "ﻻ"
#: AccountGroups.php:322 AccountSections.php:191 AddCustomerContacts.php:148
#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
-#: BOMs.php:157 BankAccounts.php:243 COGSGLPostings.php:112
-#: COGSGLPostings.php:219 CreditStatus.php:175 Currencies.php:365
-#: Currencies.php:382 CustItem.php:166 CustomerBranches.php:456
-#: CustomerTypes.php:205 Customers.php:1131 Customers.php:1165
+#: BankAccounts.php:243 BOMs.php:157 COGSGLPostings.php:112
+#: COGSGLPostings.php:219 CreditStatus.php:175 Currencies.php:374
+#: Currencies.php:391 CustItem.php:166 CustomerBranches.php:456
+#: Customers.php:1131 Customers.php:1165 CustomerTypes.php:205
#: Departments.php:186 EDIMessageFormat.php:150 Factors.php:334
#: FixedAssetCategories.php:190 FixedAssetLocations.php:111
-#: FreightCosts.php:253 GLAccounts.php:317 GLTags.php:96 GeocodeSetup.php:173
+#: FreightCosts.php:253 GeocodeSetup.php:173 GLAccounts.php:317 GLTags.php:96
#: ImportBankTransAnalysis.php:223 InternalStockRequest.php:293 Labels.php:333
-#: Labels.php:358 Locations.php:439 MRPDemandTypes.php:120 MRPDemands.php:309
-#: MailingGroupMaintenance.php:178 MaintenanceTasks.php:118
-#: Manufacturers.php:217 PO_AuthorisationLevels.php:151 PaymentMethods.php:210
-#: PaymentTerms.php:205 PcAssignCashToTab.php:277
-#: PcClaimExpensesFromTab.php:276 PcExpenses.php:226 PcTabs.php:236
-#: PcTypeTabs.php:180 PriceMatrix.php:287 Prices.php:253
-#: Prices_Customer.php:286 ProductSpecs.php:465 PurchData.php:312
-#: QATests.php:467 SalesCategories.php:272 SalesGLPostings.php:137
-#: SalesGLPostings.php:255 SalesPeople.php:240 SalesTypes.php:206
-#: SecurityTokens.php:130 SelectCustomer.php:615 SelectCustomer.php:634
-#: SelectCustomer.php:664 SelectCustomer.php:682 SelectCustomer.php:706
-#: SelectCustomer.php:723 SelectGLAccount.php:117 SelectGLAccount.php:132
-#: SelectQASamples.php:417 SellThroughSupport.php:298 Shippers.php:144
-#: StockCategories.php:296 SuppTransGLAnalysis.php:125
+#: Labels.php:358 Locations.php:439 MailingGroupMaintenance.php:178
+#: MaintenanceTasks.php:118 Manufacturers.php:217 MRPDemands.php:309
+#: MRPDemandTypes.php:120 PaymentMethods.php:210 PaymentTerms.php:205
+#: PcAssignCashToTab.php:277 PcClaimExpensesFromTab.php:276 PcExpenses.php:226
+#: PcTabs.php:236 PcTypeTabs.php:180 PO_AuthorisationLevels.php:151
+#: PriceMatrix.php:287 Prices_Customer.php:286 Prices.php:253
+#: ProductSpecs.php:465 PurchData.php:312 QATests.php:467
+#: SalesCategories.php:272 SalesGLPostings.php:137 SalesGLPostings.php:255
+#: SalesPeople.php:240 SalesTypes.php:206 SecurityTokens.php:130
+#: SelectCustomer.php:615 SelectCustomer.php:634 SelectCustomer.php:664
+#: SelectCustomer.php:682 SelectCustomer.php:706 SelectCustomer.php:723
+#: SelectGLAccount.php:117 SelectGLAccount.php:132 SelectQASamples.php:417
+#: SellThroughSupport.php:298 Shippers.php:144 StockCategories.php:296
#: SupplierContacts.php:165 SupplierTenderCreate.php:157 SupplierTypes.php:170
-#: TaxAuthorities.php:172 TaxCategories.php:184 TaxGroups.php:190
-#: TaxProvinces.php:179 UnitsOfMeasure.php:185 WWW_Access.php:132
-#: WWW_Users.php:350 WorkCentres.php:142 includes/InputSerialItems.php:110
-#: includes/OutputSerialItems.php:20
-#: reportwriter/languages/en_US/reports.php:143
+#: SuppTransGLAnalysis.php:125 TaxAuthorities.php:172 TaxCategories.php:184
+#: TaxGroups.php:190 TaxProvinces.php:179 UnitsOfMeasure.php:185
+#: WorkCentres.php:142 WWW_Access.php:132 WWW_Users.php:350
+#: includes/InputSerialItems.php:110 includes/OutputSerialItems.php:20
#, php-format
msgid "Edit"
msgstr "تحرير"
@@ -461,24 +458,24 @@
#: AccountGroups.php:323 AccountSections.php:195 AddCustomerContacts.php:149
#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
-#: BOMs.php:159 BankAccounts.php:244 COGSGLPostings.php:113
+#: BankAccounts.php:244 BOMs.php:159 COGSGLPostings.php:113
#: COGSGLPostings.php:220 ContractBOM.php:272 ContractOtherReqts.php:124
-#: CounterReturns.php:740 CounterSales.php:836 CreditStatus.php:176
-#: Credit_Invoice.php:409 Currencies.php:368 CustItem.php:167
-#: CustomerReceipt.php:989 CustomerTypes.php:206 Customers.php:1166
+#: CounterReturns.php:740 CounterSales.php:836 Credit_Invoice.php:409
+#: CreditStatus.php:176 Currencies.php:377 CustItem.php:167
+#: CustomerReceipt.php:989 Customers.php:1166 CustomerTypes.php:206
#: Departments.php:187 DiscountCategories.php:238 DiscountMatrix.php:183
#: EDIMessageFormat.php:151 FixedAssetCategories.php:191 FreightCosts.php:254
-#: GLAccounts.php:318 GLJournal.php:430 GLTags.php:97 GeocodeSetup.php:174
+#: GeocodeSetup.php:174 GLAccounts.php:318 GLJournal.php:430 GLTags.php:97
#: ImportBankTransAnalysis.php:224 InternalStockCategoriesByRole.php:184
#: InternalStockRequest.php:294 Labels.php:334 Labels.php:359 Labels.php:607
-#: Locations.php:440 MRPDemandTypes.php:121 MRPDemands.php:310
-#: MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
-#: Manufacturers.php:218 PO_AuthorisationLevels.php:153 PO_Items.php:768
-#: PaymentMethods.php:211 PaymentTerms.php:206 Payments.php:1112
+#: Locations.php:440 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
+#: Manufacturers.php:218 MRPDemands.php:310 MRPDemandTypes.php:121
+#: PaymentMethods.php:211 Payments.php:1112 PaymentTerms.php:206
#: PcAssignCashToTab.php:281 PcClaimExpensesFromTab.php:277 PcExpenses.php:227
#: PcExpensesTypeTab.php:187 PcTabs.php:237 PcTypeTabs.php:181
-#: PriceMatrix.php:286 Prices.php:254 Prices_Customer.php:287
-#: ProductSpecs.php:466 PurchData.php:314 PurchData.php:721 QATests.php:468
+#: PO_AuthorisationLevels.php:153 PO_Items.php:768 PriceMatrix.php:286
+#: Prices_Customer.php:287 Prices.php:254 ProductSpecs.php:466
+#: PurchData.php:314 PurchData.php:721 QATests.php:468
#: RelatedItemsUpdate.php:155 RelatedItemsUpdate.php:170
#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:273
#: SalesGLPostings.php:138 SalesGLPostings.php:256 SalesPeople.php:241
@@ -489,15 +486,14 @@
#: SellThroughSupport.php:299 Shipments.php:438 Shippers.php:145
#: SpecialOrder.php:667 StockCategories.php:297 StockCategories.php:626
#: StockLocTransfer.php:325 SuppContractChgs.php:99 SuppCreditGRNs.php:117
-#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:147 SuppShiptChgs.php:90
-#: SuppTransGLAnalysis.php:126 SupplierContacts.php:166
+#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:147 SupplierContacts.php:166
#: SupplierTenderCreate.php:422 SupplierTenderCreate.php:452
-#: SupplierTypes.php:172 TaxAuthorities.php:173 TaxCategories.php:186
-#: TaxGroups.php:191 TaxProvinces.php:180 TestPlanResults.php:920
-#: UnitsOfMeasure.php:186 WOSerialNos.php:335 WWW_Access.php:133
-#: WWW_Users.php:351 WorkCentres.php:143 includes/InputSerialItemsKeyed.php:60
+#: SupplierTypes.php:172 SuppShiptChgs.php:90 SuppTransGLAnalysis.php:126
+#: TaxAuthorities.php:173 TaxCategories.php:186 TaxGroups.php:191
+#: TaxProvinces.php:180 TestPlanResults.php:920 UnitsOfMeasure.php:186
+#: WorkCentres.php:143 WOSerialNos.php:335 WWW_Access.php:133
+#: WWW_Users.php:351 includes/InputSerialItemsKeyed.php:60
#: includes/OutputSerialItems.php:99
-#: reportwriter/languages/en_US/reports.php:141
#, php-format
msgid "Delete"
msgstr "حذف"
@@ -562,21 +558,21 @@
#: AccountGroups.php:462 AccountSections.php:262 AddCustomerContacts.php:260
#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229
-#: BOMs.php:818 BankAccounts.php:433 COGSGLPostings.php:368
-#: CreditStatus.php:259 Currencies.php:525 CustLoginSetup.php:273
+#: BankAccounts.php:433 BOMs.php:818 COGSGLPostings.php:368
+#: CreditStatus.php:259 Currencies.php:534 CustLoginSetup.php:273
#: Departments.php:258 DiscountMatrix.php:142 EDIMessageFormat.php:248
#: FixedAssetCategories.php:350 FixedAssetLocations.php:161
-#: FreightCosts.php:371 GLAccounts.php:265 GeocodeSetup.php:271 Labels.php:641
-#: Locations.php:714 MRPDemandTypes.php:188 MRPDemands.php:424
-#: Manufacturers.php:312 OffersReceived.php:57 OffersReceived.php:146
-#: PO_AuthorisationLevels.php:264 PaymentMethods.php:302 PaymentTerms.php:310
+#: FreightCosts.php:371 GeocodeSetup.php:271 GLAccounts.php:265 Labels.php:641
+#: Locations.php:714 Manufacturers.php:312 MRPDemands.php:424
+#: MRPDemandTypes.php:188 OffersReceived.php:57 OffersReceived.php:146
+#: PaymentMethods.php:302 PaymentTerms.php:310 PO_AuthorisationLevels.php:264
#: PriceMatrix.php:230 Prices_Customer.php:369 ProductSpecs.php:661
#: QATests.php:359 SalesAnalReptCols.php:552 SalesAnalRepts.php:519
#: SalesGLPostings.php:427 SalesPeople.php:381 SelectQASamples.php:531
#: SelectQASamples.php:601 Shippers.php:203 StockCategories.php:653
-#: SuppLoginSetup.php:291 SupplierContacts.php:284 TaxAuthorities.php:327
+#: SupplierC...
[truncated message content] |
|
From: <rc...@us...> - 2015-05-19 14:13:57
|
Revision: 7308
http://sourceforge.net/p/web-erp/reponame/7308
Author: rchacon
Date: 2015-05-19 14:13:54 +0000 (Tue, 19 May 2015)
Log Message:
-----------
Add documentation and help for users in Locations.php and ManualInventory.html.
Modified Paths:
--------------
trunk/Locations.php
trunk/doc/Change.log
trunk/doc/Manual/ManualInventory.html
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/Locations.php
===================================================================
--- trunk/Locations.php 2015-05-19 12:34:08 UTC (rev 7307)
+++ trunk/Locations.php 2015-05-19 14:13:54 UTC (rev 7308)
@@ -633,12 +633,14 @@
<tr>
<td>' . _('Facsimile No') . ':' . '</td>
<td><input name="Fax" type="tel" pattern="[0-9+\-\s()]*" value="' . $_POST['Fax'] . '" size="31" maxlength="30" title="' . _('The fax number should consist of numbers, parentheses, spaces or the + character') . '"/></td>
- </tr>
- <tr>
- <td>' . _('Email') . ':' . '</td>
- <td><input name="Email" type="email" value="' . $_POST['Email'] . '" size="31" maxlength="55" /></td>
- </tr>
- <tr>
+ </tr>';
+ // Email address:
+ echo '<tr title="', _('The email address should be an email format such as ad...@we...'), '">
+ <td><label for="Email">', _('Email'), ':</label></td>
+ <td><input id="Email" maxlength="55" name="Email" size="31" type="email" value="', $_POST['Email'], '" /></td>
+ </tr>';
+ // Tax Province:
+ echo '<tr>
<td>' . _('Tax Province') . ':' . '</td>
<td><select name="TaxProvince">';
@@ -719,4 +721,4 @@
}//end if record deleted no point displaying form to add record
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-05-19 12:34:08 UTC (rev 7307)
+++ trunk/doc/Change.log 2015-05-19 14:13:54 UTC (rev 7308)
@@ -1,4 +1,7 @@
webERP Change Log
+
+19/5/15 RChacon: Add documentation and help for users in Locations.php and ManualInventory.html.
+
17/5/15 Version 4.12.3
17/5/15 Phil: Made currencies delete check first for bank accounts set up using the currency - as reported by Ricard
Modified: trunk/doc/Manual/ManualInventory.html
===================================================================
--- trunk/doc/Manual/ManualInventory.html 2015-05-19 12:34:08 UTC (rev 7307)
+++ trunk/doc/Manual/ManualInventory.html 2015-05-19 14:13:54 UTC (rev 7308)
@@ -522,36 +522,38 @@
<p>When creating a purchase order, the inventory location that it is required for is specified. The inventory location address and contact details defined here are used as the default addresses available for delivery of goods ordered on purchase orders.</p>
<dl>
- <!--dt><Location Code</dt>
- <dd>.</dd>
+ <dt>Location Code</dt>
+ <dd>Enter up to five characters for the inventory location code.</dd>
<dt>Location Name</dt>
- <dd>.</dd>
+ <dd>The inventory location name could be either a warehouse or a factory.</dd>
<dt>Contact for deliveries</dt>
+ <dd>This field is for the name of the responsible person to contact for this inventory location.</dd>
+ <!--dt>Delivery Address 1 (Building)</dt>
<dd>.</dd>
- <dt>Delivery Address 1 (Building)</dt>
+ <dt>Delivery Address 2 (Street)</dt>
<dd>.</dd>
- <dt>Delivery Address 2 (Street):</dt>
+ <dt>Delivery Address 3 (Suburb)</dt>
<dd>.</dd>
- <dt>Delivery Address 3 (Suburb):</dt>
+ <dt>Delivery Address 4 (City)</dt>
<dd>.</dd>
- <dt>Delivery Address 4 (City):</dt>
+ <dt>Delivery Address 5 (Zip Code)</dt>
<dd>.</dd>
- <dt>Delivery Address 5 (Zip Code):</dt>
- <dd>.</dd>
<dt>Country</dt>
- <dd>.</dd>
- <dt>Telephone No:</dt>
- <dd>.</dd>
- <dt>Facsimile No:</dt>
- <dd>.</dd>
- <dt>Email:</dt>
<dd>.</dd-->
- <dt>Tax Province:</dt>
+ <dt>Telephone No</dt>
+ <dd>The phone number should consist of numbers, spaces, parentheses, or the + character.</dd>
+ <dt>Facsimile No</dt>
+ <dd>The fax number should consist of numbers, spaces, parentheses, or the + character.</dd>
+ <dt>Email</dt>
+ <dd>The email address should be an email format such as ad...@we....</dd>
+ <dt>Tax Province</dt>
<dd>Since the location represents the physical location from where goods/services are supplied it is important for determining the tax applicable on a sale. The governing tax authority must specified with the location record. It is used in the calculation of the applicable rate of tax in conjunction with the tax authority of the customer branch being delivered to and the tax level of the item being sold.</dd>
<dt><a id="DefaultCounterSalesCustomerCode">Default Counter Sales Customer Code</a></dt>
- <dd>The counter sales functionality looks at the default inventory location for a user and when that user enters a counter sale it uses the customer account and customer branch defined against the inventory location record. Consider a business with locations in Melbourne Australia and one in Anahaim USA - it is unlikely that a user based in Anaheim would be making a counter sale in Melbourne! Each location can have a customer account (and branch) defined for it's counter sales. These customers are expected to be cash only customers as the counter sales functionality expects the cash to be taken at the time of the sale. Not a substitute for proper Point of Sale - but suitable for occassional Counter Sales.</dd>
+ <dd>The counter sales functionality looks at the default inventory location for a user and when that user enters a counter sale it uses the customer account and customer branch defined against the inventory location record. Consider a business with locations in Melbourne Australia and one in Anahaim USA - it is unlikely that a user based in Anaheim would be making a counter sale in Melbourne! Each location can have a customer account (and branch) defined for it's counter sales. These customers are expected to be cash only customers as the counter sales functionality expects the cash to be taken at the time of the sale. Not a substitute for proper Point of Sale - but suitable for occassional Counter Sales.<br />
+ If counter sales are being used for this location then an existing customer account code needs to be entered here. All sales created from the counter sales will be recorded against this customer account.</dd>
<dt>Counter Sales Branch Code</dt>
- <dd>See <a href="#DefaultCounterSalesCustomerCode">Default Counter Sales Customer Code</a>.</dd>
+ <dd>If counter sales are being used for this location then an existing customer branch code for the customer account code entered above needs to be entered here. All sales created from the counter sales will be recorded against this branch.<br />
+ See <a href="#DefaultCounterSalesCustomerCode">Default Counter Sales Customer Code</a>.</dd>
<!--dt>Allow internal requests?:</dt>
<dd>.</dd-->
<dt>Use for Work Order Productions?</dt>
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-05-19 12:34:08 UTC (rev 7307)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-05-19 14:13:54 UTC (rev 7308)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-05-17 13:40+1200\n"
-"PO-Revision-Date: 2015-05-17 20:11-0600\n"
+"PO-Revision-Date: 2015-05-19 07:25-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -29557,7 +29557,7 @@
#: ShopParameters.php:233
msgid "Shop Manager Email"
-msgstr ""
+msgstr "Correo-e del gerente de tienda"
#: ShopParameters.php:235
msgid "Enter the email address of the webSHOP manager."
|
|
From: <rc...@us...> - 2015-05-21 21:05:20
|
Revision: 7312
http://sourceforge.net/p/web-erp/reponame/7312
Author: rchacon
Date: 2015-05-21 21:05:18 +0000 (Thu, 21 May 2015)
Log Message:
-----------
Adjust CustomerAccount.php for direct printing.
Modified Paths:
--------------
trunk/CustomerAccount.php
trunk/doc/Change.log
Modified: trunk/CustomerAccount.php
===================================================================
--- trunk/CustomerAccount.php 2015-05-21 16:58:25 UTC (rev 7311)
+++ trunk/CustomerAccount.php 2015-05-21 21:05:18 UTC (rev 7312)
@@ -1,6 +1,6 @@
<?php
/* $Id: CustomerAccount.php 7004 2014-11-24 15:56:19Z rchacon $*/
-/* This script is <create a description for script table>. */
+/* Shows customer account/statement on screen rather than PDF. */
include('includes/session.inc');
$Title = _('Customer Account');// Screen identification.
@@ -29,7 +29,7 @@
$result = DB_query($sql,$ErrMsg);
if(DB_num_rows($result)>0) {
while($myrow = DB_fetch_array($result)) {
- if ($_SESSION['SalesmanLogin'] == $myrow['salesman']){
+ if ($_SESSION['SalesmanLogin'] == $myrow['salesman']) {
$ViewAllowed = true;
}
}
@@ -38,7 +38,7 @@
include('includes/footer.inc');
exit;
}
- if (!$ViewAllowed){
+ if (!$ViewAllowed) {
prnMsg(_('You have no authority to review this customer account'),'error');
include('includes/footer.inc');
exit;
@@ -54,7 +54,7 @@
/*now get all the settled transactions which were allocated this month */
$ErrMsg = _('There was a problem retrieving the transactions that were settled over the course of the last month for'). ' ' . $CustomerID . ' ' . _('from the database');
-if ($_SESSION['Show_Settled_LastMonth']==1){
+if ($_SESSION['Show_Settled_LastMonth']==1) {
$sql = "SELECT DISTINCT debtortrans.id,
debtortrans.type,
systypes.typename,
@@ -80,7 +80,7 @@
$SetldTrans=DB_query($sql, $ErrMsg);
$NumberOfRecordsReturned = DB_num_rows($SetldTrans);
- while ($myrow=DB_fetch_array($SetldTrans)){
+ while ($myrow=DB_fetch_array($SetldTrans)) {
$Transactions[] = $myrow;
}
} else {
@@ -114,7 +114,7 @@
$sql .= " ORDER BY debtortrans.id";
$OstdgTrans=DB_query($sql, $ErrMsg);
-while ($myrow=DB_fetch_array($OstdgTrans)){
+while ($myrow=DB_fetch_array($OstdgTrans)) {
$Transactions[] = $myrow;
}
@@ -212,36 +212,40 @@
$CustomerRecord = DB_fetch_array($CustomerResult);
-echo '<div class="toplink">
+echo '<div class="noprint toplink">
<a href="', $RootPath, '/SelectCustomer.php">', _('Back to Customer Screen'), '</a>
</div>';
echo '<table width="100%">
- <tr>
- <th colspan="2">' . _('Customer Statement For'), ': ', stripslashes($CustomerID), ' - ', $CustomerRecord['name'], '</th>
- </tr>
- <tr><td colspan="2">' . $CustomerRecord['address1'] . '</td></tr>
- <tr><td colspan="2">' . $CustomerRecord['address2'] . '</td></tr>
- <tr><td colspan="2">' . $CustomerRecord['address3'] . ' ' . $CustomerRecord['address4'] . ' ' . $CustomerRecord['address5'] . ' ' . $CustomerRecord['address6'] . '</td></tr>
- <tr><th>' . _('All amounts stated in'), ':</th><td>', $CustomerRecord['currency'] . '</td></tr>
- <tr><th>' . _('Terms'), ':</th><td>', $CustomerRecord['terms'] . '</th></tr>
- <tr><th>' . _('Credit Limit'), ':</th><td>', locale_number_format($CustomerRecord['creditlimit'], 0) . '</td></tr>
- <tr><th>' . _('Credit Status'), ':</th><td>', $CustomerRecord['reasondescription'] . '</td></tr>
- </table>';
+ <tr><th colspan="2">', _('Customer Statement For'), ': ', stripslashes($CustomerID), ' - ', $CustomerRecord['name'], '</th></tr>
+ <tr><td colspan="2">', $CustomerRecord['address1'], '</td></tr>';
+if($CustomerRecord['address2']!='') {// If not empty, output this line.
+ echo '<tr><td colspan="2">', $CustomerRecord['address2'], '</td></tr>';
+}
+if($CustomerRecord['address3']!='') {// If not empty, output this line.
+ echo '<tr><td colspan="2">', $CustomerRecord['address3'], '</td></tr>';
+}
+echo ' <tr><td colspan="2">', $CustomerRecord['address4'], '</td></tr>
+ <tr><td colspan="2">', $CustomerRecord['address5'], ' ', $CustomerRecord['address6'], '</td></tr>
+ <tr><th>', _('All amounts stated in'), ':</th><td>', $CustomerRecord['currency'], '</td></tr>
+ <tr><th>', _('Terms'), ':</th><td>', $CustomerRecord['terms'], '</th></tr>
+ <tr><th>', _('Credit Limit'), ':</th><td>', locale_number_format($CustomerRecord['creditlimit'], 0), '</td></tr>
+ <tr><th>', _('Credit Status'), ':</th><td>', $CustomerRecord['reasondescription'], '</td></tr>
+ </table>';
if ($CustomerRecord['dissallowinvoices'] != 0) {
- echo '<br /><font color="red" size="4"><b>', _('ACCOUNT ON HOLD'), '</font></b><br />';
+ echo '<br /><b><font color="red" size="4">', _('ACCOUNT ON HOLD'), '</font></b><br />';
}
-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 '<input tabindex="3" type="submit" name="Refresh Inquiry" value="', _('Refresh Inquiry'), '" />
+echo '<br /><form onSubmit="return VerifyForm(this);" action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post" class="centre noprint">
+ <input name="FormID" type="hidden" value="', $_SESSION['FormID'], '" />',
+ _('Show all transactions after'), ':<input alt="', $_SESSION['DefaultDateFormat'], '" class="date" id="datepicker" maxlength="10" minlength="0" name="TransAfterDate" required="required" size="12" tabindex="1" type="text" value="', $_POST['TransAfterDate'], '" />',
+ '<input name="Refresh Inquiry" tabindex="3" type="submit" value="', _('Refresh Inquiry'), '" />
</form>';
/* Show a table of the invoices returned by the SQL. */
-echo '<table class="selection">
+echo '<br /><table class="selection">
+ <thead>
<tr>
<th class="ascending">', _('Type'), '</th>
<th class="ascending">', _('Number'), '</th>
@@ -254,11 +258,9 @@
<th>', _('Credits'), '</th>
<th>', _('Allocated'), '</th>
<th>', _('Balance'), '</th>
- <th></th>
- <th></th>
- <th></th>
- <th></th>
- </tr>';
+ <th class="noprint" colspan="4"> </th>
+ </tr>
+ </thead><tbody>';
$k = 0; //row colour counter
$OutstandingOrSettled = '';
@@ -269,11 +271,11 @@
}
foreach ($Transactions as $MyRow) {
- if ($MyRow['settled']==1 AND $OutstandingOrSettled==''){
- echo '<tr><th colspan="10">' . _('TRANSACTIONS SETTLED SINCE') . ' ' . $_POST['TransAfterDate'] . '</th></tr>';
+ if ($MyRow['settled']==1 AND $OutstandingOrSettled=='') {
+ echo '<tr><th colspan="11">', _('TRANSACTIONS SETTLED SINCE'), ' ', $_POST['TransAfterDate'], '</th><th class="noprint" colspan="4"> </th></tr>';
$OutstandingOrSettled='Settled';
} elseif (($OutstandingOrSettled=='Settled' OR $OutstandingOrSettled=='') AND $MyRow['settled']==0) {
- echo '<tr><th colspan="10">' . _('OUTSTANDING TRANSACTIONS') . ' ' . $_POST['TransAfterDate'] . '</th></tr>';
+ echo '<tr><th colspan="11">', _('OUTSTANDING TRANSACTIONS'), ' ', $_POST['TransAfterDate'], '</th><th class="noprint" colspan="4"> </th></tr>';
$OutstandingOrSettled='Outstanding';
}
@@ -291,65 +293,51 @@
if ($MyRow['type']==10) { //its an invoice
echo '<td>', _($MyRow['typename']), '</td>
- <td>', $MyRow['transno'], '</td>
+ <td class="number">', $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">', $MyRow['order_'], '</td>
<td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td>
- <td></td>
+ <td> </td>
<td class="number">', locale_number_format($MyRow['alloc'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['balance'], $CustomerRecord['decimalplaces']), '</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 class="noprint" title="', _('Click to preview the invoice'), '">
+ <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice"><img alt="" src="', $RootPath, '/css/', $Theme, '/images/preview.png" /> ', _('HTML'), '</a>
</td>
- <td>
- <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice&PrintPDF=True">' . _('PDF ') . '
- <img src="', $RootPath, '/css/', $Theme, '/images/pdf.png" title="', _('Click for PDF'), '" alt="" />
- </a>
+ <td class="noprint" title="', _('Click for PDF'), '">
+ <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice&PrintPDF=True"><img alt="" src="', $RootPath, '/css/', $Theme, '/images/pdf.png" /> ', _('PDF'), '</a>
</td>
- <td>
- <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('Email ') . '
- <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the invoice'), '" alt="" />
- </a>
+ <td class="noprint" title="', _('Click to email the invoice'), '">
+ <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice"><img alt="" src="', $RootPath, '/css/', $Theme, '/images/email.png" />', _('Email'), '</a>
</td>
- <td></td>
+ <td class="noprint"> </td>
</tr>';
} elseif ($MyRow['type'] == 11) {
echo '<td>', _($MyRow['typename']), '</td>
- <td>', $MyRow['transno'], '</td>
+ <td class="number">', $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></td>
+ <td class="number">', $MyRow['order_'], '</td>
+ <td> </td>
<td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['alloc'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['balance'], $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 class="noprint" title="', _('Click to preview the credit note'), '">
+ <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit"><img alt="" src="', $RootPath, '/css/', $Theme, '/images/preview.png" />', _('HTML'), '</a>
</td>
- <td>
- <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit&PrintPDF=True">', _('PDF '), '
- <img src="', $RootPath, '/css/', $Theme, '/images/pdf.png" title="', _('Click for PDF'), '" alt="" />
- </a>
+ <td class="noprint" title="', _('Click for PDF'), '">
+ <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit&PrintPDF=True"><img alt="" src="', $RootPath, '/css/', $Theme, '/images/pdf.png" />', _('PDF'), '</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 class="noprint" title="', _('Click to email the credit note'), '">
+ <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit"><img alt="" src="', $RootPath, '/css/', $Theme, '/images/email.png" />', _('Email'), '</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 class="noprint" title="', _('Click to allocate funds'), '">
+ <a href="', $RootPath, '/CustomerAllocations.php?AllocTrans=', $MyRow['id'], '"><img alt="" src="', $RootPath, '/css/', $Theme, '/images/allocation.png" />', _('Allocation'), '</a>
</td>
</tr>';
@@ -358,24 +346,22 @@
* - Is receipt
*/
echo '<td>', _($MyRow['typename']), '</td>
- <td>', $MyRow['transno'], '</td>
+ <td class="number">', $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></td>
+ <td class="number">', $MyRow['order_'], '</td>
+ <td> </td>
<td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['alloc'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['balance'], $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 class="noprint" title="', _('Click to allocate funds'), '">
+ <a href="', $RootPath, '/CustomerAllocations.php?AllocTrans=', $MyRow['id'], '"><img alt="" src="', $RootPath, '/css/', $Theme, '/images/allocation.png" />', _('Allocation'), '</a>
</td>
- <td></td>
- <td></td>
- <td></td>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
</tr>';
} elseif ($MyRow['type'] == 12 and $MyRow['totalamount'] > 0) {
@@ -384,45 +370,43 @@
* - User cannot view GL transactions
*/
echo '<td>', _($MyRow['typename']), '</td>
- <td>', $MyRow['transno'], '</td>
+ <td class="number">', $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">', $MyRow['order_'], '</td>
<td class="number">', locale_number_format($MyRow['totalamount'], $CustomerRecord['decimalplaces']), '</td>
- <td></td>
+ <td> </td>
<td class="number">', locale_number_format($MyRow['alloc'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['balance'], $CustomerRecord['decimalplaces']), '</td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
+ <td class="noprint"> </td>
</tr>';
}
}
//end of while loop
-echo '</table>';
+echo '</tbody></table>
+ <br />
+ <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>
+ <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>
+ </tr>
+ </table>';
-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>';
-
-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>
- </tr>
-</table>';
-
-
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-05-21 16:58:25 UTC (rev 7311)
+++ trunk/doc/Change.log 2015-05-21 21:05:18 UTC (rev 7312)
@@ -1,5 +1,6 @@
webERP Change Log
+21/5/15 RChacon: Adjust CustomerAccount.php for direct printing.
19/5/15 RChacon: Add documentation and help for users in Locations.php and ManualInventory.html.
17/5/15 Version 4.12.3
|
|
From: <dai...@us...> - 2015-05-26 09:43:59
|
Revision: 7313
http://sourceforge.net/p/web-erp/reponame/7313
Author: daintree
Date: 2015-05-26 09:43:57 +0000 (Tue, 26 May 2015)
Log Message:
-----------
Removed SQL outside the loop to avoid unecessary round trips to the SQL server
Modified Paths:
--------------
trunk/SupplierInquiry.php
trunk/doc/Change.log
trunk/doc/Manual/ManualContributors.html
Modified: trunk/SupplierInquiry.php
===================================================================
--- trunk/SupplierInquiry.php 2015-05-21 21:05:18 UTC (rev 7312)
+++ trunk/SupplierInquiry.php 2015-05-26 09:43:57 UTC (rev 7313)
@@ -220,8 +220,16 @@
</tr>
</thead><tbody>';
+$AuthSQL="SELECT offhold
+ FROM purchorderauth
+ WHERE userid='" . $_SESSION['UserID'] . "'
+ AND currabrev='" . $SupplierRecord['currcode']."'";
+$AuthResult=DB_query($AuthSQL);
+$AuthRow=DB_fetch_array($AuthResult);
+
$j = 1;
$k = 0;// Row colour counter.
+
while ($myrow=DB_fetch_array($TransResult)) {
if ($myrow['hold'] == 0 AND $myrow['settled'] == 0) {
@@ -282,15 +290,8 @@
$myrow['transno']);
} else {
- $AuthSQL="SELECT offhold
- FROM purchorderauth
- WHERE userid='" . $_SESSION['UserID'] . "'
- AND currabrev='" . $SupplierRecord['currcode']."'";
- $AuthResult=DB_query($AuthSQL);
- $AuthRow=DB_fetch_array($AuthResult);
-
printf($BaseTD8);
- if ($AuthRow[0]==0) {
+ if ($AuthRow['offhold']==0) {
echo '<td class="noprint"><a href="' .htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?HoldType=' . $myrow['type'] . '&HoldTrans=' . $myrow['transno']. '&HoldStatus=' . $HoldValue . '&FromDate=' . $_POST['TransAfterDate'].'">' . $HoldValue . '</a></td>';
} else {
if ($HoldValue==_('Release')) {
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-05-21 21:05:18 UTC (rev 7312)
+++ trunk/doc/Change.log 2015-05-26 09:43:57 UTC (rev 7313)
@@ -1,5 +1,6 @@
webERP Change Log
+25/5/15 Tom Barry: SupplierInquiry.php moved SQL to get the users authorisation to put supplier invoices on hold outside the loop to avoid unecessary round trips to the SQL server
21/5/15 RChacon: Adjust CustomerAccount.php for direct printing.
19/5/15 RChacon: Add documentation and help for users in Locations.php and ManualInventory.html.
Modified: trunk/doc/Manual/ManualContributors.html
===================================================================
--- trunk/doc/Manual/ManualContributors.html 2015-05-21 21:05:18 UTC (rev 7312)
+++ trunk/doc/Manual/ManualContributors.html 2015-05-26 09:43:57 UTC (rev 7313)
@@ -14,6 +14,8 @@
<br />
Shane Barnaby<br />
<br />
+ Tom Barry<br />
+ <br />
Klaus Beucher<br />
<br />
Chris Bice<br />
|
|
From: <tu...@us...> - 2015-06-05 03:28:29
|
Revision: 7317
http://sourceforge.net/p/web-erp/reponame/7317
Author: turbopt
Date: 2015-06-05 03:28:26 +0000 (Fri, 05 Jun 2015)
Log Message:
-----------
Currencies.php: Add closing select, td and tr tags to complete last table row.
Modified Paths:
--------------
trunk/Currencies.php
trunk/doc/Change.log
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2015-06-04 15:55:47 UTC (rev 7316)
+++ trunk/Currencies.php 2015-06-05 03:28:26 UTC (rev 7317)
@@ -527,7 +527,10 @@
echo '<option value="0">' . _('No') . '</option>';
}
- echo '</table>';
+ echo '</select>
+ </td>
+ </tr>
+ </table>';
echo '<br />
<div class="centre">
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-06-04 15:55:47 UTC (rev 7316)
+++ trunk/doc/Change.log 2015-06-05 03:28:26 UTC (rev 7317)
@@ -1,5 +1,6 @@
webERP Change Log
+04/06/15 TurboPT: Currencies.php: Add closing select, td and tr tags to complete last table row.
27/05/15 Thumb: Fix error_reporting() bug change && to & in install/index.php.
25/5/15 Tom Barry: SupplierInquiry.php moved SQL to get the users authorisation to put supplier invoices on hold outside the loop to avoid unecessary round trips to the SQL server
21/5/15 RChacon: Adjust CustomerAccount.php for direct printing.
|
|
From: <te...@us...> - 2015-06-11 09:49:57
|
Revision: 7319
http://sourceforge.net/p/web-erp/reponame/7319
Author: tehonu
Date: 2015-06-11 09:49:54 +0000 (Thu, 11 Jun 2015)
Log Message:
-----------
Creation of table loctransfercancellations to keep track of cancelled quantities of items in transfers and simplication of code on StocLocTransferReceive.php. More reports on loctransfercancellations will come on the next days.
Modified Paths:
--------------
trunk/StockLocTransferReceive.php
trunk/sql/mysql/upgrade4.12.3-4.13.sql
Modified: trunk/StockLocTransferReceive.php
===================================================================
--- trunk/StockLocTransferReceive.php 2015-06-11 08:13:31 UTC (rev 7318)
+++ trunk/StockLocTransferReceive.php 2015-06-11 09:49:54 UTC (rev 7319)
@@ -67,7 +67,7 @@
$Result = DB_Txn_Begin(); // The Txn should affect the full transfer
foreach ($_SESSION['Transfer']->TransferItem AS $TrfLine) {
- if($TrfLine->Quantity >0) {
+ if($TrfLine->Quantity >= 0) {
/* Need to get the current location quantity will need it later for the stock movement */
$SQL="SELECT locstock.quantity
@@ -393,6 +393,7 @@
prnMsg(_('A stock transfer for item code'). ' - ' . $TrfLine->StockID . ' ' . $TrfLine->ItemDescription . ' '. _('has been created from').' ' . $_SESSION['Transfer']->StockLocationFromName . ' '. _('to'). ' ' . $_SESSION['Transfer']->StockLocationToName . ' ' . _('for a quantity of'). ' '. $TrfLine->Quantity,'success');
if($TrfLine->CancelBalance==1) {
+ RecordItemCancelledInTransfer($_SESSION['Transfer']->TrfID, $TrfLine->StockID, $TrfLine->Quantity);
$sql = "UPDATE loctransfers SET recqty = recqty + '". round($TrfLine->Quantity, $TrfLine->DecimalPlaces) . "',
shipqty = recqty + '". round($TrfLine->Quantity, $TrfLine->DecimalPlaces) . "',
recdate = '".Date('Y-m-d H:i:s'). "'
@@ -408,13 +409,8 @@
$Result = DB_query($sql, $ErrMsg, $DbgMsg, true);
unset ($_SESSION['Transfer']->LineItem[$i]);
unset ($_POST['Qty' . $i]);
- } /*end if Quantity > 0 */
+ } /*end if Quantity >= 0 */
if($TrfLine->CancelBalance==1) {
- $sql = "UPDATE loctransfers SET shipqty = recqty
- WHERE reference = '". $_SESSION['Transfer']->TrfID . "'
- AND stockid = '". $TrfLine->StockID."'";
- $ErrMsg = _('CRITICAL ERROR') . '! ' . _('Unable to set the quantity received to the quantity shipped to cancel the balance on this transfer line');
- $Result = DB_query($sql, $ErrMsg, $DbgMsg, true);
// send an email to the inventory manager about this cancellation (as can lead to employee fraud)
if($_SESSION['InventoryManagerEmail']!='') {
$ConfirmationText = _('Cancelled balance of transfer'). ': ' . $_SESSION['Transfer']->TrfID .
@@ -686,4 +682,25 @@
</form>';
}
include('includes/footer.inc');
+
+function RecordItemCancelledInTransfer($TransferReference, $StockID, $CancelQty){
+ $SQL = "INSERT INTO loctransfercancellations (
+ reference,
+ stockid,
+ cancelqty,
+ canceldate,
+ canceluserid)
+ VALUES ('" . $TransferReference . "',
+ '" . $StockID . "',
+ (SELECT (l2.shipqty-l2.recqty)
+ FROM loctransfers AS l2
+ WHERE l2.reference = '" . $TransferReference . "'
+ AND l2.stockid ='" . $StockID . "') - " . $CancelQty . ",
+ '" . Date('Y-m-d H:i:s') . "',
+ '" . $_SESSION['UserID'] . "')";
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The transfer cancellation record could not be inserted because');
+ $DbgMsg = _('The following SQL to insert records was used');
+ $Result = DB_query($SQL, $ErrMsg, $DbgMsg, true);
+
+}
?>
\ No newline at end of file
Modified: trunk/sql/mysql/upgrade4.12.3-4.13.sql
===================================================================
--- trunk/sql/mysql/upgrade4.12.3-4.13.sql 2015-06-11 08:13:31 UTC (rev 7318)
+++ trunk/sql/mysql/upgrade4.12.3-4.13.sql 2015-06-11 09:49:54 UTC (rev 7319)
@@ -1,4 +1,11 @@
+CREATE TABLE `loctransfercancellations` (
+ `reference` INT(11) NOT NULL ,
+ `stockid` VARCHAR(20) NOT NULL ,
+ `cancelqty` DOUBLE NOT NULL ,
+ `canceldate` DATETIME NOT NULL ,
+ `canceluserid` VARCHAR(20) NOT NULL ) ENGINE = InnoDB;
+ALTER TABLE `loctransfercancellations` ADD INDEX `Index1` (`reference`, `stockid`) COMMENT '';
+ALTER TABLE `loctransfercancellations` ADD INDEX `Index2` (`canceldate`, `reference`, `stockid`) COMMENT '';
-
-- Update version number:
UPDATE config SET confvalue='4.13' WHERE confname='VersionNumber';
|
|
From: <rc...@us...> - 2015-06-20 14:49:59
|
Revision: 7324
http://sourceforge.net/p/web-erp/reponame/7324
Author: rchacon
Date: 2015-06-20 14:49:56 +0000 (Sat, 20 Jun 2015)
Log Message:
-----------
Add meta tag to keep relationship between CSS pixels and device pixels.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/header.inc
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-06-19 11:43:05 UTC (rev 7323)
+++ trunk/doc/Change.log 2015-06-20 14:49:56 UTC (rev 7324)
@@ -1,9 +1,10 @@
webERP Change Log
+20/06/15 RChacon: In header.inc, add meta tag to keep relationship between CSS pixels and device pixels.
19/06/15 : Kif (from webERP Chinese Community QQ group) fixed the menu cannot show completely on mobile phone in xenos/default.css.
04/06/15 TurboPT: Currencies.php: Add closing select, td and tr tags to complete last table row.
27/05/15 Thumb: Fix error_reporting() bug change && to & in install/index.php.
-25/5/15 Tom Barry: SupplierInquiry.php moved SQL to get the users authorisation to put supplier invoices on hold outside the loop to avoid unecessary round trips to the SQL server
+25/5/15 Tom Barry: SupplierInquiry.php moved SQL to get the users authorisation to put supplier invoices on hold outside the loop to avoid unecessary round trips to the SQL server
21/5/15 RChacon: Adjust CustomerAccount.php for direct printing.
19/5/15 RChacon: Add documentation and help for users in Locations.php and ManualInventory.html.
Modified: trunk/includes/header.inc
===================================================================
--- trunk/includes/header.inc 2015-06-19 11:43:05 UTC (rev 7323)
+++ trunk/includes/header.inc 2015-06-20 14:49:56 UTC (rev 7324)
@@ -3,8 +3,8 @@
// Titles and screen header
// Needs the file config.php loaded where the variables are defined for
- // $RootPath
- // $Title - should be defined in the page this file is included with
+ // $RootPath
+ // $Title - should be defined in the page this file is included with
if (!isset($RootPath)){
$RootPath = dirname(htmlspecialchars($_SERVER['PHP_SELF']));
if ($RootPath == '/' OR $RootPath == "\\") {
@@ -26,32 +26,31 @@
if($Title == _('Copy a BOM to New Item Code')){//solve the cannot modify heaer information in CopyBOM.php scritps
ob_start();
}
- echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
+ echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
+ '<html xmlns="http://www.w3.org/1999/xhtml">',
- echo '<html xmlns="http://www.w3.org/1999/xhtml"><head><title>' . $Title . '</title>';
- echo '<link rel="shortcut icon" href="'. $RootPath.'/favicon.ico" />';
- echo '<link rel="icon" href="' . $RootPath.'/favicon.ico" />';
+ '<head>',
+ '<link rel="icon" href="', $RootPath, '/favicon.ico" />',
+ '<link rel="shortcut icon" href="', $RootPath, '/favicon.ico" />';
if ($StrictXHTML) {
echo '<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />';
} else {
echo '<meta http-equiv="Content-Type" content="application/html; charset=utf-8" />';
}
- echo '<link href="' . $RootPath . '/css/print.css" rel="stylesheet" type="text/css" media="print" />';
- echo '<link href="' . $RootPath . '/css/'. $_SESSION['Theme'] .'/default.css" rel="stylesheet" type="text/css" media="screen"/>';
- echo '<script type="text/javascript" src = "'.$RootPath.'/javascripts/MiscFunctions.js"></script>';
- echo '</head>';
- echo '<body>';
+ echo '<link href="', $RootPath, '/css/print.css" rel="stylesheet" type="text/css" media="print" />',
+ '<link href="', $RootPath, '/css/', $_SESSION['Theme'], '/default.css" rel="stylesheet" type="text/css" media="screen"/>',
+/* '<meta name="viewport" content="width=device-width, initial-scale=1">',//To tell the small device that the website is a responsive site (keep relationship between CSS pixels and device pixels).*/
+ '<script type="text/javascript" src="', $RootPath, '/javascripts/MiscFunctions.js"></script>',
+ '<title>', $Title, '</title>',
+ '</head>',
- echo '<div id="CanvasDiv">';
- echo '<input type="hidden" name="Lang" id="Lang" value="'.$Lang.'" />';
- echo '<div id="HeaderDiv">';
- echo '<div id="HeaderWrapDiv">';
+ '<body>',
+ '<div id="CanvasDiv">',
+ '<input type="hidden" name="Lang" id="Lang" value="', $Lang, '" />',
+ '<div id="HeaderDiv">',
+ '<div id="HeaderWrapDiv">';
-
if (isset($Title)) {
-
-
echo '<div id="AppInfoDiv">'; //===HJ===
echo '<div id="AppInfoCompanyDiv">';
echo '<img alt="'._('Company').'" src="'.$RootPath.'/css/'.$Theme.'/images/company.png" title="'._('Company').'" />' . stripslashes($_SESSION['CompanyRecord']['coyname']);
@@ -92,9 +91,9 @@
echo '</ul></div>'; // QuickMenuDiv
}
- echo '</div>'; // HeaderWrapDiv
- echo '</div>'; // Headerdiv
- echo '<div id="BodyDiv">';
- echo '<div id="BodyWrapDiv">';
+ echo '</div>',// Close HeaderWrapDiv
+ '</div>',// Close Headerdiv
+ '<div id="BodyDiv">',
+ '<div id="BodyWrapDiv">';
-?>
\ No newline at end of file
+?>
|
|
From: <dai...@us...> - 2015-06-28 01:09:02
|
Revision: 7326
http://sourceforge.net/p/web-erp/reponame/7326
Author: daintree
Date: 2015-06-28 01:09:00 +0000 (Sun, 28 Jun 2015)
Log Message:
-----------
added narrative to explain the SessionSavePath config.php parameter
Modified Paths:
--------------
trunk/config.distrib.php
trunk/doc/Manual/ManualGettingStarted.html
Modified: trunk/config.distrib.php
===================================================================
--- trunk/config.distrib.php 2015-06-25 13:54:40 UTC (rev 7325)
+++ trunk/config.distrib.php 2015-06-28 01:09:00 UTC (rev 7326)
@@ -74,8 +74,10 @@
//The maximum time that a script can execute for before the web-server should terminate it
$MaximumExecutionTime =120;
-//The path to which session files should be stored in the server - useful for some multi-host web servers
-//this can be left commented out
+/*The path to which session files should be stored in the server - useful for some multi-host web servers where pages are serviced using load balancing servers - when the load picks a different server then the session can be lost unless this option is used - which tells the server explicitly where to find the session file.
+It is also useful where there are several webERP installs where the code is in two different paths on the same server and being used by the same client browser. It is possible in this scenario for the session to be over-written by the two different webERP installations. The solution is to specify different $SessionSavePath in each installations config.php
+If there is only one installation of webERP on the web-server - which can be used with many company databases (and there is no load balancing difficulties to circumvent then this can be left commented out
+*/
//$SessionSavePath = '/tmp';
//Setting to 12 or 24 determines the format of the clock display at the end of all screens
Modified: trunk/doc/Manual/ManualGettingStarted.html
===================================================================
--- trunk/doc/Manual/ManualGettingStarted.html 2015-06-25 13:54:40 UTC (rev 7325)
+++ trunk/doc/Manual/ManualGettingStarted.html 2015-06-28 01:09:00 UTC (rev 7326)
@@ -236,8 +236,12 @@
//The maximum time that a script can execute for before the web-server should terminate it
$MaximumExecutionTime =120;
- //The path to which session files should be stored in the server - useful for some multi-host web servers
- //this can be left commented out
+ /*The path to which session files should be stored in the server - useful for some multi-host web servers where pages are serviced using load balancing servers - when the load picks a different server then the session can be lost unless this option is used - which tells the server explicitly where to find the session file.
+ It is also useful where there are several webERP installs where the code is in two different paths on the same server and being used by the same client browser. It is possible in this scenario for the session to be over-written by the two different webERP installations. The solution is to specify different $SessionSavePath in each installations config.php
+
+ If there is only one installation of webERP on the web-server - which can be used with many company databases (and there is no load balancing difficulties to circumvent then this can be left commented out
+
+ */
//$SessionSavePath = '/tmp';
// which encryption function should be used
|
|
From: <rc...@us...> - 2015-07-27 16:52:56
|
Revision: 7328
http://sourceforge.net/p/web-erp/reponame/7328
Author: rchacon
Date: 2015-07-27 16:52:54 +0000 (Mon, 27 Jul 2015)
Log Message:
-----------
In Payments.php, move currency tags near currency rates.
Modified Paths:
--------------
trunk/Payments.php
trunk/doc/Change.log
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2015-07-26 00:38:24 UTC (rev 7327)
+++ trunk/Payments.php 2015-07-27 16:52:54 UTC (rev 7328)
@@ -1,6 +1,6 @@
<?php
-
/* $Id$*/
+/* Entry of bank account payments either against an AP account or a general ledger payment - if the AP-GL link in company preferences is set */
include('includes/DefinePaymentClass.php');
include('includes/session.inc');
@@ -488,7 +488,7 @@
$DbgMsg = _('Cannot update the supplier record for the date of the last payment made using the SQL');
$result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
- $_SESSION['PaymentDetail' . $identifier]->Narrative = $_SESSION['PaymentDetail' . $identifier]->SupplierID . '-' . $_SESSION['PaymentDetail' . $identifier]->Narrative;
+ $_SESSION['PaymentDetail' . $identifier]->Narrative = $_SESSION['PaymentDetail' . $identifier]->SupplierID . ' - ' . $_SESSION['PaymentDetail' . $identifier]->Narrative;
if ($_SESSION['CompanyRecord']['gllink_creditors']==1){ /* then do the supplier control GLTrans */
/* Now debit creditors account with payment + discount */
@@ -860,39 +860,39 @@
if (!isset($_POST['FunctionalExRate'])){
$_POST['FunctionalExRate']=1;
}
-if ($_SESSION['PaymentDetail' . $identifier]->AccountCurrency!=$_SESSION['PaymentDetail' . $identifier]->Currency AND isset($_SESSION['PaymentDetail' . $identifier]->AccountCurrency)){
- if (isset($SuggestedExRate)){
- $SuggestedExRateText = '<b>' . _('Suggested rate:') . ' ' . locale_number_format($SuggestedExRate,8) . '</b>';
- } else {
- $SuggestedExRateText ='';
- }
- if ($_POST['ExRate']==1 AND isset($SuggestedExRate)){
+if($_SESSION['PaymentDetail' . $identifier]->AccountCurrency != $_SESSION['PaymentDetail' . $identifier]->Currency AND isset($_SESSION['PaymentDetail' . $identifier]->AccountCurrency)) {
+ if($_POST['ExRate']==1 AND isset($SuggestedExRate)) {
$_POST['ExRate'] = locale_number_format($SuggestedExRate,8);
- }elseif($_POST['Currency'] != $_POST['PreviousCurrency'] and isset($SuggestedExRate)){
+ } elseif($_POST['Currency'] != $_POST['PreviousCurrency'] AND isset($SuggestedExRate)) {
$_POST['ExRate'] = locale_number_format($SuggestedExRate,8);
+ }
+ if(isset($SuggestedExRate)) {
+ $SuggestedExRateText = '<b>' . _('Suggested rate:') . ' 1 ' . $_SESSION['PaymentDetail' . $identifier]->AccountCurrency . ' = ' . locale_number_format($SuggestedExRate,8) . ' ' . $_SESSION['PaymentDetail' . $identifier]->Currency . '</b>';
+ } else {
+ $SuggestedExRateText = '1 ' . $_SESSION['PaymentDetail' . $identifier]->AccountCurrency . ' = ? ' . $_SESSION['PaymentDetail' . $identifier]->Currency;
}
echo '<tr>
- <td>' . _('Payment Exchange Rate') . ':</td>
- <td><input class="number" maxlength="12" name="ExRate" size="14" title="' . _('The exchange rate between the currency of the bank account currency and the currency of the payment') . '" type="text" value="' . $_POST['ExRate'] . '" /></td>
- <td>' . $SuggestedExRateText . ' <i>' . _('The exchange rate between the currency of the bank account currency and the currency of the payment') . '. 1 ' . $_SESSION['PaymentDetail' . $identifier]->AccountCurrency . ' = ? ' . $_SESSION['PaymentDetail' . $identifier]->Currency . '</i></td>
+ <td>', _('Payment Exchange Rate'), ':</td>
+ <td><input class="number" maxlength="12" name="ExRate" size="14" title="', _('The exchange rate between the currency of the bank account currency and the currency of the payment'), '" type="text" value="', $_POST['ExRate'], '" /></td>
+ <td>', $SuggestedExRateText, '. <i>', _('The exchange rate between the currency of the bank account currency and the currency of the payment'), '.</i></td>
</tr>';
}
-if ($_SESSION['PaymentDetail' . $identifier]->AccountCurrency!=$_SESSION['CompanyRecord']['currencydefault']
- AND isset($_SESSION['PaymentDetail' . $identifier]->AccountCurrency)){
- if (isset($SuggestedFunctionalExRate)){
- $SuggestedFunctionalExRateText = '<b>' . _('Suggested rate:') . ' ' . locale_number_format($SuggestedFunctionalExRate,8) . '</b>';
+if($_SESSION['PaymentDetail' . $identifier]->AccountCurrency != $_SESSION['CompanyRecord']['currencydefault'] AND isset($_SESSION['PaymentDetail' . $identifier]->AccountCurrency)) {
+ if($_POST['FunctionalExRate']==1 AND isset($SuggestedFunctionalExRate)) {
+ $_POST['FunctionalExRate'] = locale_number_format($SuggestedFunctionalExRate,'Variable');
+ }
+
+ if(isset($SuggestedFunctionalExRate)) {
+ $SuggestedFunctionalExRateText = '<b>' . _('Suggested rate:') . ' 1 ' . $_SESSION['CompanyRecord']['currencydefault'] . ' = ' . locale_number_format($SuggestedFunctionalExRate,8) . ' ' . $_SESSION['PaymentDetail' . $identifier]->AccountCurrency . '</b>';
} else {
- $SuggestedFunctionalExRateText ='';
+ $SuggestedFunctionalExRateText = '1 ' . $_SESSION['CompanyRecord']['currencydefault'] . ' = ? ' . $_SESSION['PaymentDetail' . $identifier]->AccountCurrency;
}
- if ($_POST['FunctionalExRate']==1 AND isset($SuggestedFunctionalExRate)){
- $_POST['FunctionalExRate'] = locale_number_format($SuggestedFunctionalExRate,'Variable');
- }
echo '<tr>
- <td>' . _('Functional Exchange Rate') . ':</td>
- <td><input class="number" maxlength="12" name="FunctionalExRate" size="14" title="' . _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account') . '" type="text" value="' . $_POST['FunctionalExRate'] . '" /></td>
- <td>' . ' ' . $SuggestedFunctionalExRateText . ' <i>' . _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account') . '. 1 ' . $_SESSION['CompanyRecord']['currencydefault'] . ' = ? ' . $_SESSION['PaymentDetail' . $identifier]->AccountCurrency . '</i></td>
+ <td>', _('Functional Exchange Rate'), ':</td>
+ <td><input class="number" maxlength="12" name="FunctionalExRate" size="14" title="', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'), '" type="text" value="', $_POST['FunctionalExRate'], '" /></td>
+ <td>', $SuggestedFunctionalExRateText, '. <i>', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'), '.</i></td>
</tr>';
}
echo '<tr>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-07-26 00:38:24 UTC (rev 7327)
+++ trunk/doc/Change.log 2015-07-27 16:52:54 UTC (rev 7328)
@@ -1,5 +1,6 @@
webERP Change Log
+27/07/15 RChacon: In Payments.php, move currency tags near currency rates.
20/06/15 RChacon: In header.inc, add meta tag to keep relationship between CSS pixels and device pixels.
19/06/15 : Kif (from webERP Chinese Community QQ group) fixed the menu cannot show completely on mobile phone in xenos/default.css.
04/06/15 TurboPT: Currencies.php: Add closing select, td and tr tags to complete last table row.
|
|
From: <rc...@us...> - 2015-08-02 16:54:28
|
Revision: 7331
http://sourceforge.net/p/web-erp/reponame/7331
Author: rchacon
Date: 2015-08-02 16:54:25 +0000 (Sun, 02 Aug 2015)
Log Message:
-----------
In CustomerReceipt.php, move currency tags near currency ratesand other minor changes.
Modified Paths:
--------------
trunk/CustomerReceipt.php
trunk/doc/Change.log
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2015-08-02 14:56:38 UTC (rev 7330)
+++ trunk/CustomerReceipt.php 2015-08-02 16:54:25 UTC (rev 7331)
@@ -1,6 +1,6 @@
<?php
-
/* $Id$ */
+/* Entry of both customer receipts against accounts receivable and also general ledger or nominal receipts */
include('includes/DefineReceiptClass.php');
include('includes/session.inc');
@@ -869,38 +869,36 @@
if (!isset($_SESSION['ReceiptBatch']->FunctionalExRate)){
$_SESSION['ReceiptBatch']->FunctionalExRate=1;
}
-if ($_SESSION['ReceiptBatch']->AccountCurrency!=$_SESSION['ReceiptBatch']->Currency AND isset($_SESSION['ReceiptBatch']->AccountCurrency)){
- if (isset($SuggestedExRate)){
- $SuggestedExRateText = '<b>' . _('Suggested rate:') . ' ' . locale_number_format($SuggestedExRate,8) . '</b>';
- } else {
- $SuggestedExRateText ='';
- }
- if ($_SESSION['ReceiptBatch']->ExRate==1 AND isset($SuggestedExRate)){
+if($_SESSION['ReceiptBatch']->AccountCurrency != $_SESSION['ReceiptBatch']->Currency AND isset($_SESSION['ReceiptBatch']->AccountCurrency)) {
+ if($_SESSION['ReceiptBatch']->ExRate==1 AND isset($SuggestedExRate)) {
$_SESSION['ReceiptBatch']->ExRate = $SuggestedExRate;
- }elseif($_POST['Currency'] != $_POST['PreviousCurrency'] AND isset($SuggestedExRate)){//the user has changed the currency, then we should revise suggested rate
+ } elseif($_POST['Currency'] != $_POST['PreviousCurrency'] AND isset($SuggestedExRate)) {//the user has changed the currency, then we should revise suggested rate
$_SESSION['ReceiptBatch']->ExRate = $SuggestedExRate;
}
+
+ if(isset($SuggestedExRate)) {
+ $SuggestedExRateText = '<b>' . _('Suggested rate:') . ' 1 ' . $_SESSION['ReceiptBatch']->AccountCurrency . ' = ' . locale_number_format($SuggestedExRate,8) . ' ' . $_SESSION['ReceiptBatch']->Currency . '</b>';
+ } else {
+ $SuggestedExRateText = '<b>1 ' . $_SESSION['ReceiptBatch']->AccountCurrency . ' = ? ' . $_SESSION['ReceiptBatch']->Currency . '</b>';
+ }
echo '<tr>
- <td>' . _('Receipt Exchange Rate') . ':</td>
- <td><input class="number" maxlength="12" name="ExRate" required="required" size="14" tabindex="4" type="text" value="' . locale_number_format($_SESSION['ReceiptBatch']->ExRate,8) . '" /></td>
- <td>' . $SuggestedExRateText . ' <i>' . _('The exchange rate between the currency of the bank account currency and the currency of the receipt') . '. 1 ' . $_SESSION['ReceiptBatch']->AccountCurrency . ' = ? ' . $_SESSION['ReceiptBatch']->Currency . '</i></td>
+ <td>', _('Receipt Exchange Rate'), ':</td>
+ <td><input class="number" maxlength="12" name="ExRate" required="required" size="14" tabindex="4" type="text" value="', locale_number_format($_SESSION['ReceiptBatch']->ExRate,8), '" /> ', $SuggestedExRateText, ' <i>', _('The exchange rate between the currency of the bank account currency and the currency of the receipt'), '.</i></td>
</tr>';
}
-if ($_SESSION['ReceiptBatch']->AccountCurrency!=$_SESSION['CompanyRecord']['currencydefault']
- AND isset($_SESSION['ReceiptBatch']->AccountCurrency)){
- if (isset($SuggestedFunctionalExRate)){
- $SuggestedFunctionalExRateText = '<b>' . _('Suggested rate:') . ' ' . locale_number_format($SuggestedFunctionalExRate,8) . '</b>';
+if($_SESSION['ReceiptBatch']->AccountCurrency != $_SESSION['CompanyRecord']['currencydefault'] AND isset($_SESSION['ReceiptBatch']->AccountCurrency)) {
+ if($_SESSION['ReceiptBatch']->FunctionalExRate==1 AND isset($SuggestedFunctionalExRate)) {
+ $_SESSION['ReceiptBatch']->FunctionalExRate = $SuggestedFunctionalExRate;
+ }
+ if(isset($SuggestedFunctionalExRate)) {
+ $SuggestedFunctionalExRateText = '<b>' . _('Suggested rate:') . ' 1 ' . $_SESSION['CompanyRecord']['currencydefault'] . ' = ' . locale_number_format($SuggestedFunctionalExRate,8) . ' ' . $_SESSION['ReceiptBatch']->AccountCurrency . '</b>';
} else {
- $SuggestedFunctionalExRateText ='';
+ $SuggestedFunctionalExRateText = '<b>1 ' . $_SESSION['CompanyRecord']['currencydefault'] . ' = ? ' . $_SESSION['ReceiptBatch']->AccountCurrency . '</b>';
}
- if ($_SESSION['ReceiptBatch']->FunctionalExRate==1 AND isset($SuggestedFunctionalExRate)){
- $_SESSION['ReceiptBatch']->FunctionalExRate = $SuggestedFunctionalExRate;
- }
echo '<tr>
- <td>' . _('Functional Exchange Rate') . ':</td>
- <td><input class="number" maxlength="12" name="FunctionalExRate" pattern="[0-9\.,]*" required="required" size="14" tabindex="5" type="text" value="' . locale_number_format($_SESSION['ReceiptBatch']->FunctionalExRate,8) . '" /></td>
- <td>' . ' ' . $SuggestedFunctionalExRateText . ' <i>' . _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account') . '. 1 ' . $_SESSION['CompanyRecord']['currencydefault'] . ' = ? ' . $_SESSION['ReceiptBatch']->AccountCurrency . '</i></td>
+ <td>', _('Functional Exchange Rate'), ':</td>
+ <td><input class="number" maxlength="12" name="FunctionalExRate" pattern="[0-9\.,]*" required="required" size="14" tabindex="5" type="text" value="', locale_number_format($_SESSION['ReceiptBatch']->FunctionalExRate,8), '" /> ', $SuggestedFunctionalExRateText, ' <i>', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'), '.</i></td>
</tr>';
}
@@ -927,8 +925,8 @@
$_SESSION['ReceiptBatch']->BankTransRef='';
}
echo '<tr>
- <td>' . _('Reference') . ':</td>
- <td><input tabindex="7" type="text" name="BankTransRef" maxlength="50" size="52" value="' . $_SESSION['ReceiptBatch']->BankTransRef . '" /> ' . _('Reference on Bank Transactions Inquiry') . '</td>
+ <td>', _('Reference'), ':</td>
+ <td><input maxlength="50" name="BankTransRef" size="52" tabindex="7" type="text" value="', $_SESSION['ReceiptBatch']->BankTransRef,'" /> <i>', _('Reference on Bank Transactions Inquiry'), '.</i></td>
</tr>';
/* Receipt (Bank Account) info to be inserted on gltrans.narrative, varchar(200). */
@@ -939,14 +937,14 @@
$_POST['Currency'] = $_SESSION['CompanyRecord']['currencydefault'];
}
echo '<tr>
- <td>' . _('Narrative') . ':</td>
- <td><input tabindex="8" type="text" name="BatchNarrative" maxlength="200" size="52" value="' . $_SESSION['ReceiptBatch']->Narrative . '" /> ' . _('Narrative on General Ledger Account Inquiry') . '</td>
+ <td>', _('Narrative'), ':</td>
+ <td><input maxlength="200" name="BatchNarrative" size="52" tabindex="8" type="text" value="', $_SESSION['ReceiptBatch']->Narrative, '" /> <i>', _('Narrative on General Ledger Account Inquiry'), '.</i></td>
</tr>
- <input type="hidden" name="PreviousCurrency" value="' . $_POST['Currency'] . '" />
+ <input name="PreviousCurrency" type="hidden" value="', $_POST['Currency'], '" />
<tr>
<td colspan="3">
<div class="centre">
- <input tabindex="9" type="submit" name="BatchInput" value="' . _('Accept') . '" />
+ <input name="BatchInput" tabindex="9" type="submit" value="', _('Accept'), '" />
</div>
</td>
</tr>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-08-02 14:56:38 UTC (rev 7330)
+++ trunk/doc/Change.log 2015-08-02 16:54:25 UTC (rev 7331)
@@ -1,5 +1,6 @@
webERP Change Log
+02/08/15 RChacon: In CustomerReceipt.php, move currency tags near currency ratesand other minor changes.
27/07/15 RChacon: In Payments.php, move currency tags near currency rates.
20/06/15 RChacon: In header.inc, add meta tag to keep relationship between CSS pixels and device pixels.
19/06/15 : Kif (from webERP Chinese Community QQ group) fixed the menu cannot show completely on mobile phone in xenos/default.css.
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-08-02 14:56:38 UTC (rev 7330)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-08-02 16:54:25 UTC (rev 7331)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-05-17 13:40+1200\n"
-"PO-Revision-Date: 2015-08-02 08:50-0600\n"
+"PO-Revision-Date: 2015-08-02 10:39-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -9750,7 +9750,7 @@
#: CustomerReceipt.php:931 Payments.php:930
msgid "Reference on Bank Transactions Inquiry"
-msgstr "Referencia en la consulta de transacciones bancarias "
+msgstr "Referencia en la consulta de transacciones bancarias"
#: CustomerReceipt.php:943 Payments.php:938
msgid "Narrative on General Ledger Account Inquiry"
@@ -19911,7 +19911,7 @@
#: PcTabs.php:118
msgid " already exists"
-msgstr " already exists"
+msgstr " ya existe"
#: PcTabs.php:166
msgid "The Tab record could not be deleted because"
|
|
From: <rc...@us...> - 2015-08-04 03:27:53
|
Revision: 7332
http://sourceforge.net/p/web-erp/reponame/7332
Author: rchacon
Date: 2015-08-04 03:27:51 +0000 (Tue, 04 Aug 2015)
Log Message:
-----------
Add new script AnalysisHorizontalPosition.php to generate an horizontal analysis of the statement of financial position.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/sql/mysql/upgrade4.12.3-4.13.sql
Added Paths:
-----------
trunk/AnalysisHorizontalPosition.php
Added: trunk/AnalysisHorizontalPosition.php
===================================================================
--- trunk/AnalysisHorizontalPosition.php (rev 0)
+++ trunk/AnalysisHorizontalPosition.php 2015-08-04 03:27:51 UTC (rev 7332)
@@ -0,0 +1,422 @@
+<?php
+/* $Id: AnalysisHorizontalPosition.php 7268 2015-04-19 14:57:47Z rchacon $*/
+/* Horizontal analysis of statement of financial position. */
+
+function RelativeVariation($CurrentPeriod, $PreviousPeriod) {
+ // Calculates the relative variation between current and previous periods. Uses percent in locale number format.
+ if($PreviousPeriod<>0) {
+ return locale_number_format(($CurrentPeriod-$PreviousPeriod)*100/$PreviousPeriod,$_SESSION['CompanyRecord']['decimalplaces']) . '%';
+ } else {
+ return _('N/A');
+ }
+}
+
+include ('includes/session.inc');
+$Title = _('Horizontal Analysis of Statement of Financial Position');// Screen identification.
+$ViewTopic = 'GeneralLedger';// Filename's id in ManualContents.php's TOC.
+$BookMark = 'AnalysisHorizontalPosition';// Anchor's id in the manual's html document.
+include('includes/SQL_CommonFunctions.inc');
+include('includes/AccountSectionsDef.inc'); // This loads the $Sections variable
+
+if(! isset($_POST['BalancePeriodEnd']) or isset($_POST['SelectADifferentPeriod'])) {
+
+ /*Show a form to allow input of criteria for TB to show */
+ include('includes/header.inc');
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/printer.png" title="', // Icon image.
+ _('Print Horizontal analysis of statement of financial position'), '" /> ', // Icon title.
+ _('Horizontal Analysis of Statement of Financial Position'), '</p>';// Page title.
+
+ echo '<div class="page_help_text">',
+ _('Horizontal analysis (also known as trend analysis) is a financial statement analysis technique that shows changes in the amounts of corresponding financial statement items over a period of time. It is a useful tool to evaluate trend situations.'), '<br />',
+ _('The statements for two periods are used in horizontal analysis. The earliest period is used as the base period. The items on the later statement are compared with items on the statement of the base period. The changes are shown both in currency (absolute variation) and percentage (relative variation).'), '<br />',
+ _('webERP is an "accrual" based system (not a "cash based" system). Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.'), '</div>',
+ '<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '">',
+ '<input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />',
+ '<table class="selection">
+ <tr>
+ <td>', _('Select the balance date'), ':</td>
+ <td><select required="required" name="BalancePeriodEnd">';
+
+ $periodno=GetPeriod(Date($_SESSION['DefaultDateFormat']), $db);
+ $sql = "SELECT lastdate_in_period FROM periods WHERE periodno='".$periodno . "'";
+ $result = DB_query($sql);
+ $myrow=DB_fetch_array($result, $db);
+ $lastdate_in_period=$myrow[0];
+
+ $sql = "SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno DESC";
+ $Periods = DB_query($sql);
+
+ while($myrow=DB_fetch_array($Periods,$db)) {
+ if( $myrow['periodno']== $periodno) {
+ echo '<option selected="selected" value="', $myrow['periodno'], '">', ConvertSQLDate($lastdate_in_period), '</option>';
+ } else {
+ echo '<option value="', $myrow['periodno'], '">', ConvertSQLDate($myrow['lastdate_in_period']), '</option>';
+ }
+ }
+ echo '</select></td>
+ </tr>
+ <tr>
+ <td>', _('Detail or summary'), ':</td>
+ <td><select name="Detail" required="required" title="', _('Selecting Summary will show on the totals at the account group level'), '" >
+ <option value="Summary">', _('Summary'), '</option>
+ <option selected="selected" value="Detailed">', _('All Accounts'), '</option>
+ </select></td>
+ </tr>
+ <tr>
+ <td>', _('Show all accounts including zero balances'), '</td>
+ <td><input name="ShowZeroBalances" title="', _('Check this box to display all accounts including those accounts with no balance'), '" type="checkbox" /></td>
+ </tr>
+ </table>
+ <br />', // Form buttons:
+ '<div class="centre noprint">',
+ '<button name="ShowBalanceSheet" type="submit" value="', _('Show on Screen (HTML)'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/gl.png" /> ', _('Show on Screen (HTML)'), '</button> ', // "Show on Screen (HTML)" button.
+ '<button formaction="index.php?Application=GL" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/previous.png" /> ', _('Return'), '</button>', // "Return" button.
+ '</div>',
+ '</form>';
+
+ /*Now do the posting while the user is thinking about the period to select */
+ include ('includes/GLPostings.inc');
+
+} else {
+ include('includes/header.inc');
+
+ $RetainedEarningsAct = $_SESSION['CompanyRecord']['retainedearnings'];
+
+ $sql = "SELECT lastdate_in_period FROM periods WHERE periodno='" . $_POST['BalancePeriodEnd'] . "'";
+ $PrdResult = DB_query($sql);
+ $myrow = DB_fetch_row($PrdResult);
+ $BalanceDate = ConvertSQLDate($myrow[0]);
+
+ // Calculate B/Fwd retained earnings:
+ $SQL = "SELECT Sum(CASE WHEN chartdetails.period='" . $_POST['BalancePeriodEnd'] . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS accumprofitbfwd,
+ Sum(CASE WHEN chartdetails.period='" . ($_POST['BalancePeriodEnd'] - 12) . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lyaccumprofitbfwd
+ FROM chartmaster INNER JOIN accountgroups
+ ON chartmaster.group_ = accountgroups.groupname INNER JOIN chartdetails
+ ON chartmaster.accountcode= chartdetails.accountcode
+ WHERE accountgroups.pandl=1";
+
+ $AccumProfitResult = DB_query($SQL,_('The accumulated profits brought forward could not be calculated by the SQL because'));
+
+ $AccumProfitRow = DB_fetch_array($AccumProfitResult); /*should only be one row returned */
+
+ $SQL = "SELECT accountgroups.sectioninaccounts,
+ accountgroups.groupname,
+ accountgroups.parentgroupname,
+ chartdetails.accountcode,
+ chartmaster.accountname,
+ Sum(CASE WHEN chartdetails.period='" . $_POST['BalancePeriodEnd'] . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS balancecfwd,
+ Sum(CASE WHEN chartdetails.period='" . ($_POST['BalancePeriodEnd'] - 12) . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lybalancecfwd
+ FROM chartmaster INNER JOIN accountgroups
+ ON chartmaster.group_ = accountgroups.groupname INNER JOIN chartdetails
+ ON chartmaster.accountcode= chartdetails.accountcode
+ WHERE accountgroups.pandl=0
+ GROUP BY accountgroups.groupname,
+ chartdetails.accountcode,
+ chartmaster.accountname,
+ accountgroups.parentgroupname,
+ accountgroups.sequenceintb,
+ accountgroups.sectioninaccounts
+ ORDER BY accountgroups.sectioninaccounts,
+ accountgroups.sequenceintb,
+ accountgroups.groupname,
+ chartdetails.accountcode";
+
+ $AccountsResult = DB_query($SQL,_('No general ledger accounts were returned by the SQL because'));
+
+ // Page title as IAS 1, numerals 10 and 51:
+ include_once('includes/CurrenciesArray.php');// Array to retrieve currency name.
+ echo '<div id="Report">', // Division to identify the report block.
+ '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/gl.png" title="', // Icon image.
+ _('Horizontal Analysis of Statement of Financial Position'), '" /> ', // Icon title.
+ _('Horizontal Analysis of Statement of Financial Position'), '<br />', // Page title, reporting statement.
+ stripslashes($_SESSION['CompanyRecord']['coyname']), '<br />', // Page title, reporting entity.
+ _('as at'), ' ', $BalanceDate, '<br />', // Page title, reporting period.
+ _('All amounts stated in'), ': ', _($CurrencyName[$_SESSION['CompanyRecord']['currencydefault']]), '</p>';// Page title, reporting presentation currency and level of rounding used.
+
+ echo '<table class="scrollable">
+ <thead>
+ <tr>';
+ if($_POST['Detail']=='Detailed') {// Detailed report:
+ echo '<th class="text">', _('Account'), '</th>
+ <th class="text">', _('Account Name'), '</th>';
+ } else {// Summary report:
+ echo '<th class="text" colspan="2">', _('Summary'), '</th>';
+ }
+ echo '<th class="number">', $BalanceDate, '</th>
+ <th class="number">', _('Last Year'), '</th>
+ <th class="number">', _('Absolute variation'), '</th>
+ <th class="number">', _('Relative variation'), '</th>
+ </tr>
+ </thead>
+ <tbody>';// thead used in conjunction with tbody enable scrolling of the table body independently of the header and footer. Also, when printing a large table that spans multiple pages, these elements can enable the table header to be printed at the top of each page.
+
+ $k=0; //row colour counter
+ $Section='';
+ $SectionBalance = 0;
+ $SectionBalanceLY = 0;
+
+ $LYCheckTotal = 0;
+ $CheckTotal = 0;
+
+ $ActGrp ='';
+ $Level=0;
+ $ParentGroups=array();
+ $ParentGroups[$Level]='';
+ $GroupTotal = array(0);
+ $LYGroupTotal = array(0);
+
+ $j=0; //row counter
+
+ while($myrow=DB_fetch_array($AccountsResult)) {
+ $AccountBalance = $myrow['balancecfwd'];
+ $LYAccountBalance = $myrow['lybalancecfwd'];
+
+ if($myrow['accountcode'] == $RetainedEarningsAct) {
+ $AccountBalance += $AccumProfitRow['accumprofitbfwd'];
+ $LYAccountBalance += $AccumProfitRow['lyaccumprofitbfwd'];
+ }
+
+ if($myrow['groupname']!= $ActGrp AND $ActGrp != '') {
+ if($myrow['parentgroupname']!=$ActGrp) {
+ while($myrow['groupname']!=$ParentGroups[$Level] AND $Level>0) {
+ if($_POST['Detail']=='Detailed') {
+ echo '<tr>
+ <td colspan="2"> </td>
+ <td><hr /></td>
+ <td><hr /></td>
+ <td><hr /></td>
+ <td><hr /></td>
+ </tr>';
+ }
+ echo '<tr>
+ <td colspan="2"><i>', $ParentGroups[$Level], '</i></td>
+ <td class="number">', locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format($LYGroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format($GroupTotal[$Level]-$LYGroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', RelativeVariation($GroupTotal[$Level],$LYGroupTotal[$Level]), '</td>
+ </tr>';
+ $GroupTotal[$Level] = 0;
+ $LYGroupTotal[$Level] = 0;
+ $ParentGroups[$Level] = '';
+ $Level--;
+ $j++;
+ }
+ if($_POST['Detail']=='Detailed') {
+ echo '<tr>
+ <td colspan="2"> </td>
+ <td><hr /></td>
+ <td><hr /></td>
+ <td><hr /></td>
+ <td><hr /></td>
+ </tr>';
+ }
+ echo '<tr>
+ <td colspan="2">', $ParentGroups[$Level], '</td>
+ <td class="number">', locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format($LYGroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format($GroupTotal[$Level]-$LYGroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', RelativeVariation($GroupTotal[$Level],$LYGroupTotal[$Level]), '</td>
+ </tr>';
+ $GroupTotal[$Level] = 0;
+ $LYGroupTotal[$Level] = 0;
+ $ParentGroups[$Level] = '';
+ $j++;
+ }
+ }
+ if($myrow['sectioninaccounts'] != $Section ) {
+
+ if($Section!='') {
+ if($_POST['Detail']=='Detailed') {
+ echo '<tr>
+ <td colspan="2"> </td>
+ <td><hr /></td>
+ <td><hr /></td>
+ <td><hr /></td>
+ <td><hr /></td>
+ </tr>';
+ } else {
+ echo '<tr>
+ <td colspan="2"> </td>
+ <td><hr /></td>
+ <td><hr /></td>
+ <td><hr /></td>
+ <td><hr /></td>
+ </tr>';
+ }
+ echo '<tr>
+ <td colspan="2"><h2>', $Sections[$Section], '</h2></td>
+ <td class="number"><h2>', locale_number_format($SectionBalance,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', locale_number_format($SectionBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', locale_number_format($SectionBalance-$SectionBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', RelativeVariation($SectionBalance,$SectionBalanceLY), '</h2></td>
+ </tr>';
+ $j++;
+ }
+ $SectionBalanceLY = 0;
+ $SectionBalance = 0;
+ $Section = $myrow['sectioninaccounts'];
+ if($_POST['Detail']=='Detailed') {
+ echo '<tr>
+ <td colspan="6"><h2>', $Sections[$myrow['sectioninaccounts']], '</h2></td>
+ </tr>';
+ }
+ }
+
+ if($myrow['groupname'] != $ActGrp) {
+
+ if($ActGrp!='' AND $myrow['parentgroupname']==$ActGrp) {
+ $Level++;
+ }
+
+ if($_POST['Detail']=='Detailed') {
+ $ActGrp = $myrow['groupname'];
+ echo '<tr>
+ <td colspan="6"><h3>', $myrow['groupname'], '</h3></td>
+ </tr>';
+ }
+ $GroupTotal[$Level] = 0;
+ $LYGroupTotal[$Level] = 0;
+ $ActGrp = $myrow['groupname'];
+ $ParentGroups[$Level] = $myrow['groupname'];
+ $j++;
+ }
+
+ $SectionBalanceLY += $LYAccountBalance;
+ $SectionBalance += $AccountBalance;
+ for ($i=0;$i<=$Level;$i++) {
+ $LYGroupTotal[$i] += $LYAccountBalance;
+ $GroupTotal[$i] += $AccountBalance;
+ }
+ $LYCheckTotal += $LYAccountBalance;
+ $CheckTotal += $AccountBalance;
+
+ if($_POST['Detail']=='Detailed') {
+ if(isset($_POST['ShowZeroBalances']) OR (!isset($_POST['ShowZeroBalances']) AND (round($AccountBalance,$_SESSION['CompanyRecord']['decimalplaces']) <> 0 OR round($LYAccountBalance,$_SESSION['CompanyRecord']['decimalplaces']) <> 0))) {
+ if($k==1) {
+ echo '<tr class="OddTableRows">';
+ $k=0;
+ } else {
+ echo '<tr class="EvenTableRows">';
+ $k++;
+ }
+ echo '<td><a href="', $RootPath, '/GLAccountInquiry.php?Period=', $_POST['BalancePeriodEnd'], '&Account=', $myrow['accountcode'], '">', $myrow['accountcode'], '</a></td>
+ <td>', htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false), '</td>
+ <td class="number">', locale_number_format($AccountBalance,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format($LYAccountBalance,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format($AccountBalance-$LYAccountBalance,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', RelativeVariation($AccountBalance,$LYAccountBalance), '</td>
+ </tr>';
+ $j++;
+ }
+ }
+ }
+ //end of loop
+
+ while($myrow['groupname']!=$ParentGroups[$Level] AND $Level>0) {
+ if($_POST['Detail']=='Detailed') {
+ echo '<tr>
+ <td colspan="2"> </td>
+ <td><hr /></td>
+ <td><hr /></td>
+ <td><hr /></td>
+ <td><hr /></td>
+ </tr>';
+ }
+ echo '<tr>
+ <td colspan="2"><i>', $ParentGroups[$Level], '</i></td>
+ <td class="number">', locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format($LYGroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format($GroupTotal[$Level]-$LYGroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', RelativeVariation($GroupTotal[$Level],$LYGroupTotal[$Level]), '</td>
+ </tr>';
+ $Level--;
+ }
+ if($_POST['Detail']=='Detailed') {
+ echo '<tr>
+ <td colspan="2"> </td>
+ <td><hr /></td>
+ <td><hr /></td>
+ <td><hr /></td>
+ <td><hr /></td>
+ </tr>';
+ }
+ echo '<tr>
+ <td colspan="2">', $ParentGroups[$Level], '</td>
+ <td class="number">', locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format($LYGroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format($GroupTotal[$Level]-$LYGroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', RelativeVariation($GroupTotal[$Level],$LYGroupTotal[$Level]), '</td>
+ </tr>';
+
+ echo '<tr>
+ <td colspan="2"> </td>
+ <td><hr /></td>
+ <td><hr /></td>
+ <td><hr /></td>
+ <td><hr /></td>
+ </tr>';
+
+ echo '<tr>
+ <td colspan="2"><h2>', $Sections[$Section], '</h2></td>
+ <td class="number"><h2>', locale_number_format($SectionBalance,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', locale_number_format($SectionBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', locale_number_format($SectionBalance-$SectionBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', RelativeVariation($SectionBalance,$SectionBalanceLY), '</h2></td>
+ </tr>';
+
+ $Section = $myrow['sectioninaccounts'];
+
+ if(isset($myrow['sectioninaccounts']) and $_POST['Detail']=='Detailed') {
+ echo '<tr>
+ <td colspan="6"><h2>', $Sections[$myrow['sectioninaccounts']], '</h2></td>
+ </tr>';
+ }
+ echo '<tr>
+ <td colspan="2"> </td>
+ <td><hr /></td>
+ <td><hr /></td>
+ <td><hr /></td>
+ <td><hr /></td>
+ </tr>';
+
+ echo'<tr>
+ <td colspan="2"><h2>', _('Check Total'), '</h2></td>
+ <td class="number"><h2>', locale_number_format($CheckTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', locale_number_format($LYCheckTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', locale_number_format($CheckTotal-$LYCheckTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', RelativeVariation($CheckTotal,$LYCheckTotal), '</h2></td>
+ </tr>';
+
+ echo '<tr>
+ <td colspan="2"> </td>
+ <td><hr /></td>
+ <td><hr /></td>
+ <td><hr /></td>
+ <td><hr /></td>
+ </tr>';
+
+ echo '</tbody>', // See comment at the begin of the table.
+ '</table>
+ </div>', // Close div id="Report".
+ '<br />';
+
+ echo '<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '">',
+ '<input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />',
+ '<input type="hidden" name="BalancePeriodEnd" value="', $_POST['BalancePeriodEnd'], '" />', // Form buttons:
+ '<div class="centre noprint">',
+ '<button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/printer.png" /> ', _('Print This'), '</button> ', // "Print This" button.
+ '<button name="SelectADifferentPeriod" type="submit" value="', _('Select A Different Period'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/gl.png" /> ', _('Select A Different Period'), '</button> ', // "Select A Different Period" button.
+ '<button formaction="index.php?Application=GL" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/previous.png" /> ', _('Return'), '</button>', // "Return" button.
+ '</div>',
+ '</form>';
+}
+
+include('includes/footer.inc');
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-08-02 16:54:25 UTC (rev 7331)
+++ trunk/doc/Change.log 2015-08-04 03:27:51 UTC (rev 7332)
@@ -1,5 +1,6 @@
webERP Change Log
+04/08/15 RChacon: Add new script AnalysisHorizontalPosition.php to generate an horizontal analysis of the statement of financial position.
02/08/15 RChacon: In CustomerReceipt.php, move currency tags near currency ratesand other minor changes.
27/07/15 RChacon: In Payments.php, move currency tags near currency rates.
20/06/15 RChacon: In header.inc, add meta tag to keep relationship between CSS pixels and device pixels.
Modified: trunk/sql/mysql/upgrade4.12.3-4.13.sql
===================================================================
--- trunk/sql/mysql/upgrade4.12.3-4.13.sql 2015-08-02 16:54:25 UTC (rev 7331)
+++ trunk/sql/mysql/upgrade4.12.3-4.13.sql 2015-08-04 03:27:51 UTC (rev 7332)
@@ -7,5 +7,10 @@
ALTER TABLE `loctransfercancellations` ADD INDEX `Index1` (`reference`, `stockid`) COMMENT '';
ALTER TABLE `loctransfercancellations` ADD INDEX `Index2` (`canceldate`, `reference`, `stockid`) COMMENT '';
+-- Add new script:
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES
+ ('AnalysisHorizontalPosition.php', '8', 'Horizontal analysis of statement of financial position');
+
+
-- Update version number:
UPDATE config SET confvalue='4.13' WHERE confname='VersionNumber';
|
|
From: <rc...@us...> - 2015-08-05 02:41:55
|
Revision: 7335
http://sourceforge.net/p/web-erp/reponame/7335
Author: rchacon
Date: 2015-08-05 02:41:53 +0000 (Wed, 05 Aug 2015)
Log Message:
-----------
In AnalysisHorizontalPosition.php, modify DB_fetch_array() function because it requires only one parameter (thanks Tim). Other improvements.
Modified Paths:
--------------
trunk/AnalysisHorizontalPosition.php
trunk/doc/Change.log
Modified: trunk/AnalysisHorizontalPosition.php
===================================================================
--- trunk/AnalysisHorizontalPosition.php 2015-08-04 07:40:21 UTC (rev 7334)
+++ trunk/AnalysisHorizontalPosition.php 2015-08-05 02:41:53 UTC (rev 7335)
@@ -1,6 +1,6 @@
<?php
/* $Id: AnalysisHorizontalPosition.php 7268 2015-04-19 14:57:47Z rchacon $*/
-/* Horizontal analysis of statement of financial position. */
+/* Shows the horizontal analysis of the statement of financial position. */
function RelativeVariation($CurrentPeriod, $PreviousPeriod) {
// Calculates the relative variation between current and previous periods. Uses percent in locale number format.
@@ -24,37 +24,49 @@
include('includes/header.inc');
echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/printer.png" title="', // Icon image.
- _('Print Horizontal analysis of statement of financial position'), '" /> ', // Icon title.
+ _('Print Horizontal Analysis of Statement of Financial Position'), '" /> ', // Icon title.
_('Horizontal Analysis of Statement of Financial Position'), '</p>';// Page title.
echo '<div class="page_help_text">',
_('Horizontal analysis (also known as trend analysis) is a financial statement analysis technique that shows changes in the amounts of corresponding financial statement items over a period of time. It is a useful tool to evaluate trend situations.'), '<br />',
_('The statements for two periods are used in horizontal analysis. The earliest period is used as the base period. The items on the later statement are compared with items on the statement of the base period. The changes are shown both in currency (absolute variation) and percentage (relative variation).'), '<br />',
_('webERP is an "accrual" based system (not a "cash based" system). Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.'), '</div>',
+ // Show a form to allow input of criteria for the report to show:
'<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '">',
'<input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />',
+ '<br />',
'<table class="selection">
<tr>
<td>', _('Select the balance date'), ':</td>
<td><select required="required" name="BalancePeriodEnd">';
+/* <td><select required="required" name="ToPeriod">';*/
$periodno=GetPeriod(Date($_SESSION['DefaultDateFormat']), $db);
$sql = "SELECT lastdate_in_period FROM periods WHERE periodno='".$periodno . "'";
$result = DB_query($sql);
- $myrow=DB_fetch_array($result, $db);
+ $myrow=DB_fetch_array($result);
$lastdate_in_period=$myrow[0];
$sql = "SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno DESC";
$Periods = DB_query($sql);
- while($myrow=DB_fetch_array($Periods,$db)) {
- if( $myrow['periodno']== $periodno) {
- echo '<option selected="selected" value="', $myrow['periodno'], '">', ConvertSQLDate($lastdate_in_period), '</option>';
- } else {
- echo '<option value="', $myrow['periodno'], '">', ConvertSQLDate($myrow['lastdate_in_period']), '</option>';
+ while($myrow=DB_fetch_array($Periods)) {
+ echo '<option';
+ if($myrow['periodno']== $periodno) {
+ echo ' selected="selected"';
}
+ echo ' value="', $myrow['periodno'], '">', MonthAndYearFromSQLDate($myrow['lastdate_in_period']), '</option>';
}
- echo '</select></td>
+/*
+ while($myrow=DB_fetch_array($Periods)) {
+ echo '<option';
+ if($myrow['periodno']==$DefaultToPeriod) {
+ echo ' selected="selected"';
+ }
+ echo ' value="', $myrow['periodno'], '">', MonthAndYearFromSQLDate($myrow['lastdate_in_period']), '</option>';
+ }
+*/
+ echo '</select></td>
</tr>
<tr>
<td>', _('Detail or summary'), ':</td>
@@ -64,8 +76,8 @@
</select></td>
</tr>
<tr>
- <td>', _('Show all accounts including zero balances'), '</td>
- <td><input name="ShowZeroBalances" title="', _('Check this box to display all accounts including those accounts with no balance'), '" type="checkbox" /></td>
+ <td>', _('Show all accounts including zero balances'), '</td>
+ <td><input name="ShowZeroBalances" title="', _('Check this box to display all accounts including those accounts with no balance'), '" type="checkbox" /></td>
</tr>
</table>
<br />', // Form buttons:
@@ -77,7 +89,7 @@
'</div>',
'</form>';
- /*Now do the posting while the user is thinking about the period to select */
+ // Now do the posting while the user is thinking about the period to select:
include ('includes/GLPostings.inc');
} else {
@@ -90,9 +102,36 @@
$myrow = DB_fetch_row($PrdResult);
$BalanceDate = ConvertSQLDate($myrow[0]);
+ // Page title as IAS 1, numerals 10 and 51:
+ include_once('includes/CurrenciesArray.php');// Array to retrieve currency name.
+ echo '<div id="Report">', // Division to identify the report block.
+ '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/gl.png" title="', // Icon image.
+ _('Horizontal Analysis of Statement of Financial Position'), '" /> ', // Icon title.
+ _('Horizontal Analysis of Statement of Financial Position'), '<br />', // Page title, reporting statement.
+ stripslashes($_SESSION['CompanyRecord']['coyname']), '<br />', // Page title, reporting entity.
+ _('as at'), ' ', $BalanceDate, '<br />', // Page title, reporting period.
+ _('All amounts stated in'), ': ', _($CurrencyName[$_SESSION['CompanyRecord']['currencydefault']]), '</p>';// Page title, reporting presentation currency and level of rounding used.
+ echo '<table class="scrollable">
+ <thead>
+ <tr>';
+ if($_POST['Detail']=='Detailed') {// Detailed report:
+ echo '<th class="text">', _('Account'), '</th>
+ <th class="text">', _('Account Name'), '</th>';
+ } else {// Summary report:
+ echo '<th class="text" colspan="2">', _('Summary'), '</th>';
+ }
+ echo '<th class="number">', $BalanceDate, '</th>
+ <th class="number">', _('Last Year'), '</th>
+ <th class="number">', _('Absolute variation'), '</th>
+ <th class="number">', _('Relative variation'), '</th>
+ </tr>
+ </thead>
+ <tbody>';// thead used in conjunction with tbody enable scrolling of the table body independently of the header and footer. Also, when printing a large table that spans multiple pages, these elements can enable the table header to be printed at the top of each page.
+
// Calculate B/Fwd retained earnings:
$SQL = "SELECT Sum(CASE WHEN chartdetails.period='" . $_POST['BalancePeriodEnd'] . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS accumprofitbfwd,
- Sum(CASE WHEN chartdetails.period='" . ($_POST['BalancePeriodEnd'] - 12) . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lyaccumprofitbfwd
+ Sum(CASE WHEN chartdetails.period='" . ($_POST['BalancePeriodEnd'] - 12) . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS accumprofitbfwdly
FROM chartmaster INNER JOIN accountgroups
ON chartmaster.group_ = accountgroups.groupname INNER JOIN chartdetails
ON chartmaster.accountcode= chartdetails.accountcode
@@ -108,7 +147,7 @@
chartdetails.accountcode,
chartmaster.accountname,
Sum(CASE WHEN chartdetails.period='" . $_POST['BalancePeriodEnd'] . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS balancecfwd,
- Sum(CASE WHEN chartdetails.period='" . ($_POST['BalancePeriodEnd'] - 12) . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lybalancecfwd
+ Sum(CASE WHEN chartdetails.period='" . ($_POST['BalancePeriodEnd'] - 12) . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS balancecfwdly
FROM chartmaster INNER JOIN accountgroups
ON chartmaster.group_ = accountgroups.groupname INNER JOIN chartdetails
ON chartmaster.accountcode= chartdetails.accountcode
@@ -126,58 +165,30 @@
$AccountsResult = DB_query($SQL,_('No general ledger accounts were returned by the SQL because'));
- // Page title as IAS 1, numerals 10 and 51:
- include_once('includes/CurrenciesArray.php');// Array to retrieve currency name.
- echo '<div id="Report">', // Division to identify the report block.
- '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/gl.png" title="', // Icon image.
- _('Horizontal Analysis of Statement of Financial Position'), '" /> ', // Icon title.
- _('Horizontal Analysis of Statement of Financial Position'), '<br />', // Page title, reporting statement.
- stripslashes($_SESSION['CompanyRecord']['coyname']), '<br />', // Page title, reporting entity.
- _('as at'), ' ', $BalanceDate, '<br />', // Page title, reporting period.
- _('All amounts stated in'), ': ', _($CurrencyName[$_SESSION['CompanyRecord']['currencydefault']]), '</p>';// Page title, reporting presentation currency and level of rounding used.
+ $CheckTotal=0;
+ $CheckTotalLY=0;
- echo '<table class="scrollable">
- <thead>
- <tr>';
- if($_POST['Detail']=='Detailed') {// Detailed report:
- echo '<th class="text">', _('Account'), '</th>
- <th class="text">', _('Account Name'), '</th>';
- } else {// Summary report:
- echo '<th class="text" colspan="2">', _('Summary'), '</th>';
- }
- echo '<th class="number">', $BalanceDate, '</th>
- <th class="number">', _('Last Year'), '</th>
- <th class="number">', _('Absolute variation'), '</th>
- <th class="number">', _('Relative variation'), '</th>
- </tr>
- </thead>
- <tbody>';// thead used in conjunction with tbody enable scrolling of the table body independently of the header and footer. Also, when printing a large table that spans multiple pages, these elements can enable the table header to be printed at the top of each page.
-
- $k=0; //row colour counter
$Section='';
- $SectionBalance = 0;
- $SectionBalanceLY = 0;
+ $SectionBalance= 0;
+ $SectionBalanceLY=0;
- $LYCheckTotal = 0;
- $CheckTotal = 0;
-
- $ActGrp ='';
+ $ActGrp='';
$Level=0;
$ParentGroups=array();
$ParentGroups[$Level]='';
$GroupTotal = array(0);
- $LYGroupTotal = array(0);
+ $GroupTotalLY = array(0);
- $j=0; //row counter
+ $j=0;// Row counter.
+ $k=0;// Row colour counter.
while($myrow=DB_fetch_array($AccountsResult)) {
$AccountBalance = $myrow['balancecfwd'];
- $LYAccountBalance = $myrow['lybalancecfwd'];
+ $AccountBalanceLY = $myrow['balancecfwdly'];
if($myrow['accountcode'] == $RetainedEarningsAct) {
$AccountBalance += $AccumProfitRow['accumprofitbfwd'];
- $LYAccountBalance += $AccumProfitRow['lyaccumprofitbfwd'];
+ $AccountBalanceLY += $AccumProfitRow['accumprofitbfwdly'];
}
if($myrow['groupname']!= $ActGrp AND $ActGrp != '') {
@@ -193,15 +204,15 @@
</tr>';
}
echo '<tr>
- <td colspan="2"><i>', $ParentGroups[$Level], '</i></td>
+ <td colspan="2">', $ParentGroups[$Level], '</i></td>
<td class="number">', locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', locale_number_format($LYGroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', locale_number_format($GroupTotal[$Level]-$LYGroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation($GroupTotal[$Level],$LYGroupTotal[$Level]), '</td>
+ <td class="number">', locale_number_format($GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format($GroupTotal[$Level]-$GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', RelativeVariation($GroupTotal[$Level],$GroupTotalLY[$Level]), '</td>
</tr>';
- $GroupTotal[$Level] = 0;
- $LYGroupTotal[$Level] = 0;
- $ParentGroups[$Level] = '';
+ $GroupTotal[$Level]=0;
+ $GroupTotalLY[$Level]=0;
+ $ParentGroups[$Level]='';
$Level--;
$j++;
}
@@ -215,20 +226,19 @@
</tr>';
}
echo '<tr>
- <td colspan="2">', $ParentGroups[$Level], '</td>
+ <td class="text" colspan="2">', $ParentGroups[$Level], '</td>
<td class="number">', locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', locale_number_format($LYGroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', locale_number_format($GroupTotal[$Level]-$LYGroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation($GroupTotal[$Level],$LYGroupTotal[$Level]), '</td>
+ <td class="number">', locale_number_format($GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format($GroupTotal[$Level]-$GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', RelativeVariation($GroupTotal[$Level],$GroupTotalLY[$Level]), '</td>
</tr>';
- $GroupTotal[$Level] = 0;
- $LYGroupTotal[$Level] = 0;
- $ParentGroups[$Level] = '';
+ $GroupTotal[$Level]=0;
+ $GroupTotalLY[$Level]=0;
+ $ParentGroups[$Level]='';
$j++;
}
}
if($myrow['sectioninaccounts'] != $Section ) {
-
if($Section!='') {
if($_POST['Detail']=='Detailed') {
echo '<tr>
@@ -248,7 +258,7 @@
</tr>';
}
echo '<tr>
- <td colspan="2"><h2>', $Sections[$Section], '</h2></td>
+ <td class="text" colspan="2"><h2>', $Sections[$Section], '</h2></td>
<td class="number"><h2>', locale_number_format($SectionBalance,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format($SectionBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format($SectionBalance-$SectionBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
@@ -256,8 +266,8 @@
</tr>';
$j++;
}
- $SectionBalanceLY = 0;
- $SectionBalance = 0;
+ $SectionBalance=0;
+ $SectionBalanceLY=0;
$Section = $myrow['sectioninaccounts'];
if($_POST['Detail']=='Detailed') {
echo '<tr>
@@ -278,37 +288,37 @@
<td colspan="6"><h3>', $myrow['groupname'], '</h3></td>
</tr>';
}
- $GroupTotal[$Level] = 0;
- $LYGroupTotal[$Level] = 0;
+ $GroupTotal[$Level]=0;
+ $GroupTotalLY[$Level]=0;
$ActGrp = $myrow['groupname'];
$ParentGroups[$Level] = $myrow['groupname'];
$j++;
}
+ $SectionBalance += $AccountBalance;
+ $SectionBalanceLY += $AccountBalanceLY;
- $SectionBalanceLY += $LYAccountBalance;
- $SectionBalance += $AccountBalance;
for ($i=0;$i<=$Level;$i++) {
- $LYGroupTotal[$i] += $LYAccountBalance;
+ $GroupTotalLY[$i] += $AccountBalanceLY;
$GroupTotal[$i] += $AccountBalance;
}
- $LYCheckTotal += $LYAccountBalance;
$CheckTotal += $AccountBalance;
+ $CheckTotalLY += $AccountBalanceLY;
if($_POST['Detail']=='Detailed') {
- if(isset($_POST['ShowZeroBalances']) OR (!isset($_POST['ShowZeroBalances']) AND (round($AccountBalance,$_SESSION['CompanyRecord']['decimalplaces']) <> 0 OR round($LYAccountBalance,$_SESSION['CompanyRecord']['decimalplaces']) <> 0))) {
+ if(isset($_POST['ShowZeroBalances']) OR (!isset($_POST['ShowZeroBalances']) AND (round($AccountBalance,$_SESSION['CompanyRecord']['decimalplaces']) <> 0 OR round($AccountBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']) <> 0))) {
if($k==1) {
echo '<tr class="OddTableRows">';
$k=0;
} else {
echo '<tr class="EvenTableRows">';
- $k++;
+ $k=1;
}
- echo '<td><a href="', $RootPath, '/GLAccountInquiry.php?Period=', $_POST['BalancePeriodEnd'], '&Account=', $myrow['accountcode'], '">', $myrow['accountcode'], '</a></td>
- <td>', htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false), '</td>
+ echo '<td class="text"><a href="', $RootPath, '/GLAccountInquiry.php?Period=', $_POST['BalancePeriodEnd'], '&Account=', $myrow['accountcode'], '">', $myrow['accountcode'], '</a></td>
+ <td class="text">', htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false), '</td>
<td class="number">', locale_number_format($AccountBalance,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', locale_number_format($LYAccountBalance,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', locale_number_format($AccountBalance-$LYAccountBalance,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation($AccountBalance,$LYAccountBalance), '</td>
+ <td class="number">', locale_number_format($AccountBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format($AccountBalance-$AccountBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', RelativeVariation($AccountBalance,$AccountBalanceLY), '</td>
</tr>';
$j++;
}
@@ -327,11 +337,11 @@
</tr>';
}
echo '<tr>
- <td colspan="2"><i>', $ParentGroups[$Level], '</i></td>
+ <td colspan="2">', $ParentGroups[$Level], '</i></td>
<td class="number">', locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', locale_number_format($LYGroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', locale_number_format($GroupTotal[$Level]-$LYGroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation($GroupTotal[$Level],$LYGroupTotal[$Level]), '</td>
+ <td class="number">', locale_number_format($GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format($GroupTotal[$Level]-$GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', RelativeVariation($GroupTotal[$Level],$GroupTotalLY[$Level]), '</td>
</tr>';
$Level--;
}
@@ -347,9 +357,9 @@
echo '<tr>
<td colspan="2">', $ParentGroups[$Level], '</td>
<td class="number">', locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', locale_number_format($LYGroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', locale_number_format($GroupTotal[$Level]-$LYGroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation($GroupTotal[$Level],$LYGroupTotal[$Level]), '</td>
+ <td class="number">', locale_number_format($GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format($GroupTotal[$Level]-$GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', RelativeVariation($GroupTotal[$Level],$GroupTotalLY[$Level]), '</td>
</tr>';
echo '<tr>
@@ -386,9 +396,9 @@
echo'<tr>
<td colspan="2"><h2>', _('Check Total'), '</h2></td>
<td class="number"><h2>', locale_number_format($CheckTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', locale_number_format($LYCheckTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', locale_number_format($CheckTotal-$LYCheckTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeVariation($CheckTotal,$LYCheckTotal), '</h2></td>
+ <td class="number"><h2>', locale_number_format($CheckTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', locale_number_format($CheckTotal-$CheckTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', RelativeVariation($CheckTotal,$CheckTotalLY), '</h2></td>
</tr>';
echo '<tr>
@@ -419,4 +429,4 @@
}
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-08-04 07:40:21 UTC (rev 7334)
+++ trunk/doc/Change.log 2015-08-05 02:41:53 UTC (rev 7335)
@@ -1,5 +1,6 @@
webERP Change Log
+05/08/15 RChacon: In AnalysisHorizontalPosition.php, modify DB_fetch_array() function because it requires only one parameter (thanks Tim). Other improvements.
04/08/15 RChacon: Add new script AnalysisHorizontalPosition.php to generate an horizontal analysis of the statement of financial position.
02/08/15 RChacon: In CustomerReceipt.php, move currency tags near currency ratesand other minor changes.
27/07/15 RChacon: In Payments.php, move currency tags near currency rates.
|
|
From: <rc...@us...> - 2015-08-13 18:41:51
|
Revision: 7337
http://sourceforge.net/p/web-erp/reponame/7337
Author: rchacon
Date: 2015-08-13 18:41:48 +0000 (Thu, 13 Aug 2015)
Log Message:
-----------
Add new script AnalysisHorizontalIncome.php to generate an horizontal analysis of the statement of comprehensive income. In AnalysisHorizontalPosition.php, adjust signs and add report footnote.
Modified Paths:
--------------
trunk/AnalysisHorizontalPosition.php
trunk/GLProfit_Loss.php
trunk/doc/Change.log
trunk/includes/MainMenuLinksArray.php
trunk/sql/mysql/upgrade4.12.3-4.13.sql
Added Paths:
-----------
trunk/AnalysisHorizontalIncome.php
Added: trunk/AnalysisHorizontalIncome.php
===================================================================
--- trunk/AnalysisHorizontalIncome.php (rev 0)
+++ trunk/AnalysisHorizontalIncome.php 2015-08-13 18:41:48 UTC (rev 7337)
@@ -0,0 +1,532 @@
+<?php
+/* $Id: AnalysisHorizontalIncome.php 7332 2015-08-04 03:27:51Z rchacon $*/
+/* Shows the horizontal analysis of the statement of comprehensive income. */
+
+function RelativeVariation($SelectedPeriod, $PreviousPeriod) {
+ // Calculates the relative variation between selected and previous periods. Uses percent in locale number format.
+ if($PreviousPeriod<>0) {
+ return locale_number_format(($SelectedPeriod-$PreviousPeriod)*100/$PreviousPeriod,$_SESSION['CompanyRecord']['decimalplaces']) . '%';
+ } else {
+ return _('N/A');
+ }
+}
+
+include ('includes/session.inc');
+$Title = _('Horizontal Analysis of Statement of Comprehensive Income');// Screen identification.
+$ViewTopic= 'GeneralLedger';// Filename's id in ManualContents.php's TOC.
+$BookMark = 'AnalysisHorizontalIncome';// Anchor's id in the manual's html document.
+include('includes/SQL_CommonFunctions.inc');
+include('includes/AccountSectionsDef.inc'); // This loads the $Sections variable
+
+if(isset($_POST['FromPeriod']) and ($_POST['FromPeriod'] > $_POST['ToPeriod'])) {
+ prnMsg(_('The selected period from is actually after the period to') . '! ' . _('Please reselect the reporting period'),'error');
+ $_POST['SelectADifferentPeriod']='Select A Different Period';
+}
+
+if((!isset($_POST['FromPeriod']) AND !isset($_POST['ToPeriod'])) OR isset($_POST['SelectADifferentPeriod'])) {
+
+ include('includes/header.inc');
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/printer.png" title="', // Icon image.
+ _('Print Horizontal Analysis of Statement of Comprehensive Income'), '" /> ', // Icon title.
+ _('Horizontal Analysis of Statement of Comprehensive Income'), '</p>';// Page title.
+
+ echo '<div class="page_help_text">',
+ _('Horizontal analysis (also known as trend analysis) is a financial statement analysis technique that shows changes in the amounts of corresponding financial statement items over a period of time. It is a useful tool to evaluate trend situations.'), '<br />',
+ _('The statements for two periods are used in horizontal analysis. The earliest period is used as the base period. The items on the later statement are compared with items on the statement of the base period. The changes are shown both in currency (absolute variation) and percentage (relative variation).'), '<br />',
+ _('webERP is an "accrual" based system (not a "cash based" system). Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.'), '</div>',
+ // Show a form to allow input of criteria for the report to show:
+ '<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '">',
+ '<input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />',
+ '<br />',
+ '<table class="selection">
+ <tr>
+ <td>', _('Select period from'), ':</td>
+ <td><select name="FromPeriod">';
+
+ if(Date('m') > $_SESSION['YearEnd']) {
+ /*Dates in SQL format */
+ $DefaultFromDate = Date ('Y-m-d', Mktime(0,0,0,$_SESSION['YearEnd'] + 2,0,Date('Y')));
+ $FromDate = Date($_SESSION['DefaultDateFormat'], Mktime(0,0,0,$_SESSION['YearEnd'] + 2,0,Date('Y')));
+ } else {
+ $DefaultFromDate = Date ('Y-m-d', Mktime(0,0,0,$_SESSION['YearEnd'] + 2,0,Date('Y')-1));
+ $FromDate = Date($_SESSION['DefaultDateFormat'], Mktime(0,0,0,$_SESSION['YearEnd'] + 2,0,Date('Y')-1));
+ }
+ $period=GetPeriod($FromDate, $db);
+
+ $sql = "SELECT periodno, lastdate_in_period
+ FROM periods
+ ORDER BY periodno DESC";
+ $Periods = DB_query($sql);
+
+ while($myrow=DB_fetch_array($Periods)) {
+ if(isset($_POST['FromPeriod']) AND $_POST['FromPeriod']!='') {
+ if( $_POST['FromPeriod']== $myrow['periodno']) {
+ echo '<option selected="selected" value="' . $myrow['periodno'] . '">' .MonthAndYearFromSQLDate($myrow['lastdate_in_period']) . '</option>';
+ } else {
+ echo '<option value="' . $myrow['periodno'] . '">' . MonthAndYearFromSQLDate($myrow['lastdate_in_period']) . '</option>';
+ }
+ } else {
+ if($myrow['lastdate_in_period']==$DefaultFromDate) {
+ echo '<option selected="selected" value="' . $myrow['periodno'] . '">' . MonthAndYearFromSQLDate($myrow['lastdate_in_period']) . '</option>';
+ } else {
+ echo '<option value="' . $myrow['periodno'] . '">' . MonthAndYearFromSQLDate($myrow['lastdate_in_period']) . '</option>';
+ }
+ }
+ }
+
+ echo '</select></td>
+ </tr>
+ <tr>
+ <td>', _('Select period to'), ':</td>
+ <td><select required="required" name="ToPeriod">';
+
+ if(!isset($_POST['ToPeriod']) OR $_POST['ToPeriod']=='') {
+ $LastDate = date('Y-m-d',mktime(0,0,0,Date('m')+1,0,Date('Y')));
+ $sql = "SELECT periodno FROM periods where lastdate_in_period = '" . $LastDate . "'";
+ $MaxPrd = DB_query($sql);
+ $MaxPrdrow = DB_fetch_row($MaxPrd);
+ $DefaultToPeriod = (int) ($MaxPrdrow[0]);
+ } else {
+ $DefaultToPeriod = $_POST['ToPeriod'];
+ }
+
+ $RetResult = DB_data_seek($Periods,0);
+
+ while($myrow=DB_fetch_array($Periods)) {
+ echo '<option';
+ if($myrow['periodno']==$DefaultToPeriod) {
+ echo ' selected="selected"';
+ }
+ echo ' value="', $myrow['periodno'], '">', MonthAndYearFromSQLDate($myrow['lastdate_in_period']), '</option>';
+ }
+
+ echo '</select></td>
+ </tr>
+ <tr>
+ <td>', _('Detail or summary'), ':</td>
+ <td><select name="Detail" required="required" title="', _('Selecting Summary will show on the totals at the account group level'), '" >
+ <option value="Summary">', _('Summary'), '</option>
+ <option selected="selected" value="Detailed">', _('All Accounts'), '</option>
+ </select></td>
+ </tr>
+ <tr>
+ <td>', _('Show all accounts including zero balances'), '</td>
+ <td><input name="ShowZeroBalances" title="', _('Check this box to display all accounts including those accounts with no balance'), '" type="checkbox" /></td>
+ </tr>
+ </table>
+ <br />', // Form buttons:
+ '<div class="centre noprint">',
+ '<button name="ShowPL" type="submit" value="', _('Show on Screen (HTML)'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/gl.png" /> ', _('Show on Screen (HTML)'), '</button> ', // "Show on Screen (HTML)" button.
+ '<button formaction="index.php?Application=GL" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/previous.png" /> ', _('Return'), '</button>', // "Return" button.
+ '</div>';
+
+ // Now do the posting while the user is thinking about the period to select:
+ include ('includes/GLPostings.inc');
+
+} else {
+ include('includes/header.inc');
+
+ $NumberOfMonths = $_POST['ToPeriod'] - $_POST['FromPeriod'] + 1;
+
+ if($NumberOfMonths >12) {
+ echo '<br />';
+ prnMsg(_('A period up to 12 months in duration can be specified') . ' - ' . _('the system automatically shows a comparative for the same period from the previous year') . ' - ' . _('it cannot do this if a period of more than 12 months is specified') . '. ' . _('Please select an alternative period range'),'error');
+ include('includes/footer.inc');
+ exit;
+ }
+
+ $sql = "SELECT lastdate_in_period FROM periods WHERE periodno='" . $_POST['ToPeriod'] . "'";
+ $PrdResult = DB_query($sql);
+ $myrow = DB_fetch_row($PrdResult);
+ $PeriodToDate = MonthAndYearFromSQLDate($myrow[0]);
+
+ // Page title as IAS 1, numerals 10 and 51:
+ include_once('includes/CurrenciesArray.php');// Array to retrieve currency name.
+ echo '<div id="Report">';// Division to identify the report block.
+ echo '<div id="Report">', // Division to identify the report block.
+ '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/gl.png" title="', // Icon image.
+ _('Horizontal Analysis of Statement of Comprehensive Income'), '" /> ', // Icon title.
+ _('Horizontal Analysis of Statement of Comprehensive Income'), '<br />', // Page title, reporting statement.
+ stripslashes($_SESSION['CompanyRecord']['coyname']), '<br />', // Page title, reporting entity.
+ _('For'), ' ', $NumberOfMonths, ' ', _('months to'), ' ', $PeriodToDate, '<br />', // Page title, reporting period.
+ _('All amounts stated in'), ': ', _($CurrencyName[$_SESSION['CompanyRecord']['currencydefault']]), '</p>';// Page title, reporting presentation currency and level of rounding used.
+ echo '<table class="scrollable">
+ <thead>
+ <tr>';
+ if($_POST['Detail']=='Detailed') {// Detailed report:
+ echo '<th class="text">', _('Account'), '</th>
+ <th class="text">', _('Account Name'), '</th>';
+ } else {// Summary report:
+ echo '<th class="text" colspan="2">', _('Summary'), '</th>';
+ }
+ echo '<th class="number">', ' - ', $myrow[0], '</th>
+ <th class="number">', _('Last Year'), '</th>
+ <th class="number">', _('Absolute variation'), '</th>
+ <th class="number">', _('Relative variation'), '</th>
+ </tr>
+ </thead>
+ <tfoot>
+ <tr>
+ <td class="text" colspan="6">',// Prints an explanation of signs in absolute and relative variations:
+ '<br /><b>', _('Notes'), ':</b><br />',
+ _('Absolute variation signs: a positive number indicates a variation that increases the net profit; a negative number indicates a variation that decreases the net profit.'), '<br />',
+ _('Relative variation signs: a positive number indicates an increase in the amount of that account; a negative number indicates a decrease in the amount of that account.'), '<br />',
+ '</td>
+ </tr>
+ </tfoot>
+ <tbody>';// thead and tfoot used in conjunction with tbody enable scrolling of the table body independently of the header and footer. Also, when printing a large table that spans multiple pages, these elements can enable the table header to be printed at the top of each page.
+
+ $SQL = "SELECT accountgroups.sectioninaccounts,
+ accountgroups.parentgroupname,
+ accountgroups.groupname,
+ chartdetails.accountcode,
+ chartmaster.accountname,
+ SUM(CASE WHEN chartdetails.period='" . $_POST['FromPeriod'] . "' THEN chartdetails.bfwd ELSE 0 END) AS firstprdbfwd,
+ SUM(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lastprdcfwd,
+ SUM(CASE WHEN chartdetails.period='" . ($_POST['FromPeriod'] - 12) . "' THEN chartdetails.bfwd ELSE 0 END) AS firstprdbfwdly,
+ SUM(CASE WHEN chartdetails.period='" . ($_POST['ToPeriod']-12) . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lastprdcfwdly
+ FROM chartmaster INNER JOIN accountgroups
+ ON chartmaster.group_ = accountgroups.groupname INNER JOIN chartdetails
+ ON chartmaster.accountcode= chartdetails.accountcode
+ WHERE accountgroups.pandl=1
+ GROUP BY accountgroups.sectioninaccounts,
+ accountgroups.parentgroupname,
+ accountgroups.groupname,
+ chartdetails.accountcode,
+ chartmaster.accountname
+ ORDER BY accountgroups.sectioninaccounts,
+ accountgroups.sequenceintb,
+ accountgroups.groupname,
+ chartdetails.accountcode";
+ $AccountsResult = DB_query($SQL,_('No general ledger accounts were returned by the SQL because'),_('The SQL that failed was'));
+
+ $PeriodTotal=0;
+ $PeriodTotalLY=0;
+
+ $Section='';
+ $SectionTotal=0;
+ $SectionTotalLY=0;
+
+ $ActGrp='';
+ $GrpTotal=array(0);
+ $GrpTotalLY=array(0);
+ $Level=0;
+ $ParentGroups=array();
+ $ParentGroups[$Level]='';
+
+ $k=0;// Row colour counter.
+ $DrawTotalLine = '<tr>
+ <td colspan="2"> </td>
+ <td><hr /></td>
+ <td><hr /></td>
+ <td><hr /></td>
+ <td><hr /></td>
+ </tr>';
+
+ while($myrow=DB_fetch_array($AccountsResult)) {
+ if($myrow['groupname']!= $ActGrp) {
+ if($myrow['parentgroupname']!=$ActGrp AND $ActGrp!='') {
+ while($myrow['groupname']!=$ParentGroups[$Level] AND $Level>0) {
+ if($_POST['Detail']=='Detailed') {
+ echo $DrawTotalLine;
+ $ActGrpLabel = str_repeat('___',$Level) . $ParentGroups[$Level] . ' *' . _('total');
+ } else {
+ $ActGrpLabel = str_repeat('___',$Level) . $ParentGroups[$Level];
+ }
+ echo '<tr>
+ <td class="text" colspan="2">', $ActGrpLabel, '</td>
+ <td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', RelativeVariation(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
+ </tr>';
+ $GrpTotal[$Level]=0;
+ $GrpTotalLY[$Level]=0;
+ $ParentGroups[$Level]='';
+ $Level--;
+ }// End while.
+
+ //still need to print out the old group totals
+
+ if($_POST['Detail']=='Detailed') {
+ echo $DrawTotalLine;
+ $ActGrpLabel = str_repeat('___',$Level) . $ParentGroups[$Level] . ' ' . _('total');
+ } else {
+ $ActGrpLabel = str_repeat('___',$Level) . $ParentGroups[$Level];
+ }
+
+// --->
+ if($Section ==1) {// Income
+ echo '<tr>
+ <td class="text" colspan="2">', $ActGrpLabel, '</td>
+ <td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', RelativeVariation(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
+ </tr>';
+ } else {// Costs
+// <---
+ echo '<tr>
+ <td class="text" colspan="2">', $ActGrpLabel, '</td>
+ <td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', RelativeVariation(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
+ </tr>';
+// --->
+ }
+// <---
+ $GrpTotalLY[$Level]=0;
+ $GrpTotal[$Level]=0;
+ $ParentGroups[$Level]='';
+ }
+ }
+
+ if($myrow['sectioninaccounts']!= $Section) {
+
+ if($SectionTotal+$SectionTotalLY !=0) {
+
+ if($Section==1) {// Income.
+ echo $DrawTotalLine;
+ echo '<tr>
+ <td class="text" colspan="2"><h2>', $Sections[$Section], '</h2></td>
+ <td class="number"><h2>', locale_number_format(-$SectionTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', locale_number_format(-$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', locale_number_format(-$SectionTotal+$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', RelativeVariation(-$SectionTotal,-$SectionTotalLY), '</h2></td>
+ </tr>';
+ $GPIncome = $SectionTotal;
+ $GPIncomeLY = $SectionTotalLY;
+ } else {
+ echo '<tr>
+ <td class="text" colspan="2"><h2>', $Sections[$Section], '</h2></td>
+ <td class="number"><h2>', locale_number_format(-$SectionTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', locale_number_format(-$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', locale_number_format(-$SectionTotal+$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', RelativeVariation(-$SectionTotal,-$SectionTotalLY), '</h2></td>
+ </tr>';
+ }
+
+ if($Section==2) {// Cost of Sales - need sub total for Gross Profit.
+ echo $DrawTotalLine;
+ echo '<tr>
+ <td class="text" colspan="2"><h2>', _('Gross Profit'), '</h2></td>
+ <td class="number"><h2>', locale_number_format(-($GPIncome+$SectionTotal),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', locale_number_format(-($GPIncomeLY+$SectionTotalLY),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', locale_number_format(-($GPIncome+$SectionTotal)+($GPIncomeLY+$SectionTotalLY),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', RelativeVariation(-($GPIncome+$SectionTotal),-($GPIncomeLY+$SectionTotalLY)), '</h2></td>
+ </tr>';
+ }
+
+ if(($Section!=1) AND ($Section!=2)) {
+ echo $DrawTotalLine;
+ echo '<tr>
+ <td class="text" colspan="2"><h2>', _('Earnings after'), ' ', $Sections[$Section], '</h2></td>
+ <td class="number"><h2>', locale_number_format(-$PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', locale_number_format(-$PeriodTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', locale_number_format(-$PeriodTotal+$PeriodTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', RelativeVariation(-$PeriodTotal,-$PeriodTotalLY), '</h2></td>
+ </tr>';
+ echo $DrawTotalLine;
+ }
+ }
+
+ $Section = $myrow['sectioninaccounts'];
+ $SectionTotal=0;
+ $SectionTotalLY=0;
+
+ if($_POST['Detail']=='Detailed') {
+ echo '<tr>
+ <td colspan="6"><h2>', $Sections[$myrow['sectioninaccounts']], '</h2></td>
+ </tr>';
+ }
+ }
+
+ if($myrow['groupname']!= $ActGrp) {
+ if($myrow['parentgroupname']==$ActGrp AND $ActGrp !='') {// Adding another level of nesting
+ $Level++;
+ }
+ $ActGrp = $myrow['groupname'];
+ $ParentGroups[$Level] = $myrow['groupname'];
+ if($_POST['Detail']=='Detailed') {
+ echo '<tr>
+ <td colspan="6"><h2>', $myrow['groupname'], '</h2></td>
+ </tr>';
+ }
+ }
+
+ // Set totals for account, groups, section and period:
+ $AccountTotal = $myrow['lastprdcfwd'] - $myrow['firstprdbfwd'];
+ $AccountTotalLY = $myrow['lastprdcfwdly'] - $myrow['firstprdbfwdly'];
+ for ($i=0;$i<=$Level;$i++) {
+ if(!isset($GrpTotalLY[$i])) {$GrpTotalLY[$i]=0;}
+ $GrpTotalLY[$i] += $AccountTotalLY;
+ if(!isset($GrpTotal[$i])) {$GrpTotal[$i]=0;}
+ $GrpTotal[$i] += $AccountTotal;
+ }
+ $SectionTotal += $AccountTotal;
+ $SectionTotalLY += $AccountTotalLY;
+ $PeriodTotal += $AccountTotal;
+ $PeriodTotalLY += $AccountTotalLY;
+
+ if($_POST['Detail']=='Detailed') {
+ if(isset($_POST['ShowZeroBalances']) OR (!isset($_POST['ShowZeroBalances']) AND ($AccountTotal <> 0 OR $AccountTotalLY <> 0))) {
+ if($k==1) {
+ echo '<tr class="EvenTableRows">';
+ $k=0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k=1;
+ }
+ echo '<td class="text"><a href="', $RootPath, '/GLAccountInquiry.php?Period=', $_POST['ToPeriod'], '&Account=', $myrow['accountcode'], '&Show=Yes">', $myrow['accountcode'], '</a></td>';
+// --->
+ if($Section ==1) {
+ echo ' <td class="text">', htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false), '</td>
+ <td class="number">', locale_number_format(-$AccountTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format(-$AccountTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format(-$AccountTotal+$AccountTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', RelativeVariation(-$AccountTotal,-$AccountTotalLY), '</td>
+ </tr>';
+ } else {
+// <---
+ echo ' <td class="text">', htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false), '</td>
+ <td class="number">', locale_number_format(-$AccountTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format(-$AccountTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format(-$AccountTotal+$AccountTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', RelativeVariation(-$AccountTotal,-$AccountTotalLY), '</td>
+ </tr>';
+ }
+ }
+ }
+ }// End of loop.
+
+ if($myrow['groupname']!= $ActGrp) {
+ if($myrow['parentgroupname']!=$ActGrp AND $ActGrp!='') {
+ while($myrow['groupname']!=$ParentGroups[$Level] AND $Level>0) {
+ if($_POST['Detail']=='Detailed') {
+ echo $DrawTotalLine;
+ $ActGrpLabel = str_repeat('___',$Level) . $ParentGroups[$Level] . ' ' . _('total');
+ } else {
+ $ActGrpLabel = str_repeat('___',$Level) . $ParentGroups[$Level];
+ }
+// --->
+ if($Section ==1) {// Income.
+ echo '<tr>
+ <td colspan="2"><h3>', $ActGrpLabel, '</h3></td>
+ <td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', RelativeVariation(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
+ </tr>';
+ } else {// Costs.
+// <---
+ echo '<tr>
+ <td colspan="2"><h3>', $ActGrpLabel, '</h3></td>
+ <td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', RelativeVariation(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
+ </tr>';
+ }
+ $GrpTotal[$Level]=0;
+ $GrpTotalLY[$Level]=0;
+ $ParentGroups[$Level]='';
+ $Level--;
+ }// End while.
+ //still need to print out the old group totals
+ if($_POST['Detail']=='Detailed') {
+ echo $DrawTotalLine;
+ $ActGrpLabel = str_repeat('___',$Level) . $ParentGroups[$Level] . ' ' . _('total');
+ } else {
+ $ActGrpLabel = str_repeat('___',$Level) . $ParentGroups[$Level];
+ }
+ echo '<tr>
+ <td colspan="2"><h3>', $ActGrpLabel, '</h3></td>
+ <td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', RelativeVariation(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
+ </tr>';
+ $GrpTotal[$Level]=0;
+ $GrpTotalLY[$Level]=0;
+ $ParentGroups[$Level]='';
+ }
+ }
+
+ if($myrow['sectioninaccounts']!= $Section) {
+
+ if($Section==1) {// Income.
+ echo $DrawTotalLine,
+ '<tr>
+ <td colspan="2"><h2>', $Sections[$Section], '</h2></td>
+ <td class="number"><h2>', locale_number_format(-$SectionTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', locale_number_format(-$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', locale_number_format(-$SectionTotal+$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', RelativeVariation(-$SectionTotal,-$SectionTotalLY), '</h2></td>
+ </tr>';
+ $GPIncome = $SectionTotal;
+ $GPIncomeLY = $SectionTotalLY;
+ } else {
+ echo $DrawTotalLine,
+ '<tr>
+ <td colspan="2"><h2>', $Sections[$Section], '</h2></td>
+ <td class="number"><h2>', locale_number_format(-$SectionTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', locale_number_format(-$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', locale_number_format(-$SectionTotal+$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', RelativeVariation(-$SectionTotal,-$SectionTotalLY), '</h2></td>
+ </tr>';
+ }
+ if($Section==2) {// Cost of Sales - need sub total for Gross Profit.
+ echo $DrawTotalLine,
+ '<tr>
+ <td colspan="2"><h2>', _('Gross Profit'), '</h2></td>
+ <td class="number"><h2>', locale_number_format(-($GPIncome+$SectionTotal),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', locale_number_format(-($GPIncomeLY+$SectionTotalLY),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', locale_number_format(-($GPIncome+$SectionTotal)+($GPIncomeLY+$SectionTotalLY),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', RelativeVariation(-($GPIncome+$SectionTotal),-($GPIncomeLY+$SectionTotalLY)), '</h2></td>
+ </tr>';
+ }
+ $Section = $myrow['sectioninaccounts'];
+ $SectionTotal=0;
+ $SectionTotalLY=0;
+
+ if($_POST['Detail']=='Detailed' and isset($Sections[$myrow['sectioninaccounts']])) {
+ echo '<tr>
+ <td colspan="6"><h2>', $Sections[$myrow['sectioninaccounts']], '</h2></td>
+ </tr>';
+ }
+ }
+
+ echo $DrawTotalLine;
+ echo '<tr>
+ <td colspan="2"><h2>', _('Net Profit'), '</h2></td>
+ <td class="number"><h2>', locale_number_format(-$PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', locale_number_format(-$PeriodTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', locale_number_format(-$PeriodTotal+$PeriodTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
+ <td class="number"><h2>', RelativeVariation(-$PeriodTotal,-$PeriodTotalLY), '</h2></td>
+ </tr>';
+ echo $DrawTotalLine;
+ echo '</tbody>', // See comment at the begin of the table.
+ '</table>
+ </div>'; // Close div id="Report".
+ echo '<br />',
+ '<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '">',
+ '<input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />',
+ '<input type="hidden" name="FromPeriod" value="', $_POST['FromPeriod'], '" />',
+ '<input type="hidden" name="ToPeriod" value="', $_POST['ToPeriod'], '" />', // Form buttons:
+ '<div class="centre noprint">',
+ '<button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/printer.png" /> ', _('Print This'), '</button> ', // "Print This" button.
+ '<button name="SelectADifferentPeriod" type="submit" value="', _('Select A Different Period'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/gl.png" /> ', _('Select A Different Period'), '</button> ', // "Select A Different Period" button.
+ '<button formaction="index.php?Application=GL" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/previous.png" /> ', _('Return'), '</button>', // "Return" button.
+ '</div>';
+}
+echo '</form>';
+include('includes/footer.inc');
+?>
Modified: trunk/AnalysisHorizontalPosition.php
===================================================================
--- trunk/AnalysisHorizontalPosition.php 2015-08-10 01:43:46 UTC (rev 7336)
+++ trunk/AnalysisHorizontalPosition.php 2015-08-13 18:41:48 UTC (rev 7337)
@@ -2,10 +2,10 @@
/* $Id: AnalysisHorizontalPosition.php 7268 2015-04-19 14:57:47Z rchacon $*/
/* Shows the horizontal analysis of the statement of financial position. */
-function RelativeVariation($CurrentPeriod, $PreviousPeriod) {
- // Calculates the relative variation between current and previous periods. Uses percent in locale number format.
+function RelativeVariation($SelectedPeriod, $PreviousPeriod) {
+ // Calculates the relative variation between selected and previous periods. Uses percent in locale number format.
if($PreviousPeriod<>0) {
- return locale_number_format(($CurrentPeriod-$PreviousPeriod)*100/$PreviousPeriod,$_SESSION['CompanyRecord']['decimalplaces']) . '%';
+ return locale_number_format(($SelectedPeriod-$PreviousPeriod)*100/$PreviousPeriod,$_SESSION['CompanyRecord']['decimalplaces']) . '%';
} else {
return _('N/A');
}
@@ -82,12 +82,11 @@
</table>
<br />', // Form buttons:
'<div class="centre noprint">',
- '<button name="ShowBalanceSheet" type="submit" value="', _('Show on Screen (HTML)'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '<button name="ShowPL" type="submit" value="', _('Show on Screen (HTML)'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/gl.png" /> ', _('Show on Screen (HTML)'), '</button> ', // "Show on Screen (HTML)" button.
'<button formaction="index.php?Application=GL" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/previous.png" /> ', _('Return'), '</button>', // "Return" button.
- '</div>',
- '</form>';
+ '</div>';
// Now do the posting while the user is thinking about the period to select:
include ('includes/GLPostings.inc');
@@ -127,7 +126,16 @@
<th class="number">', _('Relative variation'), '</th>
</tr>
</thead>
- <tbody>';// thead used in conjunction with tbody enable scrolling of the table body...
[truncated message content] |
|
From: <rc...@us...> - 2015-08-14 01:28:25
|
Revision: 7339
http://sourceforge.net/p/web-erp/reponame/7339
Author: rchacon
Date: 2015-08-14 01:28:22 +0000 (Fri, 14 Aug 2015)
Log Message:
-----------
In doc/ManualGeneralLedger.html, add help for the horizontal analysis.
Modified Paths:
--------------
trunk/AnalysisHorizontalPosition.php
trunk/doc/Change.log
trunk/doc/Manual/ManualGeneralLedger.html
Modified: trunk/AnalysisHorizontalPosition.php
===================================================================
--- trunk/AnalysisHorizontalPosition.php 2015-08-13 18:51:07 UTC (rev 7338)
+++ trunk/AnalysisHorizontalPosition.php 2015-08-14 01:28:22 UTC (rev 7339)
@@ -1,5 +1,5 @@
<?php
-/* $Id: AnalysisHorizontalPosition.php 7268 2015-04-19 14:57:47Z rchacon $*/
+/* $Id: AnalysisHorizontalPosition.php 7338 2015-08-13 18:51:07Z rchacon $*/
/* Shows the horizontal analysis of the statement of financial position. */
function RelativeVariation($SelectedPeriod, $PreviousPeriod) {
@@ -188,6 +188,13 @@
$GroupTotalLY = array(0);
$k=0;// Row colour counter.
+ $DrawTotalLine = '<tr>
+ <td colspan="2"> </td>
+ <td><hr /></td>
+ <td><hr /></td>
+ <td><hr /></td>
+ <td><hr /></td>
+ </tr>';
while($myrow=DB_fetch_array($AccountsResult)) {
$AccountBalance = $myrow['balancecfwd'];
@@ -202,13 +209,7 @@
if($myrow['parentgroupname']!=$ActGrp) {
while($myrow['groupname']!=$ParentGroups[$Level] AND $Level>0) {
if($_POST['Detail']=='Detailed') {
- echo '<tr>
- <td colspan="2"> </td>
- <td><hr /></td>
- <td><hr /></td>
- <td><hr /></td>
- <td><hr /></td>
- </tr>';
+ echo $DrawTotalLine;
}
echo '<tr>
<td colspan="2">', $ParentGroups[$Level], '</td>
@@ -223,13 +224,7 @@
$Level--;
}
if($_POST['Detail']=='Detailed') {
- echo '<tr>
- <td colspan="2"> </td>
- <td><hr /></td>
- <td><hr /></td>
- <td><hr /></td>
- <td><hr /></td>
- </tr>';
+ echo $DrawTotalLine;
}
echo '<tr>
<td class="text" colspan="2">', $ParentGroups[$Level], '</td>
@@ -245,23 +240,7 @@
}
if($myrow['sectioninaccounts'] != $Section ) {
if($Section!='') {
- if($_POST['Detail']=='Detailed') {
- echo '<tr>
- <td colspan="2"> </td>
- <td><hr /></td>
- <td><hr /></td>
- <td><hr /></td>
- <td><hr /></td>
- </tr>';
- } else {
- echo '<tr>
- <td colspan="2"> </td>
- <td><hr /></td>
- <td><hr /></td>
- <td><hr /></td>
- <td><hr /></td>
- </tr>';
- }
+ echo $DrawTotalLine;
echo '<tr>
<td class="text" colspan="2"><h2>', $Sections[$Section], '</h2></td>
<td class="number"><h2>', locale_number_format($SectionBalance,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
@@ -329,13 +308,7 @@
while($myrow['groupname']!=$ParentGroups[$Level] AND $Level>0) {
if($_POST['Detail']=='Detailed') {
- echo '<tr>
- <td colspan="2"> </td>
- <td><hr /></td>
- <td><hr /></td>
- <td><hr /></td>
- <td><hr /></td>
- </tr>';
+ echo $DrawTotalLine;
}
echo '<tr>
<td colspan="2">', $ParentGroups[$Level], '</td>
@@ -347,13 +320,7 @@
$Level--;
}
if($_POST['Detail']=='Detailed') {
- echo '<tr>
- <td colspan="2"> </td>
- <td><hr /></td>
- <td><hr /></td>
- <td><hr /></td>
- <td><hr /></td>
- </tr>';
+ echo $DrawTotalLine;
}
echo '<tr>
<td colspan="2">', $ParentGroups[$Level], '</td>
@@ -362,14 +329,8 @@
<td class="number">', locale_number_format(-$GroupTotal[$Level]+$GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', RelativeVariation(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td>
</tr>';
+ echo $DrawTotalLine;
echo '<tr>
- <td colspan="2"> </td>
- <td><hr /></td>
- <td><hr /></td>
- <td><hr /></td>
- <td><hr /></td>
- </tr>';
- echo '<tr>
<td colspan="2"><h2>', $Sections[$Section], '</h2></td>
<td class="number"><h2>', locale_number_format($SectionBalance,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format($SectionBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
@@ -384,13 +345,7 @@
<td colspan="6"><h2>', $Sections[$myrow['sectioninaccounts']], '</h2></td>
</tr>';
}
- echo '<tr>
- <td colspan="2"> </td>
- <td><hr /></td>
- <td><hr /></td>
- <td><hr /></td>
- <td><hr /></td>
- </tr>';
+ echo $DrawTotalLine;
echo'<tr>
<td colspan="2"><h2>', _('Check Total'), '</h2></td>
<td class="number"><h2>', locale_number_format($CheckTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
@@ -398,13 +353,7 @@
<td class="number"><h2>', locale_number_format(-$CheckTotal+$CheckTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', RelativeVariation(-$CheckTotal,-$CheckTotalLY), '</h2></td>
</tr>';
- echo '<tr>
- <td colspan="2"> </td>
- <td><hr /></td>
- <td><hr /></td>
- <td><hr /></td>
- <td><hr /></td>
- </tr>';
+ echo $DrawTotalLine;
echo '</tbody>', // See comment at the begin of the table.
'</table>
</div>'; // Close div id="Report".
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-08-13 18:51:07 UTC (rev 7338)
+++ trunk/doc/Change.log 2015-08-14 01:28:22 UTC (rev 7339)
@@ -1,5 +1,6 @@
webERP Change Log
+13/08/15 RChacon: In doc/ManualGeneralLedger.html, add help for the horizontal analysis.
13/08/15 RChacon: Add new script AnalysisHorizontalIncome.php to generate an horizontal analysis of the statement of comprehensive income. In AnalysisHorizontalPosition.php, adjust signs and add report footnote.
05/08/15 RChacon: In AnalysisHorizontalPosition.php, modify DB_fetch_array() function because it requires only one parameter (thanks Tim). Other improvements.
04/08/15 RChacon: Add new script AnalysisHorizontalPosition.php to generate an horizontal analysis of the statement of financial position.
Modified: trunk/doc/Manual/ManualGeneralLedger.html
===================================================================
--- trunk/doc/Manual/ManualGeneralLedger.html 2015-08-13 18:51:07 UTC (rev 7338)
+++ trunk/doc/Manual/ManualGeneralLedger.html 2015-08-14 01:28:22 UTC (rev 7339)
@@ -329,12 +329,6 @@
<p>The inquiry can be selected by choosing "Bank Transactions Inquiry" from the Inquiries/Reports menu in the General Ledger module.</p>
</li>
<li>
- <h3><a id="ProfitAndLoss">Profit and Loss Account</a></h3>
- <p>Profit and Loss statement (P&L), also called an Income Statement, or Statement of Operations can be accessed by choosing the "Profit and Loss Statement" option from the Reports/Inquiries menu in the General Ledger module. This is the statement that indicates how the revenue (money received from the sale of products and services before expenses are taken out, also known as the "top line") is transformed into the net income (the result after all revenues and expenses have been accounted for, also known as the "bottom line").</p>
- <p>The purpose of the income statement is to show whether the company made or lost money during the period being reported. The P&L is reported for a user selectable range of periods.</p>
- <p>The Profit and Loss report can be run as a pdf file for later printing, emailing, or archiving, or it can be shown on screen. It can be run in summary mode - just showing the totals for each account group, or in detailed mode listing each general ledger account balance for all profit and loss accounts grouped by account group.</p>
- </li>
- <li>
<h3><a id="BalanceSheet">Balance Sheet</a></h3>
<p>Balance Sheet (or Statement of Financial Position) is a summary of balances. Assets, liabilities and ownership equity is listed as at a period end. It be accessed by choosing the "Balance Sheet" option from the Reports/Inquiries menu in the General Ledger module.</p>
<p>The balance sheet has three parts: assets, liabilities and ownership equity. The main categories of assets are listed first and are followed by the liabilities. The difference between the assets and the liabilities is known as equity or the net assets or the net worth or capital of the company and according to the accounting equation, net worth must equal assets minus liabilities.</p>
@@ -342,6 +336,55 @@
<p>The report can be run as a pdf file for later printing, emailing, or archiving, or it can be shown on screen. It can be run in summary mode - just showing the totals for each account group, or in detailed mode listing each general ledger account balance for all balance sheet accounts grouped by account group.</p>
</li>
<li>
+ <h3><a id="ProfitAndLoss">Profit and Loss Statement</a></h3>
+ <p>Profit and Loss statement (P&L), also called an Income Statement, or Statement of Operations can be accessed by choosing the "Profit and Loss Statement" option from the Reports/Inquiries menu in the General Ledger module. This is the statement that indicates how the revenue (money received from the sale of products and services before expenses are taken out, also known as the "top line") is transformed into the net income (the result after all revenues and expenses have been accounted for, also known as the "bottom line").</p>
+ <p>The purpose of the income statement is to show whether the company made or lost money during the period being reported. The P&L is reported for a user selectable range of periods.</p>
+ <p>The Profit and Loss report can be run as a pdf file for later printing, emailing, or archiving, or it can be shown on screen. It can be run in summary mode - just showing the totals for each account group, or in detailed mode listing each general ledger account balance for all profit and loss accounts grouped by account group.</p>
+ </li>
+<!-- ----------------------------------------------------------------------- -->
+ <li>
+ <h3><a id="GLChangesInEquity">Statement of Changes in Equity</a></h3>
+ <p>The statement of changes in equity, often referred to as statement of retained earnings, details the change in owners' equity over an accounting period by presenting the movement in reserves comprising the shareholders' equity.</p>
+ <p>The purpose of the statement of changes in equity is to show the changes in a company's retained earnings during the period being reported.</p>
+ <p>The changes in equity report can be run as a pdf file for later printing, emailing, or archiving, or it can be shown on screen. It can be run in summary mode - just showing the totals for each account group, or in detailed mode listing each general ledger account balance for all profit and loss accounts grouped by account group.</p>
+ </li>
+ <li>
+ <h3><a id="GLCashFlows">Statement of Cash Flows</a></h3>
+ <p>Because the statement of comprehensive income is prepared under the accrual basis of accounting, the revenues reported may not have been collected. Similarly, the expenses reported on the income statement might not have been paid.</p>
+ <p>The statement of cash flows, also known as the successor of the old source and application of funds statement, reports how changes in balance sheet accounts and income affect cash and cash equivalents, and breaks the analysis down to operating, investing and financing activities.</p>
+ <p>The purpose of the statement of cash flows is to show whether the company got their money from and how it was spent during the period being reported for a user selectable range of periods.</p>
+ <p>The cash flows report can be run as a pdf file for later printing, emailing, or archiving, or it can be shown on screen. It can be run in summary mode - just showing the totals for each account group, or in detailed mode listing each general ledger account balance for all profit and loss accounts grouped by account group.</p>
+ <p>Also, the cash flows report can be generated using either direct method or indirect method. The main difference between them is the cash flows from operating activities, the first section of the statement of cash flows; there is no difference in the investing and financing activities sections.</p>
+ <h4><a id="GLCashFlowsDirect">Statement of Cash Flows using Direct Method</a></h4>
+ <p>The cash flows from operating activities will show lines such as cash from customers and cash paid to suppliers. "<i>Major classes of gross cash receipts and gross cash payments are disclosed</i>" (Reference: IAS 7, paragraph 18).</p>
+ <h4><a id="GLCashFlowsIndirect">Statement of Cash Flows using Indirect Method</a></h4>
+ <p>The cash flows from operating activities will include net income followed by the adjustments needed to convert the total net income to the cash amount from operating activities. "<i>Profit or loss is adjusted for the effects of transactions of a non-cash nature, any deferrals or accruals of past or future operating cash receipts or payments, and items of income or expense associated with investing or financing cash flows</i>" (Reference: IAS 7, paragraph 18).</p>
+ </li>
+ <li>
+ <h3><a id="AnalysisHorizontal">Horizontal analysis</a></h3>
+ <p>The horizontal analysis, also known as trend analysis, is a financial statement analysis technique that shows changes in the amounts of corresponding financial statement items over a period of time. It is a useful tool to evaluate trend situations.</p>
+ <p>The statements for two periods are used in horizontal analysis. The earliest period is used as the base period. The items on the later statement are compared with items on the statement of the base period. The changes are shown both in currency (absolute variation) and percentage (relative variation).</p>
+ <p>The absolute variation is calculated as <i>selected_period</i> - <i>previous_period</i>.
+ <p>The relative variation is calculated as (<i>selected_period</i> - <i>previous_period</i>) / <i>previous_period</i> * 100.
+ <h4><a id="AnalysisHorizontalPosition">Horizontal Analysis of Statement of Financial Position</a></h4>
+ <p>The debit amounts (assets) of the selected and previous statement of financial position are shown as positive numbers; the credit amounts (liabilities and equity) are shown as negative numbers.</p>
+ <p>The sources of funds are shown as positive numbers in the absolute variation column; the applications of funds are shown as negative numbers in the absolute variation column.</p>
+ <p>The increasing items are shown as positive numbers in the relative variation column; the decreasing items are shown as negative numbers in the relative variation column.</p>
+ <h4><a id="AnalysisHorizontalIncome">Horizontal Analysis of Statement of Comprehensive Income</a></h4>
+ <p>The debit amounts (revenues) of the selected and previous statement of comprehensive income are shown as positive numbers; the credit amounts (costs and expenses) are shown as negative numbers.</p>
+ <p>The changes that increases the net profit are shown as positive numbers in the absolute variation column; the changes that decreases the net profit are shown as negative numbers in the absolute variation column.</p>
+ <p>The increasing items are shown as positive numbers in the relative variation column; the decreasing items are shown as negative numbers in the relative variation column.</p>
+ <h4><a id="AnalysisHorizontalChangesInEquity">Horizontal Analysis of Statement of Changes in Equity</a></h4>
+ <p>.</p>
+ <p>The changes that increases the retained earnings are shown as positive numbers in the absolute variation column; the changes that decreases the retained earnings are shown as negative numbers in the absolute variation column.</p>
+ <p>The increasing items are shown as positive numbers in the relative variation column; the decreasing items are shown as negative numbers in the relative variation column.</p>
+ <h4><a id="AnalysisHorizontalCashFlows">Horizontal Analysis of Statement of Cash Flows</a></h4>
+ <p>The source amounts (where the money has come from) of the selected and previous statement of cash flows are shown as positive amounts; the application amounts (where the money has gone) are shown as negative amounts.</p>
+ <p>The changes that increases the cash and cash equivalents are shown as positive numbers in the absolute variation column; the changes that decreases the cash and cash equivalents are shown as negative numbers in the absolute variation column.</p>
+ <p>The increasing items are shown as positive numbers in the relative variation column; the decreasing items are shown as negative numbers in the relative variation column.</p>
+ </li>
+<!-- ----------------------------------------------------------------------- -->
+ <li>
<h3><a id="TagReports">Tag Reports</a></h3>
<p>An Income an Expenditure report can be produced, filtered by individual tags. So for instance following the example above, if you wished to view the costs associated with a particular vehicle you can run this report selecting the appropriate tag for the vehicle to report on to find the information.</p>
<p>As with the Profit And Loss report, this can be produced as an on screen report, or as a pdf.</p>
|
|
From: <dai...@us...> - 2015-08-16 05:08:09
|
Revision: 7341
http://sourceforge.net/p/web-erp/reponame/7341
Author: daintree
Date: 2015-08-16 05:08:07 +0000 (Sun, 16 Aug 2015)
Log Message:
-----------
translation manual updates
Modified Paths:
--------------
trunk/doc/Manual/ManualMultilanguage.html
trunk/index.php
Added Paths:
-----------
trunk/doc/Manual/images/UserSettings.png
Modified: trunk/doc/Manual/ManualMultilanguage.html
===================================================================
--- trunk/doc/Manual/ManualMultilanguage.html 2015-08-14 13:54:06 UTC (rev 7340)
+++ trunk/doc/Manual/ManualMultilanguage.html 2015-08-16 05:08:07 UTC (rev 7341)
@@ -1,18 +1,20 @@
<h1><a id="Multilanguage">Multilanguage</a></h1>
<p>webERP can be translated to any language so that the entire web-interface is displayed in the language of any user. The system can display different languages for different users - all at the same time - depending on the setting of the language in the individual users' settings.</p>
+<p>Each user can select their language by clicking on their user name at the top left of every screen immediately to the right of the company name. Clicking on your user name this brings up the user settings screen below:</p>
+<img src="images/UserSettings.png" alt="User Settings Screen" />
+<p>A dropdown box displaying all the available translations is available. Also, the character set of PDFs must also be selected from the 3 choices to create small portable pdf files using the CID fonts bundled with webERP. The preferred user display theme can also be selected from this screen.</p>
-<p>The recommended procedure to create a translation is as follows:<br></p>
+<h2>Other Language Translations</h2>
+<p>If your language is not listed in the drop down box it is possible to create a new translation. The recommended procedure to create a translation is as follows:</p>
+
<ol>
<li><a href="http://lists.sourceforge.net/lists/listinfo/web-erp-translation">Join the mailing list here</a><br>
Let the list know you're wanting to help with a translation - someone may already be working on it.</li>
<li>Obtain the latest messages.po file and enter the translations using your favourite editor (or poedit). The latest messages.po file is included with the latest archive:<br />www_root/webERP/locale/en_GB/LC_MESSAGES/message.po<br />Edit the file provided entering the translations for the strings labelled msgid in the string labelled msgstr. Watch for html strings embedded inside the strings the html will also be required in the translated string. Also be sure to ensure that each translated string is enclosed in speech marks ("). Please also complete the translation file header information - with your details so that you are accorded proper recognition for your contribution.</li>
</ol>
-
-<p>It is especially important to ensure that the string "ISO-8859-1" (at the time of writing around line 19400 in the messages.po file) is translated to be the character set that you wish your translation to use. webERP uses the translated string here to send appropriate html headers so your browser knows how to interpret the characters sent.</p>
-
<p>It is worthwhile investigating the poedit package as this has some time saving features for creating gettext translation files.</p>
<p>Return the file containing your translations to sub...@we...</p>
@@ -43,7 +45,7 @@
<h3>Understanding the messages.po File</h3>
-<p>The translation is performed by translating the strings in the messages.po file into the other language. It is important to work on the most recent messages.po file from the locale/en_GB/LC_MESSAGES/ directory in the CVS. This can be downloaded from http://web-erp.cvs.sourceforge.net/viewvc/*checkout*/web-erp/webERP/locale/en_GB/LC_MESSAGES/messages.po</p>
+<p>The translation is performed by translating the strings in the messages.po file into the other language. It is important to work on the most recent messages.po file from the locale/en_GB-utf8/LC_MESSAGES/ directory in the SVN. This can be downloaded from <a href="https://sourceforge.net/p/web-erp/code/HEAD/tree/trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot">the subversion repository</a></p>
<p>The messages.po is made up of sections</p>
@@ -59,8 +61,39 @@
<p>msgid "An example string in English that needs to be translated"<br>
this line is the english string which is to be substituted by the text in msgstr. If the value of msgstr is empty - "". gettext will return the english string.</p>
-<p>The effort of the translation is to edit the messages.po file and enter the language translation within the inverted commas of the msgstr.</p>
+<p>The effort of the translation is to edit the messages.po file and enter the language translation within the inverted commas of the msgstr. All that is required then is to take the messages.po file from the en_GB-utf8/LC_MESSAGES folder and edit it with translations for your language.</p>
+<p>Make a copy and edit the file provided entering the translations for the strings labelled msgid in the string labelled msgstr. Although every attempt has been made to avoid it, watch out for html strings embedded inside the strings the html will also be required in the translated string. Also the translation file header information - with the translators details so that you are accorded proper recognition for your contribution.</p>
+<p>A new folder under webERP/locale/ needs to be created with the locale abbreviation for your language - note that webERP requires utf-8 locales - some examples:</p>
+<ol>
+<li>fr_FR.utf8 - French</li>
+<li>en_US.utf8 - English US</li>
+<li>de_DE.utf8 - German</li>
+</ol>
+<p>say you are creating a German translation you need to create the folder</p>
+<p>webERP/locale/de_DE.utf8</p>
+<p>and the folder below this called LC_MESSAGES</p>
+<p>webERP/locale/de_DE.utf8/LC_MESSAGES</p>
+<h3><a id="LanguagesArray">The Languges Array</a></h3>
+
+<p>To allow the language to be selected it must exist in the webERP $LanguagesArray this is an array of all available languages that webERP has been translated into and is maintained by webERP in the file</p>
+<p>/webERP/includes/LanguagesArray.php</p>
+<p>This array as as it's key the locale code for the language for British English the locale code is en_GB.utf8 - and for each element there is a sub-array of the following named elements for each key in the Languages Array</p>
+<ol>
+ <li>LanguageName - written in the target language - so that native speakers of that language will recognise it in the list</li>
+ <li>WindowsLocale - this is the name of the locale under Microsoft Windows operating system - not the ISO system</li>
+ <li>DecimalPoint - this is the character that the language uses as a decimal point</li>
+ <li>ThousandsSeperator - this is the character that the language uses as the thousands seperator</li>
+</ol>
+<p>The characters in this array for the selected locale are used by the functions used throughout webERP in the includes/MiscFunctions.php file for locale_number_format() to display numbers in an appropriate format for the selected language.</p>
+<p>e.g.</p>
+<ol>
+<li>$LanguagesArray['en_GB.utf8']['LanguageName'] = 'English United Kingdom';</li>
+<li>$LanguagesArray['en_GB.utf8']['WindowsLocale'] = 'english-uk';</li>
+<li>$LanguagesArray['en_GB.utf8']['DecimalPoint'] = '.';</li>
+<li>$LanguagesArray['en_GB.utf8']['ThousandsSeparator'] = ',';</li>
+</ol>
+
<h3><a id="IndianNumberingSystem">Indian Numbering System</a></h3>
<p>Many people in India speak English but want to see numbers formatted in Indian Numbering System. The Indian Numbering System uses separators differently from the Arabic Numbering System; besides the three least significant digits of the integer part, a comma divides every two rather than every three digits, thus:</p>
@@ -99,54 +132,9 @@
<h4>Content-Type</h4>
-<p>Replace `CHARSET' with the character encoding used for your language, in your locale, or UTF-8.</p>
+<p>Replace `CHARSET' with UTF-8 this characters set has characters for all languages and webERP is written with care to handle mutli-byte characters (because utf-8 character set contains so many characters several bytes must be used to uniquely identify each character correctly).</p>
-<p>In the GNU system, the following encodings are frequently used for the corresponding languages:</p>
-<ul>
- <li>ISO-8859-1 for Afrikaans, Albanian, Basque, Catalan, Dutch, English, Estonian, Faroese, Finnish, French, Galician, German, Greenlandic, Icelandic, Indonesian, Irish, Italian, Malay, Norwegian, Portuguese, Spanish, Swedish,</li>
-
- <li>SO-8859-2 for Croatian, Czech, Hungarian, Polish, Romanian, Serbian, Slovak, Slovenian,</li>
-
- <li>ISO-8859-3 for Maltese,</li>
-
- <li>ISO-8859-5 for Macedonian, Serbian,</li>
-
- <li>ISO-8859-6 for Arabic,</li>
-
- <li>ISO-8859-7 for Greek,</li>
-
- <li>ISO-8859-8 for Hebrew,</li>
-
- <li>ISO-8859-9 for Turkish,</li>
-
- <li>ISO-8859-13 for Latvian, Lithuanian,</li>
-
- <li>ISO-8859-15 for Basque, Catalan, Dutch, English, Finnish, French, Galician, German, Irish, Italian, Portuguese, Spanish, Swedish,</li>
-
- <li>KOI8-R for Russian,</li>
-
- <li>KOI8-U for Ukrainian,</li>
-
- <li>CP1251 for Bulgarian, Byelorussian,</li>
-
- <li>GB2312, GBK, GB18030 for simplified writing of Chinese,</li>
-
- <li>BIG5, BIG5-HKSCS for traditional writing of Chinese,</li>
-
- <li>EUC-JP for Japanese,</li>
-
- <li>EUC-KR for Korean,</li>
-
- <li>TIS-620 for Thai,</li>
-
- <li>UTF-8 for any language, including those listed above.</li>
-</ul>
-
-<p>Since there are such a lot of potential characters in utf-8, the size of font files necessary to be embedded in pdf files makes the resulting pdf file too big to be sent over dial up connections and is therefore to be avoided in favour of the more specific character sets above.</p>
-
-<p>The character encoding name can be written in either upper or lower case. Usually upper case is preferred.</p>
-
<h4>Content-Transfer-Encoding</h4>
<p>Set this to 8bit</p>
@@ -167,7 +155,7 @@
<h2>Translation Utilities</h2>
-<p>webERP comes bundled with some on-line tools for adminstering translations - there are some issues with maintaining translations using these facilities - in particular certain characters cause problems for the scripts and character encodings can be lost. It is therefore not recommended to use these except for adhoc maintenance where a backup of the most recent messages.po is held elsewhere.</p>
+<p>webERP comes bundled with some on-line tools for adminstering translations - there are some issues with maintaining translations using these facilities - in particular certain characters cause problems for the scripts and character encodings can be lost. It is therefore NOT recommended to use these except for ad-hoc maintenance where a backup of the most recent messages.po is held elsewhere. The recommended procedure for maintaining translations are discussed above and the remainder of this narrative is depreciated.</p>
<p>The following explains how to use the language translation utilities provided with webERP for the purpose of adding languages and maintaining their translations.</p>
Added: trunk/doc/Manual/images/UserSettings.png
===================================================================
(Binary files differ)
Index: trunk/doc/Manual/images/UserSettings.png
===================================================================
--- trunk/doc/Manual/images/UserSettings.png 2015-08-14 13:54:06 UTC (rev 7340)
+++ trunk/doc/Manual/images/UserSettings.png 2015-08-16 05:08:07 UTC (rev 7341)
Property changes on: trunk/doc/Manual/images/UserSettings.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2015-08-14 13:54:06 UTC (rev 7340)
+++ trunk/index.php 2015-08-16 05:08:07 UTC (rev 7341)
@@ -193,8 +193,9 @@
reportname";
$Result=DB_query($sql,'','',false,true);
$ReportList = '';
- while ($Temp = DB_fetch_array($Result)) $ReportList[] = $Temp;
-
+ while ($Temp = DB_fetch_array($Result)) {
+ $ReportList[] = $Temp;
+ }
$RptLinks = '';
for ($Def=1; $Def>=0; $Def--) {
$RptLinks .= '<li class="menu_group_headers">';
|
|
From: <rc...@us...> - 2015-08-19 15:02:24
|
Revision: 7344
http://sourceforge.net/p/web-erp/reponame/7344
Author: rchacon
Date: 2015-08-19 15:02:21 +0000 (Wed, 19 Aug 2015)
Log Message:
-----------
In AnalysisHorizontalIncome.php, delete variable $period because it is not used anywhere (thanks Tim). Extract header.inc from if.
Modified Paths:
--------------
trunk/AnalysisHorizontalIncome.php
trunk/doc/Change.log
Modified: trunk/AnalysisHorizontalIncome.php
===================================================================
--- trunk/AnalysisHorizontalIncome.php 2015-08-19 07:37:57 UTC (rev 7343)
+++ trunk/AnalysisHorizontalIncome.php 2015-08-19 15:02:21 UTC (rev 7344)
@@ -23,9 +23,8 @@
$_POST['SelectADifferentPeriod']='Select A Different Period';
}
+include('includes/header.inc');
if((!isset($_POST['FromPeriod']) AND !isset($_POST['ToPeriod'])) OR isset($_POST['SelectADifferentPeriod'])) {
-
- include('includes/header.inc');
echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/printer.png" title="', // Icon image.
_('Print Horizontal Analysis of Statement of Comprehensive Income'), '" /> ', // Icon title.
@@ -52,7 +51,6 @@
$DefaultFromDate = Date ('Y-m-d', Mktime(0,0,0,$_SESSION['YearEnd'] + 2,0,Date('Y')-1));
$FromDate = Date($_SESSION['DefaultDateFormat'], Mktime(0,0,0,$_SESSION['YearEnd'] + 2,0,Date('Y')-1));
}
- $period=GetPeriod($FromDate, $db);
$sql = "SELECT periodno, lastdate_in_period
FROM periods
@@ -127,10 +125,7 @@
include ('includes/GLPostings.inc');
} else {
- include('includes/header.inc');
-
$NumberOfMonths = $_POST['ToPeriod'] - $_POST['FromPeriod'] + 1;
-
if($NumberOfMonths >12) {
echo '<br />';
prnMsg(_('A period up to 12 months in duration can be specified') . ' - ' . _('the system automatically shows a comparative for the same period from the previous year') . ' - ' . _('it cannot do this if a period of more than 12 months is specified') . '. ' . _('Please select an alternative period range'),'error');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-08-19 07:37:57 UTC (rev 7343)
+++ trunk/doc/Change.log 2015-08-19 15:02:21 UTC (rev 7344)
@@ -1,5 +1,6 @@
webERP Change Log
+19/08/15 RChacon: In AnalysisHorizontalIncome.php, delete variable $period because it is not used anywhere (thanks Tim). Extract header.inc from if.
13/08/15 RChacon: In doc/ManualGeneralLedger.html, add help for the horizontal analysis.
13/08/15 RChacon: Add new script AnalysisHorizontalIncome.php to generate an horizontal analysis of the statement of comprehensive income. In AnalysisHorizontalPosition.php, adjust signs and add report footnote.
05/08/15 RChacon: In AnalysisHorizontalPosition.php, modify DB_fetch_array() function because it requires only one parameter (thanks Tim). Other improvements.
|
|
From: <dai...@us...> - 2015-09-05 22:20:46
|
Revision: 7347
http://sourceforge.net/p/web-erp/reponame/7347
Author: daintree
Date: 2015-09-05 22:20:44 +0000 (Sat, 05 Sep 2015)
Log Message:
-----------
Wes Wolfenbarger: Fix to Z_ImportStocks.php
Modified Paths:
--------------
trunk/Z_ImportStocks.php
trunk/doc/Change.log
trunk/doc/Manual/ManualContributors.html
Modified: trunk/Z_ImportStocks.php
===================================================================
--- trunk/Z_ImportStocks.php 2015-08-27 08:27:16 UTC (rev 7346)
+++ trunk/Z_ImportStocks.php 2015-09-05 22:20:44 UTC (rev 7347)
@@ -1,4 +1,4 @@
-<?php
+ <?php
/* $Id$*/
include('includes/session.inc');
@@ -13,6 +13,9 @@
// If this script is called with the gettemplate flag, then a template file is served
// Otherwise, a file upload form is displayed
+// The CSV file must be saved in a format like the template in the import module I.E. "RECVALUE","RECVALUE2". The CSV file needs ANSI encoding for the import to work properly.
+
+
$FieldHeadings = array(
'StockID', // 0 'STOCKID',
'Description', // 1 'DESCRIPTION',
@@ -49,7 +52,7 @@
$FileHandle = fopen($TempName, 'r');
//get the header row
- $headRow = fgetcsv($FileHandle, 10000, ",");
+ $headRow = fgetcsv($FileHandle, 10000, ",",'"'); // Modified to handle " "" " enclosed csv - useful if you need to include commas in your text descriptions
//check for correct number of fields
if ( count($headRow) != count($FieldHeadings) ) {
@@ -63,7 +66,7 @@
$head = 0;
foreach ($headRow as $headField) {
if ( mb_strtoupper($headField) != mb_strtoupper($FieldHeadings[$head]) ) {
- prnMsg (_('File contains incorrect headers ('. mb_strtoupper($headField). ' != '. mb_strtoupper($header[$head]). '. Try downloading a new template.'),'error');
+ prnMsg (_('File contains incorrect headers '. mb_strtoupper($headField). ' != '. mb_strtoupper($FieldHeadings[$head]). '. Try downloading a new template.'),'error'); //Fixed $FieldHeadings from $headings
fclose($FileHandle);
include('includes/footer.inc');
exit;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-08-27 08:27:16 UTC (rev 7346)
+++ trunk/doc/Change.log 2015-09-05 22:20:44 UTC (rev 7347)
@@ -1,5 +1,6 @@
webERP Change Log
+4/9/15 Wes Wolfenbarger: Fix to Z_ImportStocks.php added quotes to descriptions - also fixes error message when the csv does not match the template
27/08/15 Exson: Fixed the allocation status of involved invoice and credit notes in Credit_Invoice.php.
19/08/15 RChacon: In AnalysisHorizontalIncome.php, delete variable $period because it is not used anywhere (thanks Tim). Extract header.inc from if.
13/08/15 RChacon: In doc/ManualGeneralLedger.html, add help for the horizontal analysis.
Modified: trunk/doc/Manual/ManualContributors.html
===================================================================
--- trunk/doc/Manual/ManualContributors.html 2015-08-27 08:27:16 UTC (rev 7346)
+++ trunk/doc/Manual/ManualContributors.html 2015-09-05 22:20:44 UTC (rev 7347)
@@ -168,6 +168,8 @@
<br />
Jeff Trickett<br />
<br />
+ Wes Wolfenbarger
+ <br />
Mark Yeager (MRP)<br />
<br />
Zhiguo Yuan</td>
|
|
From: <rc...@us...> - 2015-09-13 17:21:50
|
Revision: 7348
http://sourceforge.net/p/web-erp/reponame/7348
Author: rchacon
Date: 2015-09-13 17:21:49 +0000 (Sun, 13 Sep 2015)
Log Message:
-----------
In AccountSections.php, add modifications for direct printing.
Modified Paths:
--------------
trunk/AccountSections.php
trunk/doc/Change.log
Modified: trunk/AccountSections.php
===================================================================
--- trunk/AccountSections.php 2015-09-05 22:20:44 UTC (rev 7347)
+++ trunk/AccountSections.php 2015-09-13 17:21:49 UTC (rev 7348)
@@ -1,11 +1,11 @@
<?php
/* $Id$*/
+/* Defines the sections in the general ledger reports. */
include('includes/session.inc');
$Title = _('Account Sections');
-/* Manual links before header.inc */
-$ViewTopic = 'GeneralLedger';// Filename in ManualContents.php's TOC.
-$BookMark = 'AccountSections';// Anchor's id in the manual's html document.
+$ViewTopic = 'GeneralLedger';
+$BookMark = 'AccountSections';
include('includes/header.inc');
// SOME TEST TO ENSURE THAT AT LEAST INCOME AND COST OF SALES ARE THERE
@@ -33,13 +33,13 @@
// DONE WITH MINIMUM TESTS
-if (isset($Errors)) {
+if(isset($Errors)) {
unset($Errors);
}
$Errors = array();
-if (isset($_POST['submit'])) {
+if(isset($_POST['submit'])) {
//initialise no input errors assumed initially before we test
@@ -50,45 +50,45 @@
ie the page has called itself with some user input */
//first off validate inputs sensible
- if (isset($_POST['SectionID'])) {
+ if(isset($_POST['SectionID'])) {
$sql="SELECT sectionid
FROM accountsection
WHERE sectionid='".$_POST['SectionID']."'";
$result=DB_query($sql);
- if ((DB_num_rows($result)!=0 AND !isset($_POST['SelectedSectionID']))) {
+ if((DB_num_rows($result)!=0 AND !isset($_POST['SelectedSectionID']))) {
$InputError = 1;
prnMsg( _('The account section already exists in the database'),'error');
$Errors[$i] = 'SectionID';
$i++;
}
}
- if (ContainsIllegalCharacters($_POST['SectionName'])) {
+ if(ContainsIllegalCharacters($_POST['SectionName'])) {
$InputError = 1;
prnMsg( _('The account section name cannot contain any illegal characters') ,'error');
$Errors[$i] = 'SectionName';
$i++;
}
- if (mb_strlen($_POST['SectionName'])==0) {
+ if(mb_strlen($_POST['SectionName'])==0) {
$InputError = 1;
prnMsg( _('The account section name must contain at least one character') ,'error');
$Errors[$i] = 'SectionName';
$i++;
}
- if (isset($_POST['SectionID']) AND (!is_numeric($_POST['SectionID']))) {
+ if(isset($_POST['SectionID']) AND (!is_numeric($_POST['SectionID']))) {
$InputError = 1;
prnMsg( _('The section number must be an integer'),'error');
$Errors[$i] = 'SectionID';
$i++;
}
- if (isset($_POST['SectionID']) AND mb_strpos($_POST['SectionID'],".")>0) {
+ if(isset($_POST['SectionID']) AND mb_strpos($_POST['SectionID'],".")>0) {
$InputError = 1;
prnMsg( _('The section number must be an integer'),'error');
$Errors[$i] = 'SectionID';
$i++;
}
- if (isset($_POST['SelectedSectionID']) AND $_POST['SelectedSectionID']!='' AND $InputError !=1) {
+ if(isset($_POST['SelectedSectionID']) AND $_POST['SelectedSectionID']!='' AND $InputError !=1) {
/*SelectedSectionID could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
@@ -96,7 +96,7 @@
WHERE sectionid = '" . $_POST['SelectedSectionID'] . "'";
$msg = _('Record Updated');
- } elseif ($InputError !=1) {
+ } elseif($InputError !=1) {
/*SelectedSectionID is null cos no item selected on first time round so must be adding a record must be submitting new entries in the new account section form */
@@ -108,7 +108,7 @@
$msg = _('Record inserted');
}
- if ($InputError!=1){
+ if($InputError!=1) {
//run the SQL from either of the above possibilites
$result = DB_query($sql);
prnMsg($msg,'success');
@@ -117,14 +117,14 @@
unset ($_POST['SectionName']);
}
-} elseif (isset($_GET['delete'])) {
+} elseif(isset($_GET['delete'])) {
//the link to delete a selected record was clicked instead of the submit button
// PREVENT DELETES IF DEPENDENT RECORDS IN 'accountgroups'
$sql= "SELECT COUNT(sectioninaccounts) AS sections FROM accountgroups WHERE sectioninaccounts='" . $_GET['SelectedSectionID'] . "'";
$result = DB_query($sql);
$myrow = DB_fetch_array($result);
- if ($myrow['sections']>0) {
+ if($myrow['sections']>0) {
prnMsg( _('Cannot delete this account section because general ledger accounts groups have been created using this section'),'warn');
echo '<div>';
echo '<br />' . _('There are') . ' ' . $myrow['sections'] . ' ' . _('general ledger accounts groups that refer to this account section');
@@ -149,7 +149,7 @@
unset ($_POST['SectionName']);
}
-if (!isset($_GET['SelectedSectionID']) AND !isset($_POST['SelectedSectionID'])) {
+if(!isset($_GET['SelectedSectionID']) AND !isset($_POST['SelectedSectionID'])) {
/* An account section could be posted when one has been edited and is being updated
or GOT when selected for modification
@@ -166,19 +166,24 @@
$ErrMsg = _('Could not get account group sections because');
$result = DB_query($sql,$ErrMsg);
- echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" />' . ' ' . $Title . '</p><br />';
+/* echo '<div id="Report">';// Division to identify the report block.*/
+ echo '<p class="page_title_text"><img alt="" class="noprint" src="', $RootPath, '/css/', $Theme,
+ '/images/maintenance.png" title="', // Icon image.
+ _('Account Sections'), '" /> ', // Icon title.
+ _('Account Sections'), '</p>';// Page title.
- echo '<table class="selection">
+ echo '<br />
+ <table class="selection">
<tr>
- <th class="ascending">' . _('Section Number') . '</th>
- <th class="ascending">' . _('Section Description') . '</th>
- <th colspan="2"> </th>
+ <th class="ascending">', _('Section Number'), '</th>
+ <th class="ascending">', _('Section Description'), '</th>
+ <th class="noprint" colspan="2"> </th>
</tr>';
$k=0; //row colour counter
while ($myrow = DB_fetch_array($result)) {
- if ($k==1){
+ if($k==1) {
echo '<tr class="EvenTableRows">';
$k=0;
} else {
@@ -186,31 +191,32 @@
$k++;
}
- echo '<td class="number">' . $myrow['sectionid'] . '</td>
- <td>' . $myrow['sectionname'] . '</td>
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedSectionID=' . urlencode($myrow['sectionid']), ENT_QUOTES, 'UTF-8') . '">' . _('Edit') . '</a></td>';
- if ( $myrow['sectionid'] == '1' or $myrow['sectionid'] == '2' ) {
- echo '<td><b>' . _('Restricted') . '</b></td>';
+ echo '<td class="number">', $myrow['sectionid'], '</td>
+ <td class="text">', $myrow['sectionname'], '</td>
+ <td class="noprint"><a href="', htmlspecialchars($_SERVER['PHP_SELF'], '?SelectedSectionID=', urlencode($myrow['sectionid']), ENT_QUOTES, 'UTF-8'), '">', _('Edit'), '</a></td>';
+ if( $myrow['sectionid'] == '1' or $myrow['sectionid'] == '2' ) {
+ echo '<td class="noprint"><b>', _('Restricted'), '</b></td>';
} else {
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedSectionID=' . urlencode($myrow['sectionid']) . '&delete=1', ENT_QUOTES, 'UTF-8') . '">' . _('Delete') . '</a></td>';
+ echo '<td class="noprint"><a href="', htmlspecialchars($_SERVER['PHP_SELF'], '?SelectedSectionID=', urlencode($myrow['sectionid']), '&delete=1', ENT_QUOTES, 'UTF-8'), '">', _('Delete'), '</a></td>';
}
echo '</tr>';
} //END WHILE LIST LOOP
echo '</table>';
+/* echo '</div>';// End div id="Report".*/
} //end of ifs and buts!
-if (isset($_POST['SelectedSectionID']) or isset($_GET['SelectedSectionID'])) {
+if(isset($_POST['SelectedSectionID']) or isset($_GET['SelectedSectionID'])) {
echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' . _('Review Account Sections') . '</a></div>';
}
-if (! isset($_GET['delete'])) {
+if(! isset($_GET['delete'])) {
- echo '<form method="post" id="AccountSections" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
- echo '<div><br />';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" id="AccountSections" method="post">';
+ echo '<div class="noprint"><br />';
+ echo '<input name="FormID" type="hidden" value="', $_SESSION['FormID'], '" />';
- if (isset($_GET['SelectedSectionID'])) {
+ if(isset($_GET['SelectedSectionID'])) {
//editing an existing section
$sql = "SELECT sectionid,
@@ -219,7 +225,7 @@
WHERE sectionid='" . $_GET['SelectedSectionID'] ."'";
$result = DB_query($sql);
- if ( DB_num_rows($result) == 0 ) {
+ if( DB_num_rows($result) == 0 ) {
prnMsg( _('Could not retrieve the requested section please try again.'),'warn');
unset($_GET['SelectedSectionID']);
} else {
@@ -238,13 +244,13 @@
} else {
- if (!isset($_POST['SelectedSectionID'])){
+ if(!isset($_POST['SelectedSectionID'])) {
$_POST['SelectedSectionID']='';
}
- if (!isset($_POST['SectionID'])){
+ if(!isset($_POST['SectionID'])) {
$_POST['SectionID']='';
}
- if (!isset($_POST['SectionName'])) {
+ if(!isset($_POST['SectionName'])) {
$_POST['SectionName']='';
}
echo '<table class="selection">
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-09-05 22:20:44 UTC (rev 7347)
+++ trunk/doc/Change.log 2015-09-13 17:21:49 UTC (rev 7348)
@@ -1,5 +1,6 @@
webERP Change Log
+13/9/15 RChacon: In AccountSections.php, add modifications for direct printing.
4/9/15 Wes Wolfenbarger: Fix to Z_ImportStocks.php added quotes to descriptions - also fixes error message when the csv does not match the template
27/08/15 Exson: Fixed the allocation status of involved invoice and credit notes in Credit_Invoice.php.
19/08/15 RChacon: In AnalysisHorizontalIncome.php, delete variable $period because it is not used anywhere (thanks Tim). Extract header.inc from if.
|
|
From: <rc...@us...> - 2015-09-14 14:43:22
|
Revision: 7349
http://sourceforge.net/p/web-erp/reponame/7349
Author: rchacon
Date: 2015-09-14 14:43:19 +0000 (Mon, 14 Sep 2015)
Log Message:
-----------
In AnalysisHorizontalIncome.php, delete duplicated tag. Replaces text "Absolute/Relative variation" with "Absolute/Relative difference" to avoid confusions.
Modified Paths:
--------------
trunk/AnalysisHorizontalIncome.php
trunk/AnalysisHorizontalPosition.php
trunk/doc/Change.log
Modified: trunk/AnalysisHorizontalIncome.php
===================================================================
--- trunk/AnalysisHorizontalIncome.php 2015-09-13 17:21:49 UTC (rev 7348)
+++ trunk/AnalysisHorizontalIncome.php 2015-09-14 14:43:19 UTC (rev 7349)
@@ -2,8 +2,8 @@
/* $Id: AnalysisHorizontalIncome.php 7332 2015-08-04 03:27:51Z rchacon $*/
/* Shows the horizontal analysis of the statement of comprehensive income. */
-function RelativeVariation($SelectedPeriod, $PreviousPeriod) {
- // Calculates the relative variation between selected and previous periods. Uses percent in locale number format.
+function RelativeDifference($SelectedPeriod, $PreviousPeriod) {
+ // Calculates the relative difference between selected and previous periods. Uses percent in locale number format.
if($PreviousPeriod<>0) {
return locale_number_format(($SelectedPeriod-$PreviousPeriod)*100/$PreviousPeriod,$_SESSION['CompanyRecord']['decimalplaces']) . '%';
} else {
@@ -16,7 +16,7 @@
$ViewTopic= 'GeneralLedger';// Filename's id in ManualContents.php's TOC.
$BookMark = 'AnalysisHorizontalIncome';// Anchor's id in the manual's html document.
include('includes/SQL_CommonFunctions.inc');
-include('includes/AccountSectionsDef.inc'); // This loads the $Sections variable
+include('includes/AccountSectionsDef.inc');// This loads the $Sections variable
if(isset($_POST['FromPeriod']) and ($_POST['FromPeriod'] > $_POST['ToPeriod'])) {
prnMsg(_('The selected period from is actually after the period to') . '! ' . _('Please reselect the reporting period'),'error');
@@ -32,7 +32,7 @@
echo '<div class="page_help_text">',
_('Horizontal analysis (also known as trend analysis) is a financial statement analysis technique that shows changes in the amounts of corresponding financial statement items over a period of time. It is a useful tool to evaluate trend situations.'), '<br />',
- _('The statements for two periods are used in horizontal analysis. The earliest period is used as the base period. The items on the later statement are compared with items on the statement of the base period. The changes are shown both in currency (absolute variation) and percentage (relative variation).'), '<br />',
+ _('The statements for two periods are used in horizontal analysis. The earliest period is used as the base period. The items on the later statement are compared with items on the statement of the base period. The changes are shown both in currency (absolute difference) and percentage (relative difference).'), '<br />',
_('webERP is an "accrual" based system (not a "cash based" system). Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.'), '</div>',
// Show a form to allow input of criteria for the report to show:
'<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '">',
@@ -140,7 +140,6 @@
// Page title as IAS 1, numerals 10 and 51:
include_once('includes/CurrenciesArray.php');// Array to retrieve currency name.
- echo '<div id="Report">';// Division to identify the report block.
echo '<div id="Report">', // Division to identify the report block.
'<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/gl.png" title="', // Icon image.
@@ -160,16 +159,16 @@
}
echo '<th class="number">', ' - ', $myrow[0], '</th>
<th class="number">', _('Last Year'), '</th>
- <th class="number">', _('Absolute variation'), '</th>
- <th class="number">', _('Relative variation'), '</th>
+ <th class="number">', _('Absolute difference'), '</th>
+ <th class="number">', _('Relative difference'), '</th>
</tr>
</thead>
<tfoot>
<tr>
- <td class="text" colspan="6">',// Prints an explanation of signs in absolute and relative variations:
+ <td class="text" colspan="6">',// Prints an explanation of signs in absolute and relative differences:
'<br /><b>', _('Notes'), ':</b><br />',
- _('Absolute variation signs: a positive number indicates a variation that increases the net profit; a negative number indicates a variation that decreases the net profit.'), '<br />',
- _('Relative variation signs: a positive number indicates an increase in the amount of that account; a negative number indicates a decrease in the amount of that account.'), '<br />',
+ _('Absolute difference signs: a positive number indicates a variation that increases the net profit; a negative number indicates a variation that decreases the net profit.'), '<br />',
+ _('Relative difference signs: a positive number indicates an increase in the amount of that account; a negative number indicates a decrease in the amount of that account.'), '<br />',
'</td>
</tr>
</tfoot>
@@ -237,7 +236,7 @@
<td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
+ <td class="number">', RelativeDifference(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
</tr>';
$GrpTotal[$Level]=0;
$GrpTotalLY[$Level]=0;
@@ -261,7 +260,7 @@
<td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
+ <td class="number">', RelativeDifference(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
</tr>';
} else {// Costs
// <---
@@ -270,7 +269,7 @@
<td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
+ <td class="number">', RelativeDifference(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
</tr>';
// --->
}
@@ -292,7 +291,7 @@
<td class="number"><h2>', locale_number_format(-$SectionTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionTotal+$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeVariation(-$SectionTotal,-$SectionTotalLY), '</h2></td>
+ <td class="number"><h2>', RelativeDifference(-$SectionTotal,-$SectionTotalLY), '</h2></td>
</tr>';
$GPIncome = $SectionTotal;
$GPIncomeLY = $SectionTotalLY;
@@ -302,7 +301,7 @@
<td class="number"><h2>', locale_number_format(-$SectionTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionTotal+$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeVariation(-$SectionTotal,-$SectionTotalLY), '</h2></td>
+ <td class="number"><h2>', RelativeDifference(-$SectionTotal,-$SectionTotalLY), '</h2></td>
</tr>';
}
@@ -313,7 +312,7 @@
<td class="number"><h2>', locale_number_format(-($GPIncome+$SectionTotal),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-($GPIncomeLY+$SectionTotalLY),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-($GPIncome+$SectionTotal)+($GPIncomeLY+$SectionTotalLY),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeVariation(-($GPIncome+$SectionTotal),-($GPIncomeLY+$SectionTotalLY)), '</h2></td>
+ <td class="number"><h2>', RelativeDifference(-($GPIncome+$SectionTotal),-($GPIncomeLY+$SectionTotalLY)), '</h2></td>
</tr>';
}
@@ -324,7 +323,7 @@
<td class="number"><h2>', locale_number_format(-$PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$PeriodTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$PeriodTotal+$PeriodTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeVariation(-$PeriodTotal,-$PeriodTotalLY), '</h2></td>
+ <td class="number"><h2>', RelativeDifference(-$PeriodTotal,-$PeriodTotalLY), '</h2></td>
</tr>';
echo $DrawTotalLine;
}
@@ -384,7 +383,7 @@
<td class="number">', locale_number_format(-$AccountTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$AccountTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$AccountTotal+$AccountTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation(-$AccountTotal,-$AccountTotalLY), '</td>
+ <td class="number">', RelativeDifference(-$AccountTotal,-$AccountTotalLY), '</td>
</tr>';
} else {
// <---
@@ -392,7 +391,7 @@
<td class="number">', locale_number_format(-$AccountTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$AccountTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$AccountTotal+$AccountTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation(-$AccountTotal,-$AccountTotalLY), '</td>
+ <td class="number">', RelativeDifference(-$AccountTotal,-$AccountTotalLY), '</td>
</tr>';
}
}
@@ -415,7 +414,7 @@
<td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
+ <td class="number">', RelativeDifference(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
</tr>';
} else {// Costs.
// <---
@@ -424,7 +423,7 @@
<td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
+ <td class="number">', RelativeDifference(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
</tr>';
}
$GrpTotal[$Level]=0;
@@ -444,7 +443,7 @@
<td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
+ <td class="number">', RelativeDifference(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
</tr>';
$GrpTotal[$Level]=0;
$GrpTotalLY[$Level]=0;
@@ -461,7 +460,7 @@
<td class="number"><h2>', locale_number_format(-$SectionTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionTotal+$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeVariation(-$SectionTotal,-$SectionTotalLY), '</h2></td>
+ <td class="number"><h2>', RelativeDifference(-$SectionTotal,-$SectionTotalLY), '</h2></td>
</tr>';
$GPIncome = $SectionTotal;
$GPIncomeLY = $SectionTotalLY;
@@ -472,7 +471,7 @@
<td class="number"><h2>', locale_number_format(-$SectionTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionTotal+$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeVariation(-$SectionTotal,-$SectionTotalLY), '</h2></td>
+ <td class="number"><h2>', RelativeDifference(-$SectionTotal,-$SectionTotalLY), '</h2></td>
</tr>';
}
if($Section==2) {// Cost of Sales - need sub total for Gross Profit.
@@ -482,7 +481,7 @@
<td class="number"><h2>', locale_number_format(-($GPIncome+$SectionTotal),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-($GPIncomeLY+$SectionTotalLY),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-($GPIncome+$SectionTotal)+($GPIncomeLY+$SectionTotalLY),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeVariation(-($GPIncome+$SectionTotal),-($GPIncomeLY+$SectionTotalLY)), '</h2></td>
+ <td class="number"><h2>', RelativeDifference(-($GPIncome+$SectionTotal),-($GPIncomeLY+$SectionTotalLY)), '</h2></td>
</tr>';
}
$Section = $myrow['sectioninaccounts'];
@@ -502,12 +501,12 @@
<td class="number"><h2>', locale_number_format(-$PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$PeriodTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$PeriodTotal+$PeriodTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeVariation(-$PeriodTotal,-$PeriodTotalLY), '</h2></td>
+ <td class="number"><h2>', RelativeDifference(-$PeriodTotal,-$PeriodTotalLY), '</h2></td>
</tr>';
echo $DrawTotalLine;
echo '</tbody>', // See comment at the begin of the table.
'</table>
- </div>'; // Close div id="Report".
+ </div>';// End div id="Report".
echo '<br />',
'<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '">',
'<input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />',
Modified: trunk/AnalysisHorizontalPosition.php
===================================================================
--- trunk/AnalysisHorizontalPosition.php 2015-09-13 17:21:49 UTC (rev 7348)
+++ trunk/AnalysisHorizontalPosition.php 2015-09-14 14:43:19 UTC (rev 7349)
@@ -2,8 +2,8 @@
/* $Id: AnalysisHorizontalPosition.php 7338 2015-08-13 18:51:07Z rchacon $*/
/* Shows the horizontal analysis of the statement of financial position. */
-function RelativeVariation($SelectedPeriod, $PreviousPeriod) {
- // Calculates the relative variation between selected and previous periods. Uses percent in locale number format.
+function RelativeDifference($SelectedPeriod, $PreviousPeriod) {
+ // Calculates the relative difference between selected and previous periods. Uses percent in locale number format.
if($PreviousPeriod<>0) {
return locale_number_format(($SelectedPeriod-$PreviousPeriod)*100/$PreviousPeriod,$_SESSION['CompanyRecord']['decimalplaces']) . '%';
} else {
@@ -29,7 +29,7 @@
echo '<div class="page_help_text">',
_('Horizontal analysis (also known as trend analysis) is a financial statement analysis technique that shows changes in the amounts of corresponding financial statement items over a period of time. It is a useful tool to evaluate trend situations.'), '<br />',
- _('The statements for two periods are used in horizontal analysis. The earliest period is used as the base period. The items on the later statement are compared with items on the statement of the base period. The changes are shown both in currency (absolute variation) and percentage (relative variation).'), '<br />',
+ _('The statements for two periods are used in horizontal analysis. The earliest period is used as the base period. The items on the later statement are compared with items on the statement of the base period. The changes are shown both in currency (absolute difference) and percentage (relative difference).'), '<br />',
_('webERP is an "accrual" based system (not a "cash based" system). Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.'), '</div>',
// Show a form to allow input of criteria for the report to show:
'<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '">',
@@ -122,16 +122,16 @@
}
echo '<th class="number">', $BalanceDate, '</th>
<th class="number">', _('Last Year'), '</th>
- <th class="number">', _('Absolute variation'), '</th>
- <th class="number">', _('Relative variation'), '</th>
+ <th class="number">', _('Absolute difference'), '</th>
+ <th class="number">', _('Relative difference'), '</th>
</tr>
</thead>
<tfoot>
<tr>
- <td class="text" colspan="6">',// Prints an explanation of signs in absolute and relative variations:
+ <td class="text" colspan="6">',// Prints an explanation of signs in absolute and relative differences:
'<br /><b>', _('Notes'), ':</b><br />',
- _('Absolute variation signs: a positive number indicates a source of funds; a negative number indicates an application of funds.'), '<br />',
- _('Relative variation signs: a positive number indicates an increase in the amount of that account; a negative number indicates a decrease in the amount of that account.'), '<br />',
+ _('Absolute difference signs: a positive number indicates a source of funds; a negative number indicates an application of funds.'), '<br />',
+ _('Relative difference signs: a positive number indicates an increase in the amount of that account; a negative number indicates a decrease in the amount of that account.'), '<br />',
'</td>
</tr>
</tfoot>
@@ -216,7 +216,7 @@
<td class="number">', locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format($GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GroupTotal[$Level]+$GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td>
+ <td class="number">', RelativeDifference(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td>
</tr>';
$GroupTotal[$Level]=0;
$GroupTotalLY[$Level]=0;
@@ -231,7 +231,7 @@
<td class="number">', locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format($GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GroupTotal[$Level]+$GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td>
+ <td class="number">', RelativeDifference(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td>
</tr>';
$GroupTotal[$Level]=0;
$GroupTotalLY[$Level]=0;
@@ -246,7 +246,7 @@
<td class="number"><h2>', locale_number_format($SectionBalance,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format($SectionBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionBalance+$SectionBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeVariation(-$SectionBalance,-$SectionBalanceLY), '</h2></td>
+ <td class="number"><h2>', RelativeDifference(-$SectionBalance,-$SectionBalanceLY), '</h2></td>
</tr>';
}
$SectionBalance=0;
@@ -300,7 +300,7 @@
<td class="number">', locale_number_format($AccountBalance,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format($AccountBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$AccountBalance+$AccountBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation(-$AccountBalance,-$AccountBalanceLY), '</td>
+ <td class="number">', RelativeDifference(-$AccountBalance,-$AccountBalanceLY), '</td>
</tr>';
}
}
@@ -315,7 +315,7 @@
<td class="number">', locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format($GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GroupTotal[$Level]+$GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td>
+ <td class="number">', RelativeDifference(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td>
</tr>';
$Level--;
}
@@ -327,7 +327,7 @@
<td class="number">', locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format($GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GroupTotal[$Level]+$GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeVariation(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td>
+ <td class="number">', RelativeDifference(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td>
</tr>';
echo $DrawTotalLine;
echo '<tr>
@@ -335,7 +335,7 @@
<td class="number"><h2>', locale_number_format($SectionBalance,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format($SectionBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionBalance+$SectionBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeVariation(-$SectionBalance,-$SectionBalanceLY), '</h2></td>
+ <td class="number"><h2>', RelativeDifference(-$SectionBalance,-$SectionBalanceLY), '</h2></td>
</tr>';
$Section = $myrow['sectioninaccounts'];
@@ -351,7 +351,7 @@
<td class="number"><h2>', locale_number_format($CheckTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format($CheckTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$CheckTotal+$CheckTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeVariation(-$CheckTotal,-$CheckTotalLY), '</h2></td>
+ <td class="number"><h2>', RelativeDifference(-$CheckTotal,-$CheckTotalLY), '</h2></td>
</tr>';
echo $DrawTotalLine;
echo '</tbody>', // See comment at the begin of the table.
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-09-13 17:21:49 UTC (rev 7348)
+++ trunk/doc/Change.log 2015-09-14 14:43:19 UTC (rev 7349)
@@ -1,5 +1,6 @@
webERP Change Log
+14/9/15 RChacon: In AnalysisHorizontalIncome.php, delete duplicated tag. Replaces text "Absolute/Relative variation" with "Absolute/Relative difference" to avoid confusions.
13/9/15 RChacon: In AccountSections.php, add modifications for direct printing.
4/9/15 Wes Wolfenbarger: Fix to Z_ImportStocks.php added quotes to descriptions - also fixes error message when the csv does not match the template
27/08/15 Exson: Fixed the allocation status of involved invoice and credit notes in Credit_Invoice.php.
|
|
From: <rc...@us...> - 2015-09-14 16:08:55
|
Revision: 7350
http://sourceforge.net/p/web-erp/reponame/7350
Author: rchacon
Date: 2015-09-14 16:08:50 +0000 (Mon, 14 Sep 2015)
Log Message:
-----------
Rebuild languages files *.pot, *.po and *.mo to includes new texts.
Modified Paths:
--------------
trunk/AnalysisHorizontalIncome.php
trunk/AnalysisHorizontalPosition.php
trunk/doc/Change.log
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
Modified: trunk/AnalysisHorizontalIncome.php
===================================================================
--- trunk/AnalysisHorizontalIncome.php 2015-09-14 14:43:19 UTC (rev 7349)
+++ trunk/AnalysisHorizontalIncome.php 2015-09-14 16:08:50 UTC (rev 7350)
@@ -1,9 +1,9 @@
<?php
-/* $Id: AnalysisHorizontalIncome.php 7332 2015-08-04 03:27:51Z rchacon $*/
+/* $Id: AnalysisHorizontalIncome.php 7349 2015-09-14 14:43:19Z rchacon $*/
/* Shows the horizontal analysis of the statement of comprehensive income. */
-function RelativeDifference($SelectedPeriod, $PreviousPeriod) {
- // Calculates the relative difference between selected and previous periods. Uses percent in locale number format.
+function RelativeChange($SelectedPeriod, $PreviousPeriod) {
+ // Calculates the relative change between selected and previous periods. Uses percent with locale number format.
if($PreviousPeriod<>0) {
return locale_number_format(($SelectedPeriod-$PreviousPeriod)*100/$PreviousPeriod,$_SESSION['CompanyRecord']['decimalplaces']) . '%';
} else {
@@ -32,7 +32,7 @@
echo '<div class="page_help_text">',
_('Horizontal analysis (also known as trend analysis) is a financial statement analysis technique that shows changes in the amounts of corresponding financial statement items over a period of time. It is a useful tool to evaluate trend situations.'), '<br />',
- _('The statements for two periods are used in horizontal analysis. The earliest period is used as the base period. The items on the later statement are compared with items on the statement of the base period. The changes are shown both in currency (absolute difference) and percentage (relative difference).'), '<br />',
+ _('The statements for two periods are used in horizontal analysis. The earliest period is used as the base period. The items on the later statement are compared with items on the statement of the base period. The changes are shown both in currency (actual change) and percentage (relative change).'), '<br />',
_('webERP is an "accrual" based system (not a "cash based" system). Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.'), '</div>',
// Show a form to allow input of criteria for the report to show:
'<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '">',
@@ -159,16 +159,16 @@
}
echo '<th class="number">', ' - ', $myrow[0], '</th>
<th class="number">', _('Last Year'), '</th>
- <th class="number">', _('Absolute difference'), '</th>
- <th class="number">', _('Relative difference'), '</th>
+ <th class="number">', _('Actual change'), '</th>
+ <th class="number">', _('Relative change'), '</th>
</tr>
</thead>
<tfoot>
<tr>
- <td class="text" colspan="6">',// Prints an explanation of signs in absolute and relative differences:
+ <td class="text" colspan="6">',// Prints an explanation of signs in actual and relative changes:
'<br /><b>', _('Notes'), ':</b><br />',
- _('Absolute difference signs: a positive number indicates a variation that increases the net profit; a negative number indicates a variation that decreases the net profit.'), '<br />',
- _('Relative difference signs: a positive number indicates an increase in the amount of that account; a negative number indicates a decrease in the amount of that account.'), '<br />',
+ _('Actual change signs: a positive number indicates a variation that increases the net profit; a negative number indicates a variation that decreases the net profit.'), '<br />',
+ _('Relative change signs: a positive number indicates an increase in the amount of that account; a negative number indicates a decrease in the amount of that account.'), '<br />',
'</td>
</tr>
</tfoot>
@@ -236,7 +236,7 @@
<td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeDifference(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
+ <td class="number">', RelativeChange(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
</tr>';
$GrpTotal[$Level]=0;
$GrpTotalLY[$Level]=0;
@@ -260,7 +260,7 @@
<td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeDifference(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
+ <td class="number">', RelativeChange(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
</tr>';
} else {// Costs
// <---
@@ -269,7 +269,7 @@
<td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeDifference(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
+ <td class="number">', RelativeChange(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
</tr>';
// --->
}
@@ -291,7 +291,7 @@
<td class="number"><h2>', locale_number_format(-$SectionTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionTotal+$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeDifference(-$SectionTotal,-$SectionTotalLY), '</h2></td>
+ <td class="number"><h2>', RelativeChange(-$SectionTotal,-$SectionTotalLY), '</h2></td>
</tr>';
$GPIncome = $SectionTotal;
$GPIncomeLY = $SectionTotalLY;
@@ -301,7 +301,7 @@
<td class="number"><h2>', locale_number_format(-$SectionTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionTotal+$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeDifference(-$SectionTotal,-$SectionTotalLY), '</h2></td>
+ <td class="number"><h2>', RelativeChange(-$SectionTotal,-$SectionTotalLY), '</h2></td>
</tr>';
}
@@ -312,7 +312,7 @@
<td class="number"><h2>', locale_number_format(-($GPIncome+$SectionTotal),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-($GPIncomeLY+$SectionTotalLY),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-($GPIncome+$SectionTotal)+($GPIncomeLY+$SectionTotalLY),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeDifference(-($GPIncome+$SectionTotal),-($GPIncomeLY+$SectionTotalLY)), '</h2></td>
+ <td class="number"><h2>', RelativeChange(-($GPIncome+$SectionTotal),-($GPIncomeLY+$SectionTotalLY)), '</h2></td>
</tr>';
}
@@ -323,7 +323,7 @@
<td class="number"><h2>', locale_number_format(-$PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$PeriodTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$PeriodTotal+$PeriodTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeDifference(-$PeriodTotal,-$PeriodTotalLY), '</h2></td>
+ <td class="number"><h2>', RelativeChange(-$PeriodTotal,-$PeriodTotalLY), '</h2></td>
</tr>';
echo $DrawTotalLine;
}
@@ -383,7 +383,7 @@
<td class="number">', locale_number_format(-$AccountTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$AccountTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$AccountTotal+$AccountTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeDifference(-$AccountTotal,-$AccountTotalLY), '</td>
+ <td class="number">', RelativeChange(-$AccountTotal,-$AccountTotalLY), '</td>
</tr>';
} else {
// <---
@@ -391,7 +391,7 @@
<td class="number">', locale_number_format(-$AccountTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$AccountTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$AccountTotal+$AccountTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeDifference(-$AccountTotal,-$AccountTotalLY), '</td>
+ <td class="number">', RelativeChange(-$AccountTotal,-$AccountTotalLY), '</td>
</tr>';
}
}
@@ -414,7 +414,7 @@
<td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeDifference(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
+ <td class="number">', RelativeChange(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
</tr>';
} else {// Costs.
// <---
@@ -423,7 +423,7 @@
<td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeDifference(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
+ <td class="number">', RelativeChange(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
</tr>';
}
$GrpTotal[$Level]=0;
@@ -443,7 +443,7 @@
<td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeDifference(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
+ <td class="number">', RelativeChange(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td>
</tr>';
$GrpTotal[$Level]=0;
$GrpTotalLY[$Level]=0;
@@ -460,7 +460,7 @@
<td class="number"><h2>', locale_number_format(-$SectionTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionTotal+$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeDifference(-$SectionTotal,-$SectionTotalLY), '</h2></td>
+ <td class="number"><h2>', RelativeChange(-$SectionTotal,-$SectionTotalLY), '</h2></td>
</tr>';
$GPIncome = $SectionTotal;
$GPIncomeLY = $SectionTotalLY;
@@ -471,7 +471,7 @@
<td class="number"><h2>', locale_number_format(-$SectionTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionTotal+$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeDifference(-$SectionTotal,-$SectionTotalLY), '</h2></td>
+ <td class="number"><h2>', RelativeChange(-$SectionTotal,-$SectionTotalLY), '</h2></td>
</tr>';
}
if($Section==2) {// Cost of Sales - need sub total for Gross Profit.
@@ -481,7 +481,7 @@
<td class="number"><h2>', locale_number_format(-($GPIncome+$SectionTotal),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-($GPIncomeLY+$SectionTotalLY),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-($GPIncome+$SectionTotal)+($GPIncomeLY+$SectionTotalLY),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeDifference(-($GPIncome+$SectionTotal),-($GPIncomeLY+$SectionTotalLY)), '</h2></td>
+ <td class="number"><h2>', RelativeChange(-($GPIncome+$SectionTotal),-($GPIncomeLY+$SectionTotalLY)), '</h2></td>
</tr>';
}
$Section = $myrow['sectioninaccounts'];
@@ -501,7 +501,7 @@
<td class="number"><h2>', locale_number_format(-$PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$PeriodTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$PeriodTotal+$PeriodTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeDifference(-$PeriodTotal,-$PeriodTotalLY), '</h2></td>
+ <td class="number"><h2>', RelativeChange(-$PeriodTotal,-$PeriodTotalLY), '</h2></td>
</tr>';
echo $DrawTotalLine;
echo '</tbody>', // See comment at the begin of the table.
Modified: trunk/AnalysisHorizontalPosition.php
===================================================================
--- trunk/AnalysisHorizontalPosition.php 2015-09-14 14:43:19 UTC (rev 7349)
+++ trunk/AnalysisHorizontalPosition.php 2015-09-14 16:08:50 UTC (rev 7350)
@@ -1,9 +1,9 @@
<?php
-/* $Id: AnalysisHorizontalPosition.php 7338 2015-08-13 18:51:07Z rchacon $*/
+/* $Id: AnalysisHorizontalPosition.php 7349 2015-09-14 14:43:19Z rchacon $*/
/* Shows the horizontal analysis of the statement of financial position. */
-function RelativeDifference($SelectedPeriod, $PreviousPeriod) {
- // Calculates the relative difference between selected and previous periods. Uses percent in locale number format.
+function RelativeChange($SelectedPeriod, $PreviousPeriod) {
+ // Calculates the relative change between selected and previous periods. Uses percent with locale number format.
if($PreviousPeriod<>0) {
return locale_number_format(($SelectedPeriod-$PreviousPeriod)*100/$PreviousPeriod,$_SESSION['CompanyRecord']['decimalplaces']) . '%';
} else {
@@ -29,7 +29,7 @@
echo '<div class="page_help_text">',
_('Horizontal analysis (also known as trend analysis) is a financial statement analysis technique that shows changes in the amounts of corresponding financial statement items over a period of time. It is a useful tool to evaluate trend situations.'), '<br />',
- _('The statements for two periods are used in horizontal analysis. The earliest period is used as the base period. The items on the later statement are compared with items on the statement of the base period. The changes are shown both in currency (absolute difference) and percentage (relative difference).'), '<br />',
+ _('The statements for two periods are used in horizontal analysis. The earliest period is used as the base period. The items on the later statement are compared with items on the statement of the base period. The changes are shown both in currency (actual change) and percentage (relative change).'), '<br />',
_('webERP is an "accrual" based system (not a "cash based" system). Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.'), '</div>',
// Show a form to allow input of criteria for the report to show:
'<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '">',
@@ -122,16 +122,16 @@
}
echo '<th class="number">', $BalanceDate, '</th>
<th class="number">', _('Last Year'), '</th>
- <th class="number">', _('Absolute difference'), '</th>
- <th class="number">', _('Relative difference'), '</th>
+ <th class="number">', _('Actual change'), '</th>
+ <th class="number">', _('Relative change'), '</th>
</tr>
</thead>
<tfoot>
<tr>
- <td class="text" colspan="6">',// Prints an explanation of signs in absolute and relative differences:
+ <td class="text" colspan="6">',// Prints an explanation of signs in actual and relative changes:
'<br /><b>', _('Notes'), ':</b><br />',
- _('Absolute difference signs: a positive number indicates a source of funds; a negative number indicates an application of funds.'), '<br />',
- _('Relative difference signs: a positive number indicates an increase in the amount of that account; a negative number indicates a decrease in the amount of that account.'), '<br />',
+ _('Actual change signs: a positive number indicates a source of funds; a negative number indicates an application of funds.'), '<br />',
+ _('Relative change signs: a positive number indicates an increase in the amount of that account; a negative number indicates a decrease in the amount of that account.'), '<br />',
'</td>
</tr>
</tfoot>
@@ -216,7 +216,7 @@
<td class="number">', locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format($GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GroupTotal[$Level]+$GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeDifference(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td>
+ <td class="number">', RelativeChange(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td>
</tr>';
$GroupTotal[$Level]=0;
$GroupTotalLY[$Level]=0;
@@ -231,7 +231,7 @@
<td class="number">', locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format($GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GroupTotal[$Level]+$GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeDifference(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td>
+ <td class="number">', RelativeChange(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td>
</tr>';
$GroupTotal[$Level]=0;
$GroupTotalLY[$Level]=0;
@@ -246,7 +246,7 @@
<td class="number"><h2>', locale_number_format($SectionBalance,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format($SectionBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionBalance+$SectionBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeDifference(-$SectionBalance,-$SectionBalanceLY), '</h2></td>
+ <td class="number"><h2>', RelativeChange(-$SectionBalance,-$SectionBalanceLY), '</h2></td>
</tr>';
}
$SectionBalance=0;
@@ -300,7 +300,7 @@
<td class="number">', locale_number_format($AccountBalance,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format($AccountBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$AccountBalance+$AccountBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeDifference(-$AccountBalance,-$AccountBalanceLY), '</td>
+ <td class="number">', RelativeChange(-$AccountBalance,-$AccountBalanceLY), '</td>
</tr>';
}
}
@@ -315,7 +315,7 @@
<td class="number">', locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format($GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GroupTotal[$Level]+$GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeDifference(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td>
+ <td class="number">', RelativeChange(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td>
</tr>';
$Level--;
}
@@ -327,7 +327,7 @@
<td class="number">', locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format($GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
<td class="number">', locale_number_format(-$GroupTotal[$Level]+$GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td>
- <td class="number">', RelativeDifference(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td>
+ <td class="number">', RelativeChange(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td>
</tr>';
echo $DrawTotalLine;
echo '<tr>
@@ -335,7 +335,7 @@
<td class="number"><h2>', locale_number_format($SectionBalance,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format($SectionBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$SectionBalance+$SectionBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeDifference(-$SectionBalance,-$SectionBalanceLY), '</h2></td>
+ <td class="number"><h2>', RelativeChange(-$SectionBalance,-$SectionBalanceLY), '</h2></td>
</tr>';
$Section = $myrow['sectioninaccounts'];
@@ -351,7 +351,7 @@
<td class="number"><h2>', locale_number_format($CheckTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format($CheckTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
<td class="number"><h2>', locale_number_format(-$CheckTotal+$CheckTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td>
- <td class="number"><h2>', RelativeDifference(-$CheckTotal,-$CheckTotalLY), '</h2></td>
+ <td class="number"><h2>', RelativeChange(-$CheckTotal,-$CheckTotalLY), '</h2></td>
</tr>';
echo $DrawTotalLine;
echo '</tbody>', // See comment at the begin of the table.
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-09-14 14:43:19 UTC (rev 7349)
+++ trunk/doc/Change.log 2015-09-14 16:08:50 UTC (rev 7350)
@@ -1,5 +1,6 @@
webERP Change Log
+14/9/15 RChacon: Rebuild languages files *.pot, *.po and *.mo to includes new texts.
14/9/15 RChacon: In AnalysisHorizontalIncome.php, delete duplicated tag. Replaces text "Absolute/Relative variation" with "Absolute/Relative difference" to avoid confusions.
13/9/15 RChacon: In AccountSections.php, add modifications for direct printing.
4/9/15 Wes Wolfenbarger: Fix to Z_ImportStocks.php added quotes to descriptions - also fixes error message when the csv does not match the template
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2015-09-14 14:43:19 UTC (rev 7349)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2015-09-14 16:08:50 UTC (rev 7350)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-17 13:40+1200\n"
+"POT-Creation-Date: 2015-09-14 09:07-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:6 includes/MainMenuLinksArray.php:391
+#: AccountGroups.php:6 includes/MainMenuLinksArray.php:395
msgid "Account Groups"
msgstr "مجموعات العضوية"
@@ -159,23 +159,23 @@
#: Areas.php:115 Areas.php:124 BankAccounts.php:165 CreditStatus.php:125
#: Currencies.php:247 Currencies.php:255 Currencies.php:263 Currencies.php:273
#: CustomerBranches.php:300 CustomerBranches.php:310 CustomerBranches.php:320
-#: CustomerBranches.php:330 CustomerBranches.php:340 Customers.php:296
-#: Customers.php:305 Customers.php:313 Customers.php:324 Customers.php:334
-#: CustomerTypes.php:146 CustomerTypes.php:156 Departments.php:141
-#: Factors.php:134 FixedAssetCategories.php:137 GLAccounts.php:79
-#: GLAccounts.php:95 Locations.php:279 Locations.php:287 Locations.php:298
-#: Locations.php:307 Locations.php:316 Locations.php:325 Locations.php:334
-#: Locations.php:343 Locations.php:351 Manufacturers.php:154
-#: MRPDemandTypes.php:87 PaymentMethods.php:143 PaymentTerms.php:146
-#: PaymentTerms.php:153 PcExpenses.php:161 SalesCategories.php:128
-#: SalesCategories.php:135 SalesPeople.php:159 SalesPeople.php:166
-#: SalesPeople.php:172 SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81
-#: Shippers.php:93 StockCategories.php:216 Stocks.php:762 Stocks.php:771
-#: Stocks.php:779 Stocks.php:787 Stocks.php:795 Stocks.php:803 Stocks.php:811
-#: Stocks.php:819 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
-#: SupplierTypes.php:126 TaxCatego...
[truncated message content] |
|
From: <dai...@us...> - 2015-09-18 09:56:50
|
Revision: 7351
http://sourceforge.net/p/web-erp/reponame/7351
Author: daintree
Date: 2015-09-18 09:56:48 +0000 (Fri, 18 Sep 2015)
Log Message:
-----------
Korean translation humansoft from the webERP forum
Modified Paths:
--------------
trunk/includes/LanguagesArray.php
Added Paths:
-----------
trunk/locale/ko_KR.utf8/
trunk/locale/ko_KR.utf8/LC_MESSAGES/
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.mo
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po
Modified: trunk/includes/LanguagesArray.php
===================================================================
--- trunk/includes/LanguagesArray.php 2015-09-14 16:08:50 UTC (rev 7350)
+++ trunk/includes/LanguagesArray.php 2015-09-18 09:56:48 UTC (rev 7351)
@@ -94,6 +94,11 @@
$LanguagesArray['ja_JP.utf8']['DecimalPoint'] = '.';
$LanguagesArray['ja_JP.utf8']['ThousandsSeparator'] = ',';
+$LanguagesArray['ko_KR.utf8']['LanguageName'] = 'Korean';
+$LanguagesArray['ko_KR.utf8']['WindowsLocale'] = 'korean';
+$LanguagesArray['ko_KR.utf8']['DecimalPoint'] = '.';
+$LanguagesArray['ko_KR.utf8']['ThousandsSeparator'] = ',';
+
$LanguagesArray['lv_LV.utf8']['LanguageName'] = 'Latviešu';
$LanguagesArray['lv_LV.utf8']['WindowsLocale'] = 'latvian';
$LanguagesArray['lv_LV.utf8']['DecimalPoint'] = ',';
@@ -175,4 +180,4 @@
$LanguagesArray['zh_TW.utf8']['ThousandsSeparator'] = ',';
asort($LanguagesArray);
-?>
\ No newline at end of file
+?>
Added: trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Index: trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.mo
===================================================================
--- trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.mo 2015-09-14 16:08:50 UTC (rev 7350)
+++ trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.mo 2015-09-18 09:56:48 UTC (rev 7351)
Property changes on: trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.mo
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po (rev 0)
+++ trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po 2015-09-18 09:56:48 UTC (rev 7351)
@@ -0,0 +1,45122 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-17 20:17+0900\n"
+"PO-Revision-Date: 2015-09-18 10:34+0900\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.4\n"
+"Last-Translator: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: ko_KR\n"
+
+#: AccountGroups.php:6 includes/MainMenuLinksArray.php:391
+msgid "Account Groups"
+msgstr "계정 그룹"
+
+#: AccountGroups.php:19
+msgid "An error occurred in retrieving the account groups of the parent account group during the check for recursion"
+msgstr "오류가 재귀에 대한 검사 중 상위 계정 그룹의 계정 그룹을 검색에서 발생"
+
+#: 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 "모계좌 그룹의 계정 그룹을 검색하는 데 사용하고 그 과정에서 실패 하였다 SQL이었다"
+
+#: AccountGroups.php:46
+msgid "An error occurred in moving the account group"
+msgstr "오류가 계정 군을 이동 발생한"
+
+#: AccountGroups.php:47
+msgid "The SQL that was used to move the account group was"
+msgstr "계정 그룹이었다 이동시키는 데 사용 하였다 SQL"
+
+#: AccountGroups.php:49 AccountGroups.php:331
+msgid "Review Account Groups"
+msgstr "계정 그룹을 검토"
+
+#: AccountGroups.php:50
+msgid "All accounts in the account group:"
+msgstr "계정 그룹의 모든 계정 :"
+
+#: AccountGroups.php:50
+msgid "have been changed to the account group:"
+msgstr "계정 그룹으로 변경되었습니다"
+
+#: AccountGroups.php:69 AccountGroups.php:106 AccountGroups.php:208
+#: AccountGroups.php:243
+msgid "The SQL that was used to retrieve the information was"
+msgstr "정보를 검색하는 데 사용 된 SQL이었다"
+
+#: AccountGroups.php:70
+msgid "Could not check whether the group exists because"
+msgstr "그룹이 있기 때문에 존재하는지 여부를 확인 할 수 없습니다"
+
+#: AccountGroups.php:77
+msgid "The account group name already exists in the database"
+msgstr "계정이 그룹 이름은 이미 데이터베이스에 존재"
+
+#: AccountGroups.php:83
+msgid "The account group name cannot contain the character"
+msgstr "계정 그룹 이름은 문자를 포함 할 수 없습니다"
+
+#: AccountGroups.php:83 Departments.php:30 TaxCategories.php:32
+msgid "or the character"
+msgstr "또는 문자"
+
+#: AccountGroups.php:89
+msgid "The account group name must be at least one character long"
+msgstr "계정 그룹 이름은 적어도 하나의 문자 여야"
+
+#: AccountGroups.php:96
+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:107
+msgid "Could not check whether the group is recursive because"
+msgstr "그룹 때문에 순환 여부를 확인 할 수 없습니다"
+
+#: AccountGroups.php:115
+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 appears in the balance sheet or profit and loss account are all properties inherited from the parent account group. Any changes made to these fields will have no effect."
+msgstr "이 계정 그룹이 하위 그룹, 시험 균형 순서이기 때문에, 계정 및 계정 그룹은 대차 대조표 또는 손익 계정에 표시 여부 섹션은 부모 계정 그룹에서 상속 된 모든 속성입니다. 이 필드에 대한 변경 사항이 적용되지 않습니다."
+
+#: AccountGroups.php:120
+msgid "The section in accounts must be an integer"
+msgstr "계정에있는 부분은 정수 여야합니다"
+
+#: AccountGroups.php:126
+msgid "The sequence in the trial balance must be an integer"
+msgstr "재판의 균형 순서는 정수 여야합니다"
+
+#: AccountGroups.php:132
+msgid "The sequence in the TB must be numeric and less than"
+msgstr "결핵의 순서는 숫자와보다 작아야합니다"
+
+#: AccountGroups.php:148
+msgid "An error occurred in renaming the account group"
+msgstr "오류가 계정 그룹의 이름을 변경 발생"
+
+#: AccountGroups.php:149
+msgid "The SQL that was used to rename the account group was"
+msgstr "계정 그룹이었다 이름을 사용한 SQL"
+
+#: AccountGroups.php:168
+msgid "An error occurred in updating the account group"
+msgstr "오류가 계정 그룹을 업데이트 발생"
+
+#: AccountGroups.php:169
+msgid "The SQL that was used to update the account group was"
+msgstr "계정 그룹이었다 갱신하는데 사용 된 SQL"
+
+#: AccountGroups.php:171 AccountSections.php:98 PaymentMethods.php:84
+msgid "Record Updated"
+msgstr "기록 업데이트"
+
+#: AccountGroups.php:187
+msgid "An error occurred in inserting the account group"
+msgstr "오류가 계정 그룹을 삽입 발생"
+
+#: AccountGroups.php:188
+msgid "The SQL that was used to insert the account group was"
+msgstr "사용 된 SQL은 계정 그룹이었다 삽입"
+
+#: AccountGroups.php:189 AccountSections.php:108
+msgid "Record inserted"
+msgstr "레코드 삽입"
+
+#: AccountGroups.php:207
+msgid "An error occurred in retrieving the group information from chartmaster"
+msgstr "오류가 chartmaster에서 그룹 정보를 검색에서 발생"
+
+#: AccountGroups.php:212
+msgid "Cannot delete this account group because general ledger accounts have been created using this group"
+msgstr "총계정 원장 계정이이 그룹을 사용하여 생성 되었기 때문에이 계정 그룹을 삭제할 수 없습니다"
+
+#: AccountGroups.php:213 AccountGroups.php:248 AccountSections.php:130
+#: Areas.php:115 Areas.php:124 BankAccounts.php:165 CreditStatus.php:125
+#: Currencies.php:247 Currencies.php:255 Currencies.php:263 Currencies.php:273
+#: CustomerBranches.php:300 CustomerBranches.php:310 CustomerBranches.php:320
+#: CustomerBranches.php:330 CustomerBranches.php:340 Customers.php:296
+#: Customers.php:305 Customers.php:313 Customers.php:324 Customers.php:334
+#: CustomerTypes.php:146 CustomerTypes.php:156 Departments.php:141
+#: Factors.php:134 FixedAssetCategories.php:137 GLAccounts.php:79
+#: GLAccounts.php:95 Locations.php:279 Locations.php:287 Locations.php:298
+#: Locations.php:307 Locations.php:316 Locations.php:325 Locations.php:334
+#: Locations.php:343 Locations.php:351 Manufacturers.php:154
+#: MRPDemandTypes.php:87 PaymentMethods.php:143 PaymentTerms.php:146
+#: PaymentTerms.php:153 PcExpenses.php:161 SalesCategories.php:128
+#: SalesCategories.php:135 SalesPeople.php:159 SalesPeople.php:166
+#: SalesPeople.php:172 SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81
+#: Shippers.php:93 StockCategories.php:216 Stocks.php:762 Stocks.php:771
+#: Stocks.php:779 Stocks.php:787 Stocks.php:795 Stocks.php:803 Stocks.php:811
+#: Stocks.php:819 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
+#: SupplierTypes.php:126 TaxCategories.php:132 TaxGroups.php:134
+#: TaxGroups.php:142 TaxProvinces.php:129 UnitsOfMeasure.php:135
+#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:88
+msgid "There are"
+msgstr "있다"
+
+#: AccountGroups.php:213
+msgid "general ledger accounts that refer to this account group"
+msgstr "이 계정 그룹을 참조 총계정 원장 계정"
+
+#: AccountGroups.php:220 AccountGroups.php:290 AccountGroups.php:404
+msgid "Parent Group"
+msgstr "상위 그룹"
+
+#: AccountGroups.php:236
+msgid "Move Group"
+msgstr "그룹 이동"
+
+#: AccountGroups.php:242
+msgid "An error occurred in retrieving the parent group information"
+msgstr "에러는 상위 그룹 정보를 검색 발생한"
+
+#: AccountGroups.php:247
+msgid "Cannot delete this account group because it is a parent account group of other account group(s)"
+msgstr "그것은 다른 계정 그룹의 상위 계정 그룹이기 때문에이 계정 그룹을 삭제할 수 없습니다 (들)"
+
+#: AccountGroups.php:248
+msgid "account groups that have this group as its/there parent account group"
+msgstr "그 /이 부모 계정 그룹으로이 그룹이 계정 그룹"
+
+#: AccountGroups.php:252
+msgid "An error occurred in deleting the account group"
+msgstr "오류가 계정 그룹을 삭제에서 발생"
+
+#: AccountGroups.php:253
+msgid "The SQL that was used to delete the account group was"
+msgstr "계정 그룹이었다 삭제하는 데 사용 된 SQL"
+
+#: AccountGroups.php:255
+msgid "group has been deleted"
+msgstr "그룹이 삭제되었습니다"
+
+#: AccountGroups.php:279
+msgid "The sql that was used to retrieve the account group information was "
+msgstr "계정 그룹 정보를 검색하는 데 사용 된 SQL이었다"
+
+#: AccountGroups.php:280
+msgid "Could not get account groups because"
+msgstr "계정 그룹 때문에를 가져올 수 없습니다"
+
+#: AccountGroups.php:282 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:249
+#: BOMIndentedReverse.php:236 BOMInquiry.php:186 BOMListing.php:110
+#: BOMs.php:239 BOMs.php:890 COGSGLPostings.php:19 CompanyPreferences.php:102
+#: CounterReturns.php:1629 CounterSales.php:2097 CounterSales.php:2193
+#: Credit_Invoice.php:276 CreditStatus.php:21 CustEDISetup.php:17
+#: CustItem.php:120 CustItem.php:210 CustItem.php:238
+#: DebtorsAtPeriodEnd.php:129 DiscountCategories.php:12
+#: DiscountCategories.php:149 DiscountMatrix.php:16 EDIMessageFormat.php:105
+#: FixedAssetLocations.php:13 FixedAssetRegister.php:16
+#: FixedAssetRegister.php:256 FixedAssetTransfer.php:14 FormDesigner.php:185
+#: GLBudgets.php:32 GLJournalInquiry.php:11 GLJournal.php:250
+#: HistoricalTestResults.php:42 InternalStockRequest.php:311
+#: InventoryPlanning.php:459 InventoryPlanningPrefSupplier.php:386
+#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 MRPReport.php:544
+#: NoSalesItems.php:91 PcAssignCashToTab.php:59 PcAssignCashToTab.php:133
+#: PcAssignCashToTab.php:149 PcAssignCashToTab.php:193 PDFPickingList.php:29
+#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:60
+#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:153
+#: PriceMatrix.php:16 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35
+#: Prices.php:11 ProductSpecs.php:38 PurchaseByPrefSupplier.php:305
+#: PurchData.php:241 PurchData.php:373 PurchData.php:401 QATests.php:22
+#: RecurringSalesOrders.php:320 RelatedItemsUpdate.php:24
+#: SalesAnalReptCols.php:51 SalesAnalRepts.php:14 SalesCategories.php:11
+#: SalesGLPostings.php:19 SalesGraph.php:40 SalesPeople.php:28
+#: SalesTypes.php:20 SelectAsset.php:48 SelectCompletedOrder.php:11
+#: SelectContract.php:69 SelectCreditItems.php:220 SelectCreditItems.php:291
+#: SelectCustomer.php:266 SelectGLAccount.php:65 SelectOrderItems.php:559
+#: SelectOrderItems.php:1467 SelectOrderItems.php:1567 SelectProduct.php:502
+#: SelectQASamples.php:45 SelectSalesOrder.php:512 SelectSupplier.php:14
+#: SelectSupplier.php:220 SelectWorkOrder.php:9 SelectWorkOrder.php:174
+#: SellThroughSupport.php:229 ShipmentCosting.php:11 Shipments.php:17
+#: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
+#: StockLocMovements.php:14 StockLocStatus.php:29
+#: StockSerialItemResearch.php:30 SupplierPriceList.php:14
+#: SupplierPriceList.php:224 SupplierPriceList.php:394
+#: SupplierPriceList.php:398 SupplierPriceList.php:449
+#: SupplierPriceList.php:499 Suppliers.php:304 SupplierTenderCreate.php:556
+#: SupplierTenderCreate.php:664 SupplierTenders.php:322 SupplierTenders.php:388
+#: SupplierTransInquiry.php:10 TestPlanResults.php:27 TopItems.php:118
+#: UnitsOfMeasure.php:10 WhereUsedInquiry.php:18 WorkCentres.php:111
+#: WorkCentres.php:163 WorkOrderCosting.php:22 WorkOrderEntry.php:11
+#: WorkOrderIssue.php:22 WorkOrderReceive.php:34 WorkOrderStatus.php:58
+#: WWW_Users.php:34 Z_BottomUpCosts.php:57 ../webSHOP/includes/header.php:217
+msgid "Search"
+msgstr "수색"
+
+#: AccountGroups.php:286
+msgid "Group Name"
+msgstr "그룹 이름"
+
+#: AccountGroups.php:287 EDIMessageFormat.php:129 EDIMessageFormat.php:208
+msgid "Section"
+msgstr "섹션"
+
+#: AccountGroups.php:288 AccountGroups.php:458
+msgid "Sequence In TB"
+msgstr "결핵에서 순서"
+
+#: AccountGroups.php:289 AccountGroups.php:441 GLProfit_Loss.php:6
+#: GLProfit_Loss.php:135 GLProfit_Loss.php:136 GLProfit_Loss.php:187
+#: SelectGLAccount.php:23 SelectGLAccount.php:37 SelectGLAccount.php:51
+msgid "Profit and Loss"
+msgstr "손익"
+
+#: AccountGroups.php:307 AccountGroups.php:310 AccountGroups.php:445
+#: AccountGroups.php:447 BOMs.php:128 BOMs.php:802 BOMs.php:804
+#: CompanyPreferences.php:425 CompanyPreferences.php:427
+#: CompanyPreferences.php:440 CompanyPreferences.php:442
+#: CompanyPreferences.php:455 CompanyPreferences.php:457
+#: ContractCosting.php:202 Currencies.php:342 Currencies.php:520
+#: Currencies.php:522 CustomerBranches.php:452 Customers.php:659
+#: Customers.php:1049 Customers.php:1055 Customers.php:1058
+#: DailyBankTransactions.php:156 DeliveryDetails.php:1157
+#: DeliveryDetails.php:1198 DeliveryDetails.php:1201 FormDesigner.php:101
+#: GLTransInquiry.php:74 Labels.php:601 Labels.php:603 Labels.php:628
+#: Locations.php:446 Locations.php:668 Locations.php:670 Locations.php:683
+#: Locations.php:685 Locations.php:701 MRPCalendar.php:224 MRP.php:554
+#: MRP.php:558 MRP.php:562 MRP.php:566 MRP.php:570 PaymentMethods.php:206
+#: PaymentMethods.php:207 PaymentMethods.php:208 PaymentMethods.php:209
+#: PaymentMethods.php:275 PaymentMethods.php:282 PaymentMethods.php:289
+#: PaymentMethods.php:296 PcAuthorizeExpenses.php:248 PDFChequeListing.php:65
+#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:80 PDFWOPrint.php:600
+#: PDFWOPrint.php:604 PO_AuthorisationLevels.php:134
+#: PO_AuthorisationLevels.php:139 PO_Header.php:807 PO_PDFPurchOrder.php:413
+#: PO_PDFPurchOrder.php:416 ProductSpecs.php:188 ProductSpecs.php:409
+#: ProductSpecs.php:414 ProductSpecs.php:420 ProductSpecs.php:425
+#: ProductSpecs.php:430 ProductSpecs.php:562 ProductSpecs.php:608
+#: ProductSpecs.php:610 ProductSpecs.php:621 ProductSpecs.php:623
+#: ProductSpecs.php:634 ProductSpecs.php:636 ProductSpecs.php:647
+#: ProductSpecs.php:649 PurchData.php:296 PurchData.php:667 PurchData.php:670
+#: QATests.php:293 QATests.php:295 QATests.php:306 QATests.php:308
+#: QATests.php:319 QATests.php:321 QATests.php:332 QATests.php:334
+#: QATests.php:345 QATests.php:347 QATests.php:414 QATests.php:419
+#: QATests.php:424 QATests.php:429 QATests.php:434 RecurringSalesOrders.php:493
+#: RecurringSalesOrders.php:496 SalesAnalReptCols.php:284
+#: SalesAnalReptCols.php:419 SalesAnalReptCols.php:422 SalesAnalRepts.php:420
+#: SalesAnalRepts.php:423 SalesAnalRepts.php:448 SalesAnalRepts.php:451
+#: SalesAnalRepts.php:476 SalesAnalRepts.php:479 SalesCategories.php:264
+#: SalesCategories.php:351 SalesCategories.php:355 SalesPeople.php:227
+#: SalesPeople.php:367 SalesPeople.php:369 SelectProduct.php:229
+#: SelectProduct.php:354 SelectQASamples.php:424 SelectQASamples.php:518
+#: SelectQASamples.php:520 SelectQASamples.php:574 SelectQASamples.php:576
+#: SelectQASamples.php:588 SelectQASamples.php:590 ShipmentCosting.php:667
+#: ShopParameters.php:289 ShopParameters.php:293 ShopParameters.php:337
+#: ShopParameters.php:341 ShopParameters.php:391 ShopParameters.php:395
+#: ShopParameters.php:413 ShopParameters.php:417 ShopParameters.php:495
+#: ShopParameters.php:499 StockClone.php:922 StockClone.php:924
+#: StockClone.php:947 StockClone.php:949 Stocks.php:1256 Stocks.php:1258
+#: Stocks.php:1281 Stocks.php:1283 SuppContractChgs.php:90
+#: SystemParameters.php:479 SystemParameters.php:502 SystemParameters.php:543
+#: SystemParameters.php:624 SystemParameters.php:632 SystemParameters.php:672
+#: SystemParameters.php:763 SystemParameters.php:772 SystemParameters.php:780
+#: SystemParameters.php:798 SystemParameters.php:805 SystemParameters.php:849
+#: SystemParameters.php:945 SystemParameters.php:1088 SystemParameters.php:1090
+#: SystemParameters.php:1100 SystemParameters.php:1102
+#: SystemParameters.php:1156 SystemParameters.php:1168
+#: SystemParameters.php:1170 SystemParameters.php:1208
+#: SystemParameters.php:1210 SystemParameters.php:1232
+#: SystemParameters.php:1234 TaxGroups.php:310 TaxGroups.php:313
+#: TaxGroups.php:364 TestPlanResults.php:304 TestPlanResults.php:532
+#: TestPlanResults.php:747 TestPlanResults.php:864 TestPlanResults.php:924
+#: TestPlanResults.php:928 WWW_Users.php:516 WWW_Users.php:518
+#: WWW_Users.php:689 WWW_Users.php:691 WWW_Users.php:704 WWW_Users.php:706
+msgid "Yes"
+msgstr "네"
+
+#: AccountGroups.php:313 AccountGroups.php:450 AccountGroups.php:452
+#: BankAccounts.php:218 BankAccounts.php:412 BankAccounts.php:414
+#: BankAccounts.php:418 BankAccounts.php:426 BOMs.php:130 BOMs.php:801
+#: BOMs.php:805 CompanyPreferences.php:424 CompanyPreferences.php:428
+#: CompanyPreferences.php:439 CompanyPreferences.php:443
+#: CompanyPreferences.php:454 CompanyPreferences.php:458
+#: ContractCosting.php:200 Currencies.php:344 Currencies.php:525
+#: Currencies.php:527 CustomerBranches.php:452 Customers.php:658
+#: Customers.php:1047 Customers.php:1054 Customers.php:1057
+#: DailyBankTransactions.php:158 DeliveryDetails.php:1158
+#: DeliveryDetails.php:1199 DeliveryDetails.php:1202 FormDesigner.php:99
+#: GLTransInquiry.php:93 Labels.php:600 Labels.php:604 Labels.php:629
+#: Locations.php:446 Locations.php:673 Locations.php:675 Locations.php:688
+#: Locations.php:690 Locations.php:702 MRPCalendar.php:226 MRP.php:552
+#: MRP.php:556 MRP.php:560 MRP.php:564 MRP.php:568 NoSalesItems.php:191
+#: PaymentMethods.php:206 PaymentMethods.php:207 PaymentMethods.php:208
+#: PaymentMethods.php:209 PaymentMethods.php:276 PaymentMethods.php:283
+#: PaymentMethods.php:290 PaymentMethods.php:297 PcAuthorizeExpenses.php:246
+#: PDFChequeListing.php:64 PDFDeliveryDifferences.php:75 PDFDIFOT.php:79
+#: PDFWOPrint.php:601 PDFWOPrint.php:605 PO_AuthorisationLevels.php:136
+#: PO_AuthorisationLevels.php:141 PO_Header.php:806 PO_PDFPurchOrder.php:414
+#: PO_PDFPurchOrder.php:417 ProductSpecs.php:191 ProductSpecs.php:411
+#: ProductSpecs.php:417 ProductSpecs.php:422 ProductSpecs.php:427
+#: ProductSpecs.php:432 ProductSpecs.php:613 ProductSpecs.php:615
+#: ProductSpecs.php:626 ProductSpecs.php:628 ProductSpecs.php:639
+#: ProductSpecs.php:641 ProductSpecs.php:652 ProductSpecs.php:654
+#: PurchData.php:299 PurchData.php:668 PurchData.php:671 QATests.php:298
+#: QATests.php:300 QATests.php:311 QATests.php:313 QATests.php:324
+#: QATests.php:326 QATests.php:337 QATests.php:339 QATests.php:350
+#: QATests.php:352 QATests.php:416 QATests.php:421 QATests.php:426
+#: QATests.php:431 QATests.php:436 RecurringSalesOrders.php:492
+#: RecurringSalesOrders.php:495 SalesAnalReptCols.php:282
+#: SalesAnalReptCols.php:420 SalesAnalReptCols.php:423 SalesAnalRepts.php:419
+#: SalesAnalRepts.php:422 SalesAnalRepts.php:447 SalesAnalRepts.php:450
+#: SalesAnalRepts.php:475 SalesAnalRepts.php:478 SalesCategories.php:266
+#: SalesCategories.php:352 SalesCategories.php:354 SalesPeople.php:229
+#: SalesPeople.php:372 SalesPeople.php:374 SelectProduct.php:231
+#: SelectProduct.php:356 SelectQASamples.php:426 SelectQASamples.php:523
+#: SelectQASamples.php:525 SelectQASamples.php:579 SelectQASamples.php:581
+#: SelectQASamples.php:593 SelectQASamples.php:595 ShipmentCosting.php:668
+#: ShopParameters.php:290 ShopParameters.php:292 ShopParameters.php:338
+#: ShopParameters.php:340 ShopParameters.php:392 ShopParameters.php:394
+#: ShopParameters.php:414 ShopParameters.php:416 ShopParameters.php:496
+#: ShopParameters.php:498 StockClone.php:917 StockClone.php:919
+#: StockClone.php:942 StockClone.php:944 Stocks.php:1251 Stocks.php:1253
+#: Stocks.php:1276 Stocks.php:1278 SuppContractChgs.php:92
+#: SystemParameters.php:480 SystemParameters.php:503 SystemParameters.php:544
+#: SystemParameters.php:625 SystemParameters.php:633 SystemParameters.php:673
+#: SystemParameters.php:764 SystemParameters.php:773 SystemParameters.php:781
+#: SystemParameters.php:799 SystemParameters.php:806 SystemParameters.php:850
+#: SystemParameters.php:946 SystemParameters.php:1087 SystemParameters.php:1091
+#: SystemParameters.php:1099 SystemParameters.php:1103
+#: SystemParameters.php:1157 SystemParameters.php:1167
+#: SystemParameters.php:1171 SystemParameters.php:1207
+#: SystemParameters.php:1211 SystemParameters.php:1231
+#: SystemParameters.php:1235 TaxGroups.php:311 TaxGroups.php:314
+#: TaxGroups.php:366 TestPlanResults.php:306 TestPlanResults.php:535
+#: TestPlanResults.php:749 TestPlanResults.php:866 TestPlanResults.php:925
+#: TestPlanResults.php:927 WWW_Users.php:515 WWW_Users.php:519
+#: WWW_Users.php:688 WWW_Users.php:692 WWW_Users.php:703 WWW_Users.php:707
+#: includes/PDFLowGPPageHeader.inc:44
+msgid "No"
+msgstr "아니"
+
+#: AccountGroups.php:322 AccountSections.php:191 AddCustomerContacts.php:148
+#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
+#: BankAccounts.php:243 BOMs.php:157 COGSGLPostings.php:112
+#: COGSGLPostings.php:219 CreditStatus.php:175 Currencies.php:374
+#: Currencies.php:391 CustItem.php:166 CustomerBranches.php:456
+#: Customers.php:1131 Customers.php:1165 CustomerTypes.php:205
+#: Departments.php:186 EDIMessageFormat.php:150 Factors.php:334
+#: FixedAssetCategories.php:190 FixedAssetLocations.php:111
+#: FreightCosts.php:253 GeocodeSetup.php:173 GLAccounts.php:317 GLTags.php:96
+#: ImportBankTransAnalysis.php:223 InternalStockRequest.php:293 Labels.php:333
+#: Labels.php:358 Locations.php:439 MailingGroupMaintenance.php:178
+#: MaintenanceTasks.php:118 Manufacturers.php:217 MRPDemands.php:309
+#: MRPDemandTypes.php:120 PaymentMethods.php:210 PaymentTerms.php:205
+#: PcAssignCashToTab.php:277 PcClaimExpensesFromTab.php:276 PcExpenses.php:226
+#: PcTabs.php:236 PcTypeTabs.php:180 PO_AuthorisationLevels.php:151
+#: PriceMatrix.php:287 Prices_Customer.php:286 Prices.php:253
+#: ProductSpecs.php:465 PurchData.php:312 QATests.php:467
+#: SalesCategories.php:272 SalesGLPostings.php:137 SalesGLPostings.php:255
+#: SalesPeople.php:240 SalesTypes.php:206 SecurityTokens.php:130
+#: SelectCustomer.php:615 SelectCustomer.php:634 SelectCustomer.php:664
+#: SelectCustomer.php:682 SelectCustomer.php:706 SelectCustomer.php:723
+#: SelectGLAccount.php:117 SelectGLAccount.php:132 SelectQASamples.php:417
+#: SellThroughSupport.php:298 Shippers.php:144 StockCategories.php:296
+#: SupplierContacts.php:165 SupplierTenderCreate.php:157 SupplierTypes.php:170
+#: SuppTransGLAnalysis.php:125 TaxAuthorities.php:172 TaxCategories.php:184
+#: TaxGroups.php:190 TaxProvinces.php:179 UnitsOfMeasure.php:185
+#: WorkCentres.php:142 WWW_Access.php:132 WWW_Users.php:350
+#: includes/InputSerialItems.php:110 includes/OutputSerialItems.php:20
+#, php-format
+msgid "Edit"
+msgstr "편집"
+
+#: AccountGroups.php:323
+msgid "Are you sure you wish to delete this account group?"
+msgstr "이 계정 그룹을 삭제하려면 확실합니까?"
+
+#: AccountGroups.php:323 AccountSections.php:195 AddCustomerContacts.php:149
+#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
+#: BankAccounts.php:244 BOMs.php:159 COGSGLPostings.php:113
+#: COGSGLPostings.php:220 ContractBOM.php:272 ContractOtherReqts.php:124
+#: CounterReturns.php:740 CounterSales.php:836 Credit_Invoice.php:409
+#: CreditStatus.php:176 Currencies.php:377 CustItem.php:167
+#: CustomerReceipt.php:989 Customers.php:1166 CustomerTypes.php:206
+#: Departments.php:187 DiscountCategories.php:238 DiscountMatrix.php:183
+#: EDIMessageFormat.php:151 FixedAssetCategories.php:191 FreightCosts.php:254
+#: GeocodeSetup.php:174 GLAccounts.php:318 GLJournal.php:430 GLTags.php:97
+#: ImportBankTransAnalysis.php:224 InternalStockCategoriesByRole.php:184
+#: InternalStockRequest.php:294 Labels.php:334 Labels.php:359 Labels.php:607
+#: Locations.php:440 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
+#: Manufacturers.php:218 MRPDemands.php:310 MRPDemandTypes.php:121
+#: PaymentMethods.php:211 Payments.php:1112 PaymentTerms.php:206
+#: PcAssignCashToTab.php:281 PcClaimExpensesFromTab.php:277 PcExpenses.php:227
+#: PcExpensesTypeTab.php:187 PcTabs.php:237 PcTypeTabs.php:181
+#: PO_AuthorisationLevels.php:153 PO_Items.php:768 PriceMatrix.php:286
+#: Prices_Customer.php:287 Prices.php:254 ProductSpecs.php:466
+#: PurchData.php:314 PurchData.php:721 QATests.php:468
+#: RelatedItemsUpdate.php:155 RelatedItemsUpdate.php:170
+#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:273
+#: SalesGLPostings.php:138 SalesGLPostings.php:256 SalesPeople.php:241
+#: SalesTypes.php:207 SecurityTokens.php:131 SelectCreditItems.php:778
+#: SelectCustomer.php:616 SelectCustomer.php:635 SelectCustomer.php:665
+#: SelectCustomer.php:683 SelectCustomer.php:707 SelectCustomer.php:724
+#: SelectOrderItems.php:1379 SelectQASamples.php:418 SellThroughSupport.php:299
+#: Shipments.php:438 Shippers.php:145 SpecialOrder.php:667
+#: StockCategories.php:297 StockCategories.php:626 StockLocTransfer.php:325
+#: SuppContractChgs.php:99 SuppCreditGRNs.php:117 SuppFixedAssetChgs.php:90
+#: SuppInvGRNs.php:147 SupplierContacts.php:166 SupplierTenderCreate.php:422
+#: SupplierTenderCreate.php:452 SupplierTypes.php:172 SuppShiptChgs.php:90
+#: SuppTransGLAnalysis.php:126 TaxAuthorities.php:173 TaxCategories.php:186
+#: TaxGroups.php:191 TaxProvinces.php:180 TestPlanResults.php:920
+#: UnitsOfMeasure.php:186 WorkCentres.php:143 WOSerialNos.php:335
+#: WWW_Access.php:133 WWW_Users.php:351 includes/InputSerialItemsKeyed.php:60
+#: includes/OutputSerialItems.php:99
+#, php-format
+msgid "Delete"
+msgstr "삭제"
+
+#: AccountGroups.php:351
+msgid "An error occurred in retrieving the account group information"
+msgstr "오류가 계정 그룹 정보를 검색 발생한"
+
+#: AccountGroups.php:352
+msgid "The SQL that was used to retrieve the account group and that failed in the process was"
+msgstr "계정 그룹을 검색하는 데 사용하고 그 과정에서 실패 하였다 SQL이었다"
+
+#: AccountGroups.php:355
+msgid "The account group name does not exist in the database"
+msgstr "계정 그룹 이름이 데이터베이스에 존재하지 않는다"
+
+#: AccountGroups.php:369
+msgid "Edit Account Group Details"
+msgstr "계정 편집 그룹 세부 사항"
+
+#: AccountGroups.php:393
+msgid "New Account Group Details"
+msgstr "새 계정 그룹 정보"
+
+#: AccountGroups.php:400
+msgid "Account Group Name"
+msgstr "계정 그룹 이름"
+
+#: AccountGroups.php:401
+msgid "Enter the account group name"
+msgstr "계정 그룹 이름을 입력합니다"
+
+#: AccountGroups.php:401
+msgid "A unique name for the account group must be entered - at least 3 characters long and less than 30 characters long. Only alpha numeric characters can be used."
+msgstr "계정 그룹의 고유 한 이름을 입력해야합니다 - 최소 3 자 긴 미만 30 자. 영문자 및 숫자가 사용될 수있다."
+
+#: AccountGroups.php:410 AccountGroups.php:412
+msgid "Top Level Group"
+msgstr "최상위 그룹"
+
+#: AccountGroups.php:426
+msgid "Section In Accounts"
+msgstr "계정 섹션"
+
+#: AccountGroups.php:442
+msgid "Select YES if this account group will contain accounts that will consist of only profit and loss accounts or NO if the group will contain balance sheet account"
+msgstr "그룹이 대차 대조표 계정을 포함 할 경우이 계정 그룹이 더 만 손익 계정 구성 또는 것이다 계정을 포함 할 경우 YES를 선택"
+
+#: AccountGroups.php:459
+msgid "Enter the sequence number that this account group and its child general ledger accounts should display in the trial balance"
+msgstr "이 계정 그룹과 하위 총계정 원장 계정이 시험 균형을 표시해야합니다 일련 번호를 입력"
+
+#: AccountGroups.php:462 AccountSections.php:262 AddCustomerContacts.php:260
+#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229
+#: BankAccounts.php:433 BOMs.php:818 COGSGLPostings.php:368
+#: CreditStatus.php:259 Currencies.php:534 CustLoginSetup.php:273
+#: Departments.php:258 DiscountMatrix.php:142 EDIMessageFormat.php:248
+#: FixedAssetCategories.php:350 FixedAssetLocations.php:161
+#: FreightCosts.php:371 GeocodeSetup.php:271 GLAccounts.php:265 Labels.php:641
+#: Locations.php:714 Manufacturers.php:312 MRPDemands.php:424
+#: MRPDemandTypes.php:188 OffersReceived.php:57 OffersReceived.php:146
+#: PaymentMethods.php:302 PaymentTerms.php:310 PO_AuthorisationLevels.php:264
+#: PriceMatrix.php:230 Prices_Customer.php:369 ProductSpecs.php:661
+#: QATests.php:359 SalesAnalReptCols.php:552 SalesAnalRepts.php:519
+#: SalesGLPostings.php:427 SalesPeople.php:381 SelectQASamples.php:531
+#: SelectQASamples.php:601 Shippers.php:203 StockCategories.php:653
+#: SupplierContacts.php:284 SuppLoginSetup.php:291 TaxAuthorities.php:327
+#: TaxCategories.php:244 TaxProvinces.php:234 TestPlanResults.php:967
+#: UnitsOfMeasure.php:241 WorkCentres.php:283 WWW_Users.php:774
+msgid "Enter Information"
+msgstr "정보 입력"
+
+#: AccountSections.php:5 includes/MainMenuLinksArray.php:390
+msgid "Account Sections"
+msgstr "계정 섹션"
+
+#: AccountSections.php:61
+msgid "The account section already exists in the database"
+msgstr "계정 섹션은 데이터베이...
[truncated message content] |
|
From: <dai...@us...> - 2015-09-19 04:45:43
|
Revision: 7352
http://sourceforge.net/p/web-erp/reponame/7352
Author: daintree
Date: 2015-09-19 04:45:42 +0000 (Sat, 19 Sep 2015)
Log Message:
-----------
attribution of Korean translation work
Modified Paths:
--------------
trunk/doc/Change.log
trunk/doc/Manual/ManualContributors.html
trunk/includes/LanguagesArray.php
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-09-18 09:56:48 UTC (rev 7351)
+++ trunk/doc/Change.log 2015-09-19 04:45:42 UTC (rev 7352)
@@ -1,5 +1,6 @@
webERP Change Log
+19/9/15 Dongbak Cha:Korean translation via Google translate
14/9/15 RChacon: Rebuild languages files *.pot, *.po and *.mo to includes new texts.
14/9/15 RChacon: In AnalysisHorizontalIncome.php, delete duplicated tag. Replaces text "Absolute/Relative variation" with "Absolute/Relative difference" to avoid confusions.
13/9/15 RChacon: In AccountSections.php, add modifications for direct printing.
Modified: trunk/doc/Manual/ManualContributors.html
===================================================================
--- trunk/doc/Manual/ManualContributors.html 2015-09-18 09:56:48 UTC (rev 7351)
+++ trunk/doc/Manual/ManualContributors.html 2015-09-19 04:45:42 UTC (rev 7352)
@@ -186,6 +186,8 @@
<br />
Danu Satrio Pratomo Djojosoemarto and his cousin - Indonesian<br />
<br />
+ Dongbak Cha - Korean<br />
+ <br />
Gilberto Dos Santos Alves - Portuguese (Brazilian)
<br />
Janusz Dobrowolski - Polish<br />
Modified: trunk/includes/LanguagesArray.php
===================================================================
--- trunk/includes/LanguagesArray.php 2015-09-18 09:56:48 UTC (rev 7351)
+++ trunk/includes/LanguagesArray.php 2015-09-19 04:45:42 UTC (rev 7352)
@@ -94,7 +94,7 @@
$LanguagesArray['ja_JP.utf8']['DecimalPoint'] = '.';
$LanguagesArray['ja_JP.utf8']['ThousandsSeparator'] = ',';
-$LanguagesArray['ko_KR.utf8']['LanguageName'] = 'Korean';
+$LanguagesArray['ko_KR.utf8']['LanguageName'] = '한국어';
$LanguagesArray['ko_KR.utf8']['WindowsLocale'] = 'korean';
$LanguagesArray['ko_KR.utf8']['DecimalPoint'] = '.';
$LanguagesArray['ko_KR.utf8']['ThousandsSeparator'] = ',';
Modified: trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po 2015-09-18 09:56:48 UTC (rev 7351)
+++ trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po 2015-09-19 04:45:42 UTC (rev 7352)
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# FIRST AUTHOR Dongbak Cha <hu...@hu...>, 2015.
#
msgid ""
msgstr ""
@@ -9,12 +9,12 @@
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-09-17 20:17+0900\n"
"PO-Revision-Date: 2015-09-18 10:34+0900\n"
-"Language-Team: \n"
+"Language-Team: Korean\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.4\n"
-"Last-Translator: \n"
+"Last-Translator: Dongbak Cha\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"Language: ko_KR\n"
|
|
From: <rc...@us...> - 2015-09-21 17:30:12
|
Revision: 7356
http://sourceforge.net/p/web-erp/reponame/7356
Author: rchacon
Date: 2015-09-21 17:30:10 +0000 (Mon, 21 Sep 2015)
Log Message:
-----------
In StockLocStatus.php, add current date and time, and format to use print.css.
Modified Paths:
--------------
trunk/StockLocStatus.php
trunk/doc/Change.log
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/StockLocStatus.php
===================================================================
--- trunk/StockLocStatus.php 2015-09-21 02:01:53 UTC (rev 7355)
+++ trunk/StockLocStatus.php 2015-09-21 17:30:10 UTC (rev 7356)
@@ -1,17 +1,23 @@
<?php
-
/* $Id$*/
+/* Shows the stock on hand together with outstanding sales orders and outstanding purchase orders by stock location for all items in the selected stock category */
include('includes/session.inc');
-
$Title = _('All Stock Status By Location/Category');
+$ViewTopic = 'Inventory';
+$BookMark = 'StockLocStatus';
+include('includes/header.inc');
-include('includes/header.inc');
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/magnifier.png" title="',// Icon image.
+ $Title, '" /> ',// Icon title.
+ $Title, '</p>';// Page title.
+
include ('includes/SQL_CommonFunctions.inc');
-if (isset($_GET['StockID'])){
+if(isset($_GET['StockID'])) {
$StockID = trim(mb_strtoupper($_GET['StockID']));
-} elseif (isset($_POST['StockID'])){
+} elseif(isset($_POST['StockID'])) {
$StockID = trim(mb_strtoupper($_POST['StockID']));
}
@@ -19,28 +25,24 @@
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-$sql = "SELECT locations.loccode,
- locationname
- FROM locations
- INNER JOIN locationusers ON locationusers.loccode=locations.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1";
+$sql = "SELECT locations.loccode, locationname
+ FROM locations
+ INNER JOIN locationusers ON locationusers.loccode=locations.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1";
$resultStkLocs = DB_query($sql);
-echo '<p class="page_title_text">
- <img src="' . $RootPath . '/css/' . $Theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'
- </p>';
-
echo '<table class="selection">
<tr>
<td>' . _('From Stock Location') . ':</td>
<td><select name="StockLocation"> ';
-while ($myrow=DB_fetch_array($resultStkLocs)){
- if (isset($_POST['StockLocation']) AND $_POST['StockLocation']!='All'){
- if ($myrow['loccode'] == $_POST['StockLocation']){
- echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+
+while($myrow=DB_fetch_array($resultStkLocs)) {
+ if(isset($_POST['StockLocation']) AND $_POST['StockLocation']!='All') {
+ if($myrow['loccode'] == $_POST['StockLocation']) {
+ echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
- echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
- } elseif ($myrow['loccode']==$_SESSION['UserStockLocation']){
+ } elseif($myrow['loccode']==$_SESSION['UserStockLocation']) {
echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
$_POST['StockLocation']=$myrow['loccode'];
} else {
@@ -55,7 +57,7 @@
FROM stockcategory
ORDER BY categorydescription";
$result1 = DB_query($SQL);
-if (DB_num_rows($result1)==0){
+if(DB_num_rows($result1)==0) {
echo '</table><p>';
prnMsg(_('There are no stock categories currently defined please use the link below to set them up'),'warn');
echo '<br /><a href="' . $RootPath . '/StockCategories.php">' . _('Define Stock Categories') . '</a>';
@@ -65,16 +67,16 @@
echo '<tr><td>' . _('In Stock Category') . ':</td>
<td><select name="StockCat">';
-if (!isset($_POST['StockCat'])){
+if(!isset($_POST['StockCat'])) {
$_POST['StockCat']='All';
}
-if ($_POST['StockCat']=='All'){
+if($_POST['StockCat']=='All') {
echo '<option selected="selected" value="All">' . _('All') . '</option>';
} else {
echo '<option value="All">' . _('All') . '</option>';
}
-while ($myrow1 = DB_fetch_array($result1)) {
- if ($myrow1['categoryid']==$_POST['StockCat']){
+while($myrow1 = DB_fetch_array($result1)) {
+ if($myrow1['categoryid']==$_POST['StockCat']) {
echo '<option selected="selected" value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
} else {
echo '<option value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
@@ -85,42 +87,42 @@
echo '<tr><td>' . _('Shown Only Items Where') . ':</td>
<td><select name="BelowReorderQuantity">';
-if (!isset($_POST['BelowReorderQuantity'])){
+if(!isset($_POST['BelowReorderQuantity'])) {
$_POST['BelowReorderQuantity']='All';
}
-if ($_POST['BelowReorderQuantity']=='All'){
+if($_POST['BelowReorderQuantity']=='All') {
echo '<option selected="selected" value="All">' . _('All') . '</option>
- <option value="Below">' . _('Only items below re-order quantity') . '</option>
- <option value="NotZero">' . _('Only items where stock is available') . '</option>
- <option value="OnOrder">' . _('Only items currently on order') . '</option>';
-} else if ($_POST['BelowReorderQuantity']=='Below') {
+ <option value="Below">' . _('Only items below re-order quantity') . '</option>
+ <option value="NotZero">' . _('Only items where stock is available') . '</option>
+ <option value="OnOrder">' . _('Only items currently on order') . '</option>';
+} else if($_POST['BelowReorderQuantity']=='Below') {
echo '<option value="All">' . _('All') . '</option>
- <option selected="selected" value="Below">' . _('Only items below re-order quantity') . '</option>
- <option value="NotZero">' . _('Only items where stock is available') . '</option>
- <option value="OnOrder">' . _('Only items currently on order') . '</option>';
-} else if ($_POST['BelowReorderQuantity']=='OnOrder') {
- echo '<option value="All">' . _('All') . '</option>
- <option value="Below">' . _('Only items below re-order quantity') . '</option>
- <option value="NotZero">' . _('Only items where stock is available') . '</option>
- <option selected="selected" value="OnOrder">' . _('Only items currently on order') . '</option>';
-} else {
+ <option selected="selected" value="Below">' . _('Only items below re-order quantity') . '</option>
+ <option value="NotZero">' . _('Only items where stock is available') . '</option>
+ <option value="OnOrder">' . _('Only items currently on order') . '</option>';
+} else if($_POST['BelowReorderQuantity']=='OnOrder') {
echo '<option value="All">' . _('All') . '</option>
- <option value="Below">' . _('Only items below re-order quantity') . '</option>
- <option selected="selected" value="NotZero">' . _('Only items where stock is available') . '</option>
- <option value="OnOrder">' . _('Only items currently on order') . '</option>';
+ <option value="Below">' . _('Only items below re-order quantity') . '</option>
+ <option value="NotZero">' . _('Only items where stock is available') . '</option>
+ <option selected="selected" value="OnOrder">' . _('Only items currently on order') . '</option>';
+} else {
+ echo '<option value="All">' . _('All') . '</option>
+ <option value="Below">' . _('Only items below re-order quantity') . '</option>
+ <option selected="selected" value="NotZero">' . _('Only items where stock is available') . '</option>
+ <option value="OnOrder">' . _('Only items currently on order') . '</option>';
}
echo '</select></td></tr>
- </table>';
+ </table>';
echo '<br />
- <div class="centre">
- <input type="submit" name="ShowStatus" value="' . _('Show Stock Status') . '" />
- </div>';
+ <div class="centre noprint">
+ <input name="ShowStatus" type="submit" value="', _('Show Stock Status'), '" />
+ </div>';
-if (isset($_POST['ShowStatus'])){
+if(isset($_POST['ShowStatus'])) {
- if ($_POST['StockCat']=='All') {
+ if($_POST['StockCat']=='All') {
$sql = "SELECT locstock.stockid,
stockmaster.description,
locstock.loccode,
@@ -161,44 +163,44 @@
ORDER BY locstock.stockid";
}
- $ErrMsg = _('The stock held at each location cannot be retrieved because');
+ $ErrMsg = _('The stock held at each location cannot be retrieved because');
$DbgMsg = _('The SQL that failed was');
$LocStockResult = DB_query($sql, $ErrMsg, $DbgMsg);
- echo '<br />
- <table cellpadding="5" cellspacing="4" class="selection">';
- $TableHeader = '<tr>
- <th>' . _('StockID') . '</th>
- <th>' . _('Description') . '</th>
- <th>' . _('Quantity On Hand') . '</th>
- <th>' . _('Bin Loc') . '</th>
- <th>' . _('Re-Order Level') . '</th>
- <th>' . _('Demand') . '</th>
- <th>' . _('Available') . '</th>
- <th>' . _('On Order') . '</th>
- </tr>';
- echo $TableHeader;
+ echo '<br />', DisplayDateTime(), // Display current date and time.
+ '<br />
+ <table cellpadding="5" cellspacing="4" class="selection">
+ <tr>
+ <th>', _('StockID'), '</th>
+ <th class="text">', _('Description'), '</th>
+ <th class="number">', _('Quantity On Hand'), '</th>
+ <th>', _('Bin Loc'), '</th>
+ <th class="number">', _('Re-Order Level'), '</th>
+ <th class="number">', _('Demand'), '</th>
+ <th class="number">', _('Available'), '</th>
+ <th class="number">', _('On Order'), '</th>
+ </tr>';
$k=0; //row colour counter
- while ($myrow=DB_fetch_array($LocStockResult)) {
+ while($myrow=DB_fetch_array($LocStockResult)) {
$StockID = $myrow['stockid'];
$sql = "SELECT SUM(salesorderdetails.quantity-salesorderdetails.qtyinvoiced) AS dem
- FROM salesorderdetails INNER JOIN salesorders
- ON salesorders.orderno = salesorderdetails.orderno
- WHERE salesorders.fromstkloc='" . $myrow['loccode'] . "'
- AND salesorderdetails.completed=0
- AND salesorderdetails.stkcode='" . $StockID . "'
- AND salesorders.quotation=0";
+ FROM salesorderdetails INNER JOIN salesorders
+ ON salesorders.orderno = salesorderdetails.orderno
+ WHERE salesorders.fromstkloc='" . $myrow['loccode'] . "'
+ AND salesorderdetails.completed=0
+ AND salesorderdetails.stkcode='" . $StockID . "'
+ AND salesorders.quotation=0";
$ErrMsg = _('The demand for this product from') . ' ' . $myrow['loccode'] . ' ' . _('cannot be retrieved because');
$DemandResult = DB_query($sql,$ErrMsg);
- if (DB_num_rows($DemandResult)==1){
+ if(DB_num_rows($DemandResult)==1) {
$DemandRow = DB_fetch_row($DemandResult);
- $DemandQty = $DemandRow[0];
+ $DemandQty = $DemandRow[0];
} else {
$DemandQty =0;
}
@@ -206,11 +208,11 @@
//Also need to add in the demand as a component of an assembly items if this items has any assembly parents.
$sql = "SELECT SUM((salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*bom.quantity) AS dem
FROM salesorderdetails INNER JOIN salesorders
- ON salesorders.orderno = salesorderdetails.orderno
- INNER JOIN bom
- ON salesorderdetails.stkcode=bom.parent
+ ON salesorders.orderno = salesorderdetails.orderno
+ INNER JOIN bom
+ ON salesorderdetails.stkcode=bom.parent
INNER JOIN stockmaster
- ON stockmaster.stockid=bom.parent
+ ON stockmaster.stockid=bom.parent
WHERE salesorders.fromstkloc='" . $myrow['loccode'] . "'
AND salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
AND bom.component='" . $StockID . "'
@@ -220,21 +222,21 @@
$ErrMsg = _('The demand for this product from') . ' ' . $myrow['loccode'] . ' ' . _('cannot be retrieved because');
$DemandResult = DB_query($sql, $ErrMsg);
- if (DB_num_rows($DemandResult)==1){
+ if(DB_num_rows($DemandResult)==1) {
$DemandRow = DB_fetch_row($DemandResult);
$DemandQty += $DemandRow[0];
}
$sql = "SELECT SUM((woitems.qtyreqd-woitems.qtyrecd)*bom.quantity) AS dem
FROM workorders INNER JOIN woitems
- ON woitems.wo = workorders.wo
- INNER JOIN bom
- ON woitems.stockid = bom.parent
+ ON woitems.wo = workorders.wo
+ INNER JOIN bom
+ ON woitems.stockid = bom.parent
WHERE workorders.closed=0
- AND bom.component = '". $StockID . "'
- AND workorders.loccode='". $myrow['loccode'] ."'";
+ AND bom.component = '". $StockID . "'
+ AND workorders.loccode='". $myrow['loccode'] ."'";
$DemandResult = DB_query($sql, $ErrMsg);
- if (DB_num_rows($DemandResult)==1){
+ if(DB_num_rows($DemandResult)==1) {
$DemandRow = DB_fetch_row($DemandResult);
$DemandQty += $DemandRow[0];
}
@@ -244,13 +246,13 @@
// Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc
$QOO += GetQuantityOnOrderDueToWorkOrders($StockID, $myrow['loccode']);
- if (($_POST['BelowReorderQuantity']=='Below' AND ($myrow['quantity']-$myrow['reorderlevel']-$DemandQty)<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)){
+ OR ($_POST['BelowReorderQuantity']=='OnOrder' AND $QOO != 0)) {
- if (($_POST['BelowReorderQuantity']=='NotZero') AND (($myrow['quantity']-$DemandQty)>0)) {
+ if(($_POST['BelowReorderQuantity']=='NotZero') AND (($myrow['quantity']-$DemandQty)>0)) {
- if ($k==1){
+ if($k==1) {
echo '<tr class="OddTableRows">';
$k=0;
} else {
@@ -259,33 +261,33 @@
}
$tr = ($myrow['serialised'] or $myrow['controlled'])?'':'<tr>';
printf('<td><a target="_blank" href="' . $RootPath . '/StockStatus.php?StockID=%s">%s</a></td>
- <td>%s</td>
- <td class="number">%s</td>
- <td>%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td class="number"><a target="_blank" href="' . $RootPath . '/SelectProduct.php?StockID=%s">%s</a></td>
- <td class="number">%s</td>
- ' . $tr,
- mb_strtoupper($myrow['stockid']),
- mb_strtoupper($myrow['stockid']),
- $myrow['description'],
- locale_number_format($myrow['quantity'],$myrow['decimalplaces']),
- $myrow['bin'],
- locale_number_format($myrow['reorderlevel'],$myrow['decimalplaces']),
- locale_number_format($DemandQty,$myrow['decimalplaces']),
- mb_strtoupper($myrow['stockid']),
- locale_number_format($myrow['quantity'] - $DemandQty,$myrow['decimalplaces']),
- locale_number_format($QOO,$myrow['decimalplaces']));
+ <td class="text">%s</td>
+ <td class="number">%s</td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ <td class="number"><a target="_blank" href="' . $RootPath . '/SelectProduct.php?StockID=%s">%s</a></td>
+ <td class="number">%s</td>
+ ' . $tr,
+ mb_strtoupper($myrow['stockid']),
+ mb_strtoupper($myrow['stockid']),
+ $myrow['description'],
+ locale_number_format($myrow['quantity'],$myrow['decimalplaces']),
+ $myrow['bin'],
+ locale_number_format($myrow['reorderlevel'],$myrow['decimalplaces']),
+ locale_number_format($DemandQty,$myrow['decimalplaces']),
+ mb_strtoupper($myrow['stockid']),
+ locale_number_format($myrow['quantity'] - $DemandQty,$myrow['decimalplaces']),
+ locale_number_format($QOO,$myrow['decimalplaces']));
- if ($myrow['serialised'] ==1){ /*The line is a serialised item*/
+ if($myrow['serialised'] ==1) { /*The line is a serialised item*/
echo '<td><a target="_blank" href="' . $RootPath . '/StockSerialItems.php?Serialised=Yes&Location=' . $myrow['loccode'] . '&StockID=' . $StockID . '">' . _('Serial Numbers') . '</a></td></tr>';
- } elseif ($myrow['controlled']==1){
+ } elseif($myrow['controlled']==1) {
echo '<td><a target="_blank" href="' . $RootPath . '/StockSerialItems.php?Location=' . $myrow['loccode'] . '&StockID=' . $StockID . '">' . _('Batches') . '</a></td></tr>';
}
- } else if ($_POST['BelowReorderQuantity']!='NotZero') {
- if ($k==1){
+ } else if($_POST['BelowReorderQuantity']!='NotZero') {
+ if($k==1) {
echo '<tr class="OddTableRows">';
$k=0;
} else {
@@ -310,10 +312,10 @@
mb_strtoupper($myrow['stockid']),
locale_number_format($myrow['quantity'] - $DemandQty,$myrow['decimalplaces']),
locale_number_format($QOO,$myrow['decimalplaces']));
- if ($myrow['serialised'] ==1){ /*The line is a serialised item*/
+ if($myrow['serialised'] ==1) { /*The line is a serialised item*/
echo '<td><a target="_blank" href="' . $RootPath . '/StockSerialItems.php?Serialised=Yes&Location=' . $myrow['loccode'] . '&StockID=' . $StockID . '">' . _('Serial Numbers') . '</a></td></tr>';
- } elseif ($myrow['controlled']==1){
+ } elseif($myrow['controlled']==1) {
echo '<td><a target="_blank" href="' . $RootPath . '/StockSerialItems.php?Location=' . $myrow['loccode'] . '&StockID=' . $StockID . '">' . _('Batches') . '</a></td></tr>';
}
} //end of page full new headings if
@@ -325,6 +327,6 @@
} /* Show status button hit */
echo '</div>
</form>';
+
include('includes/footer.inc');
-
?>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-09-21 02:01:53 UTC (rev 7355)
+++ trunk/doc/Change.log 2015-09-21 17:30:10 UTC (rev 7356)
@@ -1,5 +1,7 @@
webERP Change Log
-21/09/15 Exson: Fix the wrong material cost updated in SupplierCredit.php. Reported by Akits.
+
+21/09/15 RChacon: In StockLocStatus.php, add current date and time, and format to use print.css.
+21/09/15 Exson: Fix the wrong material cost updated in SupplierCredit.php. Reported by Akits.
19/9/15 Dongbak Cha:Korean translation via Google translate
14/9/15 RChacon: Rebuild languages files *.pot, *.po and *.mo to includes new texts.
14/9/15 RChacon: In AnalysisHorizontalIncome.php, delete duplicated tag. Replaces text "Absolute/Relative variation" with "Absolute/Relative difference" to avoid confusions.
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-09-21 02:01:53 UTC (rev 7355)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-09-21 17:30:10 UTC (rev 7356)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-09-14 09:07-0600\n"
-"PO-Revision-Date: 2015-09-14 10:03-0600\n"
+"PO-Revision-Date: 2015-09-21 09:50-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -1488,7 +1488,7 @@
#: AnalysisHorizontalIncome.php:105 AnalysisHorizontalPosition.php:72
msgid "Detail or summary"
-msgstr ""
+msgstr "Detalle o resumen"
#: AnalysisHorizontalIncome.php:106 AnalysisHorizontalPosition.php:73
#: GLBalanceSheet.php:60
@@ -1510,7 +1510,7 @@
#: AnalysisHorizontalIncome.php:112 AnalysisHorizontalPosition.php:79
msgid "Show all accounts including zero balances"
-msgstr ""
+msgstr "Mostrar todas las cuentas incluyendo saldos en cero"
#: AnalysisHorizontalIncome.php:113 AnalysisHorizontalPosition.php:80
#: GLBalanceSheet.php:67 GLProfit_Loss.php:116
@@ -1525,14 +1525,14 @@
#: AnalysisHorizontalPosition.php:85 AnalysisHorizontalPosition.php:86
#: GLBalanceSheet.php:73 GLProfit_Loss.php:121
msgid "Show on Screen (HTML)"
-msgstr "Mostrar en Pantalla (HTML)"
+msgstr "Mostrar en pantalla (HTML)"
#: AnalysisHorizontalIncome.php:121 AnalysisHorizontalIncome.php:521
#: AnalysisHorizontalPosition.php:88 AnalysisHorizontalPosition.php:370
#: DailyBankTransactions.php:190 GLBalanceSheet.php:718 GLProfit_Loss.php:1315
#: GLTrialBalance.php:736
msgid "Return"
-msgstr ""
+msgstr "Regresar"
#: AnalysisHorizontalIncome.php:131 GLProfit_Loss.php:147
#: GLProfit_Loss.php:576 GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:479
@@ -1678,7 +1678,7 @@
#: AnalysisHorizontalIncome.php:500
msgid "Net Profit"
-msgstr ""
+msgstr "Utilidad neta"
#: AnalysisHorizontalIncome.php:517 AnalysisHorizontalPosition.php:366
#: DailyBankTransactions.php:184 GLBalanceSheet.php:714 GLProfit_Loss.php:1311
@@ -1693,7 +1693,7 @@
#: GLTrialBalance.php:733 GLTrialBalance.php:734 SalesGraph.php:20
#: SalesGraph.php:29 SalesGraph.php:34
msgid "Select A Different Period"
-msgstr "Seleccione un Período distinto"
+msgstr "Seleccione un período distinto"
#: AnalysisHorizontalPosition.php:15 AnalysisHorizontalPosition.php:28
#: AnalysisHorizontalPosition.php:109 AnalysisHorizontalPosition.php:110
@@ -2836,7 +2836,7 @@
#: BOMs.php:452
msgid "Select a Different BOM"
-msgstr "Seleccione una HCM diferente"
+msgstr "Seleccione una HCM distinta"
#: BOMs.php:468
msgid "Manufactured parent items"
@@ -11355,7 +11355,7 @@
#: DeliveryDetails.php:844
msgid "Select A Different Order"
-msgstr "Seleccione una Pedidos Diferente"
+msgstr "Seleccione una orden distinta"
#: DeliveryDetails.php:856 GoodsReceived.php:109 Shipments.php:489
#: SpecialOrder.php:627
@@ -19130,7 +19130,7 @@
#: PDFCustomerList.php:391
msgid "All sales folk"
-msgstr "Todo el equipo de ventas"
+msgstr "Todos los vendedores"
#: PDFCustomerList.php:401
msgid "Level Of Activity"
@@ -20252,7 +20252,7 @@
#: PDFStockLocTransfer.php:5
msgid "Stock Location Transfer Docket Error"
-msgstr "Error de Expediente de Transferencia de Ubicación de Existencia"
+msgstr "Error de Expediente de Transferencia de ubicación de inventario"
#: PDFStockLocTransfer.php:17
msgid "Reprint transfer docket"
@@ -22952,7 +22952,7 @@
#: PcReportTab.php:409
msgid "Select A Different Date"
-msgstr "Seleccione una Fecha distinta"
+msgstr "Seleccione una fecha distinta"
#: PcTabs.php:5
msgid "Maintenance Of Petty Cash Tabs"
@@ -25458,7 +25458,7 @@
#: StockLocMovements.php:19 StockLocStatus.php:34 StockLocTransfer.php:260
#: StockMovements.php:38 StockTransfers.php:576 StockUsage.php:66
msgid "From Stock Location"
-msgstr "Desde la localización de existencias"
+msgstr "Desde la ubicación de inventario"
#: ReorderLevel.php:303 WOCanBeProducedNow.php:50
msgid "Needed"
@@ -26930,7 +26930,7 @@
#: SalesInquiry.php:1188
msgid "All Salesmen"
-msgstr "Todos los Vendedores"
+msgstr "Todos los vendedores"
#: SalesInquiry.php:1217
msgid "Transaction Number sort only valid for Invoice Date Type"
@@ -29470,7 +29470,7 @@
#: Shipments.php:353
msgid "Stock Location"
-msgstr "Ubicación de existencia"
+msgstr "Ubicación de inventario"
#: Shipments.php:394
msgid "Order Lines On This Shipment"
@@ -29809,7 +29809,7 @@
#: ShopParameters.php:319
msgid "Stock Locations"
-msgstr "Ubicaciones de inventarios"
+msgstr "Ubicaciones de inventario"
#: ShopParameters.php:330
msgid ""
@@ -30174,7 +30174,7 @@
#: SpecialOrder.php:442
msgid "The item stock locations for the special order line"
msgstr ""
-"Las ubicaciones de existencias del artículo para la fila del pedido especial"
+"Las ubicaciones de inventario del artículo para la fila del pedido especial"
#: SpecialOrder.php:443
msgid ""
@@ -31612,7 +31612,7 @@
#: StockLocStatus.php:7
msgid "All Stock Status By Location/Category"
-msgstr "Todos los Estados de Existencias por Ubicación/Categoría"
+msgstr "Todos los estados de inventario por ubicación/categoría"
#: StockLocStatus.php:86
msgid "Shown Only Items Where"
@@ -32001,7 +32001,7 @@
#: StockLocTransferReceive.php:614
msgid "Select A Different Transfer"
-msgstr "Seleccione una transferencia diferente"
+msgstr "Seleccione una transferencia distinta"
#: StockLocTransferReceive.php:628
msgid "Select Location Receiving Into"
@@ -37607,7 +37607,7 @@
#: TaxProvinces.php:129
msgid "stock locations that refer to this tax province"
-msgstr "Ubicaciones de Almacenes en esta jurisdicción fiscal"
+msgstr "Ubicaciones de inventario en esta jurisdicción fiscal"
#: TaxProvinces.php:135
msgid "tax province and any tax rates set for it have been deleted"
@@ -39603,7 +39603,7 @@
#: WorkOrderReceive.php:757
msgid "Select a different work order for receiving finished stock against"
msgstr ""
-"Seleccione una orden de trabajo diferente para la recepción de existencias "
+"Seleccione una orden de trabajo distinta para la recepción de existencias "
"terminadas en contra de"
#: WorkOrderReceive.php:816
@@ -39877,7 +39877,7 @@
#: Z_ChangeBranchCode.php:217
msgid "New Branch Code"
-msgstr "Nuevo Código de sucursal"
+msgstr "Nuevo código de sucursal"
#: Z_ChangeCustomerCode.php:6
msgid "UTILITY PAGE To Changes A Customer Code In All Tables"
@@ -45109,7 +45109,7 @@
#: api/api_xml-rpc.php:1507
msgid "Stock Location Code"
-msgstr "Código de Ubicación de Existencia"
+msgstr "Código de ubicación de inventario"
#: api/api_xml-rpc.php:1508
msgid "A stock location code as returned by the GetLocationList function."
@@ -46269,7 +46269,7 @@
#: includes/PDFCustomerListPageHeader.inc:43
msgid "All Salespeople"
-msgstr "Todos los Vendedores"
+msgstr "Todos los vendedores"
#: includes/PDFCustomerListPageHeader.inc:48
msgid "Salespeople"
@@ -49409,7 +49409,7 @@
#: includes/MainMenuLinksArray.php:225
msgid "Reprint GRN"
-msgstr "Reimprimir"
+msgstr "Reimprimir "
#: includes/MainMenuLinksArray.php:226
msgid "Inventory Item Movements"
@@ -50559,7 +50559,7 @@
#: reportwriter/languages/en_US/reports.php:91
msgid "Reports"
-msgstr ""
+msgstr "Informes"
#: reportwriter/languages/en_US/reports.php:94
msgid "Second"
@@ -50575,7 +50575,7 @@
#: reportwriter/languages/en_US/reports.php:97
msgid "Select a field..."
-msgstr ""
+msgstr "Seleccione un campo..."
#: reportwriter/languages/en_US/reports.php:99
msgid "Sixth"
@@ -50607,7 +50607,7 @@
#: reportwriter/languages/en_US/reports.php:117
msgid "Report/Form: "
-msgstr ""
+msgstr "Informe/Formulario:"
#: reportwriter/languages/en_US/reports.php:118
msgid "Report and Form Builder - "
@@ -50639,7 +50639,7 @@
#: reportwriter/languages/en_US/reports.php:125
msgid "Reports Menu"
-msgstr ""
+msgstr "Menú de informes"
#: reportwriter/languages/en_US/reports.php:126
#: reportwriter/languages/en_US/reports.php:139
@@ -50967,11 +50967,11 @@
#: reportwriter/languages/en_US/reports.php:222
msgid "Report Title 1"
-msgstr ""
+msgstr "Título 1 del informe"
#: reportwriter/languages/en_US/reports.php:223
msgid "Report Title 2"
-msgstr ""
+msgstr "Título 2 del informe"
#: reportwriter/languages/en_US/reports.php:224
msgid "Report Data"
@@ -50979,7 +50979,7 @@
#: reportwriter/languages/en_US/reports.php:225
msgid "Report/Form Identification"
-msgstr ""
+msgstr "Identificación de informe/Formulario"
#: reportwriter/languages/en_US/reports.php:226
msgid "Report Import"
@@ -51015,7 +51015,7 @@
#: reportwriter/languages/en_US/reports.php:234
msgid "Report Totals"
-msgstr ""
+msgstr "Totales del informe"
#: reportwriter/languages/en_US/reports.php:235
msgid "Enter fields to total (Table.Fieldname)"
|
|
From: <te...@us...> - 2015-09-28 00:57:27
|
Revision: 7360
http://sourceforge.net/p/web-erp/reponame/7360
Author: tehonu
Date: 2015-09-28 00:57:25 +0000 (Mon, 28 Sep 2015)
Log Message:
-----------
Several fixes and add of logo (not labels can print company logo image)
Modified Paths:
--------------
trunk/Labels.php
trunk/PDFPrintLabel.php
Modified: trunk/Labels.php
===================================================================
--- trunk/Labels.php 2015-09-23 13:53:26 UTC (rev 7359)
+++ trunk/Labels.php 2015-09-28 00:57:25 UTC (rev 7360)
@@ -6,7 +6,7 @@
$Title = _('Label Templates');
include('includes/header.inc');
-//define PaperSize array sizes in pdf points
+//define PaperSize array sizes in mm
$PaperSize = array();
$PaperSize['A4']['PageHeight'] = 297;
$PaperSize['A4']['PageWidth'] = 210;
@@ -114,7 +114,7 @@
echo '<p class="page_title_text">
<img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Label Template Maintenance')
- . '" alt="" />' . $Title . ' - ' . _('all measurements in PDF points') .
+ . '" alt="" />' . $Title . ' - ' . _('all measurements in mm.') .
'</p>';
if (!function_exists('gd_info')) {
@@ -591,6 +591,11 @@
} else {
echo '<option value="price">' . _('Price') . '</option>';
}
+ if ($myrow['fieldvalue']=='logo'){
+ echo '<option selected="selected" value="logo">' . _('Company Logo') . '</option>';
+ } else {
+ echo '<option value="logo">' . _('Company Logo') . '</option>';
+ }
echo '</select></td>
<td><input type="text" name="VPos' . $i . '" size="4" maxlength="4" value="' . $myrow['vpos'] . '" /></td>
<td><input type="text" name="HPos' . $i . '" size="4" maxlength="4" value="' . $myrow['hpos'] . '" /></td>
@@ -620,6 +625,7 @@
<option value="itemdescription">' . _('Item Descrption') . '</option>
<option value="barcode">' . _('Item Barcode') . '</option>
<option value="price">' . _('Price') . '</option>
+ <option value="logo">' . _('Company Logo') . '</option>
</select></td>
<td><input type="text" size="4" maxlength="4" name="VPos" /></td>
<td><input type="text" size="4" maxlength="4" name="HPos" /></td>
Modified: trunk/PDFPrintLabel.php
===================================================================
--- trunk/PDFPrintLabel.php 2015-09-23 13:53:26 UTC (rev 7359)
+++ trunk/PDFPrintLabel.php 2015-09-28 00:57:25 UTC (rev 7360)
@@ -4,13 +4,11 @@
include('includes/session.inc');
include('includes/barcodepack/class.code128.php');
-$PtsPerMM = 2.83465; //pdf points per mm
+$PtsPerMM = 2.83464567; //pdf points per mm (72 dpi / 25.4 mm per inch)
if ((isset($_POST['ShowLabels']) OR isset($_POST['SelectAll']))
- AND isset($_POST['FromCriteria'])
- AND mb_strlen($_POST['FromCriteria'])>=1
- AND isset($_POST['ToCriteria'])
- AND mb_strlen($_POST['ToCriteria'])>=1){
+ AND isset($_POST['StockCategory'])
+ AND mb_strlen($_POST['StockCategory'])>=1){
$Title = _('Print Labels');
include('includes/header.inc');
@@ -26,8 +24,7 @@
ON stockmaster.stockid=prices.stockid
INNER JOIN currencies
ON prices.currabrev=currencies.currabrev
- WHERE stockmaster.categoryid >= '" . $_POST['FromCriteria'] . "'
- AND stockmaster.categoryid <= '" . $_POST['ToCriteria'] . "'
+ WHERE stockmaster.categoryid = '" . $_POST['StockCategory'] . "'
AND prices.typeabbrev='" . $_POST['SalesType'] . "'
AND prices.currabrev='" . $_POST['Currency'] . "'
AND prices.startdate<='" . FormatDateForSQL($_POST['EffectiveDate']) . "'
@@ -98,8 +95,7 @@
echo '</table>
<input type="hidden" name="NoOfLabels" value="' . $i . '" />
<input type="hidden" name="LabelID" value="' . $_POST['LabelID'] . '" />
- <input type="hidden" name="FromCriteria" value="' . $_POST['FromCriteria'] . '" />
- <input type="hidden" name="ToCriteria" value="' . $_POST['ToCriteria'] . '" />
+ <input type="hidden" name="StockCategory" value="' . $_POST['StockCategory'] . '" />
<input type="hidden" name="SalesType" value="' . $_POST['SalesType'] . '" />
<input type="hidden" name="Currency" value="' . $_POST['Currency'] . '" />
<input type="hidden" name="EffectiveDate" value="' . $_POST['EffectiveDate'] . '" />
@@ -199,9 +195,8 @@
$NoOfLabels--;
foreach ($LabelFields as $Field){
//print_r($Field);
-
if ($Field['FieldValue']== 'price'){
- $Value = $_POST['Price' . $i];
+ $Value = $_POST['Price' . $i] . ' '. $_POST['Currency'];
} elseif ($Field['FieldValue']== 'stockid'){
$Value = $_POST['StockID' . $i];
} elseif ($Field['FieldValue']== 'description'){
@@ -210,8 +205,12 @@
$Value = $_POST['Barcode' . $i];
}
if ($Field['FieldValue'] == 'price'){ //need to format for the number of decimal places
- $LeftOvers = $pdf->addTextWrap($XPos+$Field['HPos'],$YPos-$LabelDimensions['label_height']+$Field['VPos'],$LabelDimensions['label_width']-$Field['HPos'],$Field['FontSize'],$_POST['Price' . $i],'center');
- } elseif($Field['Barcode']==1) {
+// $LeftOvers = $pdf->addTextWrap($XPos+$Field['HPos'],$YPos-$LabelDimensions['label_height']+$Field['VPos'],$LabelDimensions['label_width']-$Field['HPos'],$Field['FontSize'],$_POST['Price' . $i],'center');
+ $LeftOvers = $pdf->addTextWrap($XPos+$Field['HPos'],$YPos-$LabelDimensions['label_height']+$Field['VPos'],$LabelDimensions['label_width']-$Field['HPos'],$Field['FontSize'],$Value);
+ }elseif ($Field['FieldValue'] == 'logo'){
+ $pdf->addJpegFromFile($_SESSION['LogoFile'],$XPos+$Field['HPos'],$YPos-$LabelDimensions['label_height']+$Field['VPos'],'', $Field['FontSize']);
+
+ }elseif($Field['Barcode']==1) {
$BarcodeImage = new code128(str_replace('_','',$Value));
@@ -223,7 +222,7 @@
$pdf->addJpegFromFile('@' . $Image_String,$XPos+$Field['HPos'],$YPos-$LabelDimensions['label_height']+$Field['VPos'],'', $Field['FontSize']);
} else {
- $LeftOvers = $pdf->addTextWrap($XPos+$Field['HPos'],$YPos-$LabelDimensions['label_height']+$Field['VPos'],$LabelDimensions['label_width']-$Field['HPos']-20,$Field['FontSize'],$Value);
+ $LeftOvers = $pdf->addTextWrap($XPos+$Field['HPos'],$YPos-$LabelDimensions['label_height']+$Field['VPos'],$LabelDimensions['label_width']-$Field['HPos'],$Field['FontSize'],$Value);
}
} // end loop through label fields
if ($NoOfLabels>0) {
@@ -273,9 +272,9 @@
}
- if (!isset($_POST['FromCriteria']) OR !isset($_POST['ToCriteria'])) {
+ if (!isset($_POST['StockCategory'])) {
- /*if $FromCriteria is not set then show a form to allow input */
+ /*if $StockCategory is not set then show a form to allow input */
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
@@ -291,26 +290,15 @@
echo '</select></td>
</tr>
<tr>
- <td>' . _('From Inventory Category Code') .':</td>
- <td><select name="FromCriteria">';
+ <td>' . _('For Stock Category') .':</td>
+ <td><select name="StockCategory">';
- $CatResult= DB_query("SELECT categoryid, categorydescription FROM stockcategory ORDER BY categoryid");
+ $CatResult= DB_query("SELECT categoryid, categorydescription FROM stockcategory ORDER BY categorydescription");
while ($myrow = DB_fetch_array($CatResult)){
- echo '<option value="' . $myrow['categoryid'] . '">' . $myrow['categoryid'] . ' - ' . $myrow['categorydescription'] . '</option>';
+ echo '<option value="' . $myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>';
}
echo '</select></td></tr>';
- echo '<tr><td>' . _('To Inventory Category Code'). ':</td>
- <td><select name="ToCriteria">';
-
- /*Set the index for the categories result set back to 0 */
- DB_data_seek($CatResult,0);
-
- While ($myrow = DB_fetch_array($CatResult)){
- echo '<option value="' . $myrow['categoryid'] . '">' . $myrow['categoryid'] . ' - ' . $myrow['categorydescription'] . '</option>';
- }
- echo '</select></td></tr>';
-
echo '<tr><td>' . _('For Sales Type/Price List').':</td>
<td><select name="SalesType">';
$sql = "SELECT sales_type, typeabbrev FROM salestypes";
|
|
From: <ex...@us...> - 2015-10-06 12:36:29
|
Revision: 7365
http://sourceforge.net/p/web-erp/reponame/7365
Author: exsonqu
Date: 2015-10-06 12:36:27 +0000 (Tue, 06 Oct 2015)
Log Message:
-----------
06/10/15 UK-Steven: Contribute email customer statements feature scripts.
Modified Paths:
--------------
trunk/PrintCustStatements.php
trunk/SelectCustomer.php
Added Paths:
-----------
trunk/EmailCustStatements.php
Added: trunk/EmailCustStatements.php
===================================================================
--- trunk/EmailCustStatements.php (rev 0)
+++ trunk/EmailCustStatements.php 2015-10-06 12:36:27 UTC (rev 7365)
@@ -0,0 +1,51 @@
+<?php
+
+/* $Id: EmailCustTrans.php 6310 2013-08-29 10:42:50Z daintree $*/
+
+include ('includes/session.inc');
+include ('includes/SQL_CommonFunctions.inc');
+if (!isset($_GET['FromCust'])) {
+ $_GET['FromCust'] = $_SESSION['CustomerID'];
+}
+$Title=_('Email Customer Statement For Customer No.') . ' ' . $_GET['FromCust'];
+
+if (isset($_POST['DoIt']) AND IsEmailAddress($_POST['EmailAddr'])){
+ echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/PrintCustStatements.php?FromCust=' . $_SESSION['CustomerID'] . '&ToCust='.$_SESSION['CustomerID'] . '&PrintPDF=Yes&Email=' . $_POST['EmailAddr'] . '">';
+ prnMsg(_('The customer statement should have been emailed off') . '. ' . _('If this does not happen') . ' (' . _('if the browser does not support META Refresh') . ')' . '<a href="' . $RootPath . '/PrintCustStatements.php?FromCust=' . $_SESSION['CustomerID'] . '&PrintPDF=Yes&Email=' . $_POST['EmailAddr'] . '">' . _('click here') . '</a> ' . _('to email the customer statement'),'success');
+ exit;
+} elseif (isset($_POST['DoIt'])) {
+ prnMsg(_('The email address does not appear to be a valid email address. The statement was not emailed'),'warn');
+}
+include ('includes/header.inc');
+
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<div>';
+echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+echo '<br /><table>';
+
+$SQL = "SELECT custbranch.email as email
+ FROM custbranch INNER JOIN debtorsmaster
+ ON custbranch.debtorno= debtorsmaster.debtorno
+ WHERE debtorsmaster.debtorno='" .$_SESSION['CustomerID'] . "' LIMIT 1";
+
+$ErrMsg = _('There was a problem retrieving the contact details for the customer');
+$ContactResult=DB_query($SQL,$db,$ErrMsg);
+
+if (DB_num_rows($ContactResult)>0){
+ $EmailAddrRow = DB_fetch_row($ContactResult);
+ $EmailAddress = $EmailAddrRow[0];
+} else {
+ $EmailAddress ='';
+}
+
+echo '<tr><td>' . _('Email to') . ':</td>
+ <td><input type="email" name="EmailAddr" autofocus="autofocus" maxlength="60" size="60" value="' . $EmailAddress . '" /></td>
+ </tr>
+ </table>';
+
+echo '<br /><div class="centre"><input type="submit" name="DoIt" value="' . _('OK') . '" />';
+echo '</div>
+ </div>
+ </form>';
+include ('includes/footer.inc');
+?>
Modified: trunk/PrintCustStatements.php
===================================================================
--- trunk/PrintCustStatements.php 2015-10-06 10:04:45 UTC (rev 7364)
+++ trunk/PrintCustStatements.php 2015-10-06 12:36:27 UTC (rev 7365)
@@ -7,7 +7,7 @@
$ViewTopic = 'ARReports';
$BookMark = 'CustomerStatements';
-
+$Title = _('Print Customer Statements');
// If this file is called from another script, we set the required POST variables from the GET
// We call this file from SelectCustomer.php when a customer is selected and we want a statement printed
@@ -180,6 +180,8 @@
include('includes/PDFStatementPageHeader.inc');
+ $Cust_Name = $StmtHeader['name'];
+ $Cust_No = $StmtHeader['debtorno'];
if ($_SESSION['Show_Settled_LastMonth']==1){
if (DB_num_rows($SetldTrans)>=1) {
@@ -434,8 +436,39 @@
} /* end loop to print statements */
if (isset($pdf)){
+ if (isset($_GET['Email'])){ //email the invoice to address supplied
+ include ('includes/htmlMimeMail.php');
+ $FileName = 'XXX_' . 'Statement_' . $Cust_No . '_' . $Cust_Name . '.pdf';
+ $pdf->Output($FileName,'F');
+ $mail = new htmlMimeMail();
- $pdf->OutputD($_SESSION['DatabaseName'] . '_CustStatements_' . date('Y-m-d') . '.pdf');
+ $Attachment = $mail->getFile($FileName);
+ $mail->setText(_('Please find attached Statements') );
+ $mail->SetSubject('Your Statement From XXX');
+ $mail->addAttachment($Attachment, $FileName, 'application/pdf');
+ if($_SESSION['SmtpSetting'] == 0){
+ $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . ' <' . $_SESSION['CompanyRecord']['email'] . '>');
+ $result = $mail->send(array($_GET['Email']));
+ }else{
+ $result = SendmailBySmtp($mail,array($_GET['Email']));
+ }
+
+ unlink($FileName); //delete the temporary file
+
+ $Title = _('Emailing customer statements');
+ include('includes/header.inc');
+ echo '<p>' . _(' Customer statements has been emailed to') . ' ' . $_GET['Email'];
+ include('includes/footer.inc');
+ exit;
+
+
+ } else { //its not an email just print the invoice to PDF
+
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_CustStatements_' . date('Y-m-d') . '.pdf');
+
+
+ }
+
$pdf->__destruct();
} else {
@@ -476,4 +509,4 @@
} /*end of else not PrintPDF */
-?>
\ No newline at end of file
+?>
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2015-10-06 10:04:45 UTC (rev 7364)
+++ trunk/SelectCustomer.php 2015-10-06 12:36:27 UTC (rev 7365)
@@ -222,6 +222,7 @@
echo '<a href="' . $RootPath . '/CustomerAccount.php?CustomerID=' . $_SESSION['CustomerID'] . '">' . _('Customer Account statement on screen') . '</a><br />';
echo '<a href="' . $RootPath . '/Customers.php?DebtorNo=' . $_SESSION['CustomerID'] . '&Modify=No">' . _('View Customer Details') . '</a><br />';
echo '<a href="' . $RootPath . '/PrintCustStatements.php?FromCust=' . $_SESSION['CustomerID'] . '&ToCust=' . $_SESSION['CustomerID'] . '&PrintPDF=Yes">' . _('Print Customer Statement') . '</a><br />';
+ echo '<a href="' . $RootPath . '/EmailCustStatements.php?FromCust=' . $_SESSION['CustomerID'] . '&ToCust=' . $_SESSION['CustomerID'] . '&PrintPDF=Yes">' . _('Email Customer Statement') . '</a><br />';
echo '<a href="' . $RootPath . '/SelectCompletedOrder.php?SelectedCustomer=' . $_SESSION['CustomerID'] . '">' . _('Order Inquiries') . '</a><br />';
echo '<a href="' . $RootPath . '/CustomerPurchases.php?DebtorNo=' . $_SESSION['CustomerID'] . '">' . _('Show purchases from this customer') . '</a><br />';
wikiLink('Customer', $_SESSION['CustomerID']);
|
Thanks for helping keep SourceForge clean.
X