Commit Graph
12781 Commits
Author SHA1 Message Date
Scott Gray b9b0a55b55 When possible log the actual test case name, makes debugging a lot easier
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882060 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 07:09:18 +00:00
Scott Gray 04ad21560d Fixed incorrect camel casing in the test case name
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882058 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 07:06:33 +00:00
Scott Gray 6d66bd096a Removed code block that was causing invoices with types other than sales or purchase to return a total of zero (e.g. a commission invoice)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882048 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 05:00:06 +00:00
Scott Gray d524c9b93a Corrected unitCosts for test inventory I created yesterday
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882045 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 04:24:44 +00:00
Scott Gray a597b2a624 Added missing paymentMethodId to the testGlPostingOnCheckRun test, now passes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882044 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 04:21:54 +00:00
Scott Gray 92a2370f03 When creating gl entries for outgoing payments, get the glAccountId for the credit entry from the PaymentMethodTypeGlAccount record for the given payment.paymentMethodTypeId
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882043 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 04:18:24 +00:00
Scott Gray 3dc7e6e7a2 Fixed the testDepositWithdrawPayments and testDepositWithdrawPaymentsInSingleTrans tests
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882034 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 02:50:39 +00:00
Bruno Busco e1b3275805 Moved some application labels out of the framework (more to come)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882011 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 00:10:52 +00:00
Bruno Busco 220705d2da A slightly modified patch from Sascha Rodekamp "Drag 'n' Drop for myPortal + update prototype and script.aculo.us"
(https://issues.apache.org/jira/browse/OFBIZ-3190) - OFBIZ-3190

- I changed some tabs to spaces
- It seems to me that everything works with the script.aculo.us version that is already present in the framework; so I did not commit the script.aculo.us update since could break some other thing

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881999 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 23:31:59 +00:00
Jacques Le Roux 189e7ad383 A patch from Erwan de FERRIERES "Misc. French translations" (https://issues.apache.org/jira/browse/OFBIZ-3222) - OFBIZ-3222
Some translations for the accounting component, and for the CommonUiLabels file 

I have also changed some other labels in ProductEntityLabels.xml and ProductUiLabels.xml while I was at it 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881987 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 23:03:48 +00:00
Bruno Busco 9ba562fc96 Better/New Italian labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881982 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 22:59:47 +00:00
Scott Gray 4402b87e27 Added missing paymentMethodId to the createPaymentAndPaymentGroupForInvoicesMap service call
Replaced invoiceId demo10001 with 8008 since only invoices in the ready status can be supplied in the invoiceId list
Remove invoice 8001 from the list since the previous test sets it's status to cancelled
Fixes the auto-tests-createPaymentAndPaymentGroupForInvoices test

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881980 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 22:57:23 +00:00
Bruno Busco a2ba546fb9 A patch from Erwan de FERRIERES "internationalization of the myportal page" (https://issues.apache.org/jira/browse/OFBIZ-3220) - OFBIZ-3220
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881979 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 22:49:10 +00:00
Jacques Le Roux c5d92b38a9 A patch from Erwan de FERRIERES "showHelp missing in oagis and googlecheckout components" (https://issues.apache.org/jira/browse/OFBIZ-3221) - OFBIZ-3221
Last showHelps calls missing, I think that are the lasts ones.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881975 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 22:43:32 +00:00
Scott Gray 2c15491085 Fixed the testCreatePaymentGroupAndMember test, it was trying to add a refund payment to a batch payment group which is only suitable for receipt payments
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881969 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 22:30:17 +00:00
Scott Gray ce290f5855 Added PaymentMethod.description to the PaymentMethodAndCreditCard view at the request of Cimballi on the user mailing list
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881967 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 22:27:23 +00:00
Bruno Busco 57d4cb5ea9 Better Italian labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881944 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 21:34:56 +00:00
Scott Gray 0cc92b4e38 Fixed the testAcctgTransOnAddFinishedProductsIntoWarehouse test, the dollar value it was checking was wrong, I've double checked the calculations and change to the correct value.
All tests in this suite now pass

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881926 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 20:39:57 +00:00
Jacques Le Roux bda8112975 A patch from Luís Alfredo Harriss Maranesi " Brazilian Portuguese Translation for Ecommerce" (https://issues.apache.org/jira/browse/OFBIZ-3219) - OFBIZ-3219
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881855 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 18:05:48 +00:00
Jacques Le Roux dd66fd9dd6 Some itemizedlists and orderedlists in Accounting Help
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881845 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 17:39:53 +00:00
Scott Gray f0b1ad052d There is currently no way of determining what glAccountTypeId should be used when a CostComponent has been created based on a FixedAsset's FixedAssetStdCost records, hard-coding it as OPERATING_EXPENSE until that is resolved.
Prior to this all Fixed Asset derived CostComponent GL entries were ending up in the error journal.
Fixes the testAcctgTransForActualManufacturingCost test.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881738 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 12:02:02 +00:00
Scott Gray cec66ec0c5 Pass the fixedAssetId to the createCostComponent service when creating a production run task cost based on fixed asset usage
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881734 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 11:45:18 +00:00
Scott Gray ce66eb6c06 Added fixedAssetId and relationship to CostComponent to so that it is easier to determine the source of the cost (in most cases the source is CostComponentCalc but for fixed asset usage it is FixedAssetStdCost)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881732 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 11:43:11 +00:00
Scott Gray 353669de67 Corrected CostComponentCalc record, I thing the costComponentCalcId changed from EXAMPLE_COST to TASK_COST_CALC at some point and this was left behind
Partially fixes the testAcctgTransForActualManufacturingCost test

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881728 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 11:28:45 +00:00
Scott Gray 43479ac1ed Change status of production run before issuing inventory to it's task
Removed log statement I left behind in a previous commit
Fixed testAcctgTransForActualManufacturingCost to properly lookup the production run and task to be completed
Start the task before attempting to complete it and added missing status from changeProductionRunTaskStatus call
Fixed wrong component productIds, they must have changed in the demo data at some point
Note the test still fails but it is now failing for the right reasons

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881725 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 11:23:13 +00:00
Jacques Le Roux c039216676 A patch from Chandan Khandelwal "Bug on Party ViewProfile Page" (https://issues.apache.org/jira/browse/OFBIZ-3217) - OFBIZ-3217
Steps for reproduce error
1) Go to partymgr find screen
2) Select customer which have geoPointId [partyId : DemoCustomer ]
3) Update postal address which have geolocation
4) Remove all Contact Purposes and Go Back to profile screen
5) It generate an error due to contactMechPurposeType is undefined

I have extended the use of this patch to 2 other templates

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881713 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 10:35:08 +00:00
Anil Patel 39e6724e67 [OFBIZ-3213] patch.
Improvements to PaymentGroup UI.
Fixed issue with List of deposit slips displaying under FinAccount tab are not associated to FinAccount.This list should contain only those deposit slips which are created for selected FinAccount.
Added ordering, Show deposit slips in search result in descending order of effective date.

Thanks Sumit Pandit for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881708 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 10:02:29 +00:00
Adam Heath 284eecbe8f More space changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881683 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 06:20:15 +00:00
Adam Heath 38178273f6 Some space changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881681 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 06:13:52 +00:00
Jacques Le Roux 9f3e41d975 A patch from Bob Morley "Resolve java warnings exposed in Eclipse : framework - entity" (https://issues.apache.org/jira/browse/OFBIZ-3107) - OFBIZ-3107
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881669 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 04:54:18 +00:00
Jacques Le Roux 0641f38348 A patch from André Herbst "Danish translations for CommonErrorUiLabels" (https://issues.apache.org/jira/browse/OFBIZ-3215) - OFBIZ-3215
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881667 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 04:34:01 +00:00
Adam Heath 4494ee3306 Use the location, instead of the url's file path, when parsing groovy
class files.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881659 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 03:44:06 +00:00
Adam Heath d8c232164f Reworked, no more unchecked warnings, nor suppressions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881653 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 02:55:59 +00:00
Adam Heath c171e23064 Add generics markup to makeWhereClause(modelFields) parameter.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881652 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 02:52:11 +00:00
Adam Heath d2260d05d4 Implements all the interfaces/classes, but everything returns null
still.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881643 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 02:07:52 +00:00
Scott Gray 6b8f42d4a1 Got the auto-accounting-transaction-tests-MaterialIssuance test working, it was assuming that a production run was created but that isn't the case so I've added some test data inventory and code to create the needed production run
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881584 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 22:38:20 +00:00
Adrian Crum 22b83c211f More Java object type converters.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881515 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 21:02:57 +00:00
Scott Gray 4ca9b846e4 Fixed the testAcctgTransOnPaymentReceivedFromCustomer test, switched to creating a payment inline instead of trying to retrieve an existing one from the database
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881239 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 10:55:54 +00:00
Scott Gray 115101cc2c Added missing PaymentGatewayResponse record for the authorization on DEMO10090
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881226 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 10:23:20 +00:00
Scott Gray f1dc95a1e6 Fixed the testAcctgTransOnSalesInvoice test, it's not ideal at this stage but it passes and still correctly tests, I'll circle back around on a lot of these tests in the future
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881224 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 10:18:53 +00:00
Jacques Le Roux 834176ceaf A patch from Philippe Mouawad "Ofbiz freeze" (https://issues.apache.org/jira/browse/OFBIZ-2124) - OFBIZ-2124
In a certain scenario the application freezes, no more AJP connector threads are available.
After analysis the lock seems to come from very slow response time in GenericDelegator.clearAllCaches and particularily in CacheLineTable.keySet.
Furthermore, looking at org.ofbiz.base.util.cache.UtilCache, the class seems to have some synchronisation problems:
1) utilCacheTable.put calls are not synchronized
2) findCache synchronizes access to utilCacheTable while only getting an element which has big performance impact since utilCacheTable is static
3) clearExpiredFromAllCaches and clearAllCaches does not synchronize while clearCachesThatStartWith does, why ?

The patch synchronizes correctly the access to utilCacheTable and optimises findCache 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881194 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 08:36:35 +00:00
Adam Heath f5009216c1 Implement parameterized value conversion.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881193 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 08:31:30 +00:00
Adam Heath 5875284963 And generic condition planning.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881192 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 08:30:46 +00:00
Adam Heath 60c960a795 Handle nested alias.fieldName, which happens when nested conditions
exist.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881191 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 08:29:23 +00:00
Adam Heath e2e43bf9e9 Move the condition parsing code to a separate class.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881190 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 08:28:35 +00:00
Adam Heath 2e3757ffc1 Convert Planner from an interface to a class.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881189 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 08:26:58 +00:00
Adam Heath b3c5cb1724 Make most classes extends Atom, which implements Appender, and
toString().

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881188 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 08:24:41 +00:00
Scott Gray f357956e0a Moved all AcctgTransEntry balance checks to an inline method
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881185 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 08:01:49 +00:00
Jacques Le Roux ed6b4be761 A patch from André Herbst "Danish translations for CommonHelpUiLabels" (https://issues.apache.org/jira/browse/OFBIZ-3210) - OFBIZ-3210
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881182 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 07:54:41 +00:00
Jacques Le Roux 538e4bb715 A patch from Sharan Foga "Special feature to allow submitting patches for online help update" (https://issues.apache.org/jira/browse/OFBIZ-2219) - OFBIZ-2219
This patch is mainly just some help text reformatting using the itemizedlist and orderedlist docbook commands for the Invoices and Payments submenus them easier to read.
I've also corrected a minor spelling mistake in the billing accounts and noticed that the Find Payments help screen was under Invoices instead of Payments so have moved that to the correct place,


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881180 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 07:45:07 +00:00