Commit Graph
1939 Commits
Author SHA1 Message Date
Jacopo Cappellato 40757f357b Pretty big enhancements for the accounting processes and demo data:
1) completely refactored the trial balance report: now it is based on GLAccountHistory and no more on GlAccountOrganization records; the main advantage is that now it it possible to run the report per different financial time periods
2) big enhancements to the demo data: data was incomplete or wrong and this was affecting reports and the financial time period closing process
3) several fixes for the financial time period process
More fixes and enhancements will come, but now the closing process works fine and the financial reports make sense.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885256 13f79535-47bb-0310-9956-ffa450edef68
2009-11-29 18:32:31 +00:00
Jacques Le Roux 2777b83223 Fix r885091 where isNotEmpty has been used by error instead of isEmpty
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885092 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 13:59:45 +00:00
Ashish Vijaywargiya 30f2038726 Applied patch from jira issue OFBIZ-3263 - Add bulk status change action on AR find invoice screen, also add ability to print bulk invoices.
Provide following features on screen : https://demo.ofbiz.org/ar/control/FindArInvoices (AR > Find Invoice)
1). Ability to change bulk invoice status.
2). Display invoice running total same as purchase invoice list form of AP.
3). Ability to print sales invoices in bulk.

This patch covers following thing : -
1) Implementation of mentioned functionality.
2) Data for entity UomConversionDated.
3) Improvement in service createAcctgTransForSalesInvoice . 

Thanks Awdesh, Sumit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884572 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 14:58:17 +00:00
Ashish Vijaywargiya e6e3877833 This patch contain following improvement : -
1) Added Lookup for "Gl Reconciliation Id"
2) Added Lookup for "Organization Party Id"
3) Added check to show ReconciledBalance only when GlReconciliation balance is "GLREC_RECONCILED"
4) Added field glAccountId in search criteria .
5) On screen "ViewGlReconciliationWithTransaction" Reconciliation Menu bar should come selected .

Thanks Awdesh for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884402 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 05:30:53 +00:00
Jacopo Cappellato 1aa3f03573 Misc fixes for tests for gl postings, and also a couple of bug fixes discovered playing with the tests.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883796 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 17:30:55 +00:00
Jacopo Cappellato 03ed509c46 Fixed failing accounting test.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883688 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 13:32:37 +00:00
Jacopo Cappellato f4aa6859e3 Fixed test that was failing due to the changes I did to demo data for accounting. Enhanced the comments.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883642 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 09:57:23 +00:00
Ashish Vijaywargiya 14d65fc10b Applied patch from jira issue OFBIZ-3242 - Add new feature to Bulk Print Invoices.
-- It Applies to findInvoices screen in AR and AP. User selects items from findInvoice search results. Selects Print action and clicks on Run. 

For now  only supported for purchase invoice, for sales invoice we will provide patch shortly.

Thanks Awdesh & Sumit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883641 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 09:54:34 +00:00
Ashish Vijaywargiya 1a80ba8a09 Applied patch from jira OFBIZ-3241 - Cancel Payment Batch - Need to correct error message.
At https://demo.ofbiz.org/ar/control/FindArPaymentGroups
When try to cancel a payment batch which is associated to active reconciliation. Then it is showing success message that "Action is performed successfully", instead of this, it must show error message which inform user that Payment batch associated to Reconciliation can not be cancelled. It is needed to show right message.

Thanks Surya & Sumit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883628 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 09:10:21 +00:00
Ashish Vijaywargiya 2df5f76d26 Applied patch from jira issue OFBIZ-3236 - Add new field - Closing balance to Reconciliation Screen.
At https://localhost:8443/accounting/control/ViewGlReconciliationWithTransaction?glReconciliationId=9000&finAccountId=SC_CHECKING

    * Add a new field to represent Closing balance of Reconciliation. This will sum of Opening Balance(default 0) + Reconciled Balance (default 0).
    * Also rearrange rows showing information. It is as follows -
          o OLD :
            Gl Reconciliation Name
            Reconciled Balance
            Status
            Reconciled Date
            Opening Balance
          o NEW :
            Gl Reconciliation Name
            Status
            Reconciled Date
            Opening Balance
            Reconciled Balance
            Closing Balance

Thanks Sumit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883601 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 06:23:22 +00:00
Ashish Vijaywargiya 064a34c9ce Applied patch from jira issue OFBIZ-3238 - FinAccount Reconciliation Search Result Table - Add new column for Cancel Reconciliation.
At https://localhost:8443/accounting/control/FindFinAccountReconciliations?finAccountId=SC_CHECKING
In search results, add a column to "Cancel Reconciliation" In this column show "Cancel" button to cancel reconciliations which are in CREATED status.

Thanks Sumit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883597 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 06:00:34 +00:00
Ashish Vijaywargiya 7aaea71ed8 Applied patch from jira issue - OFBIZ-3235 - List Reconciliations under Financial Account must bee associated to the Finanacial Account.
At - https://demo.ofbiz.org/accounting/control/FindFinAccountReconciliations?finAccountId=SC_CHECKING
At above page, currently all Reconciliation are displaying, but it should display only those Reconciliation which are associated to the 
selected FinAccount.

Thanks Sumit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883588 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 05:32:26 +00:00
Jacques Le Roux c72b29cb1f Use UtilValidate.isNotEmpty methods instead of (obj != null) || (obj.length > 0) and (obj != null) || (obj.size > 0)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883549 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 23:41:34 +00:00
Jacques Le Roux 4e0d303e06 Use UtilValidate.isEmpty methods instead of (obj == null) || (obj.length == 0)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883507 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 21:42:18 +00:00
Jacques Le Roux 8ae9319710 Use UtilValidate.isEmpty methods instead of (obj == null) || (obj.size == 0)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883492 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 20:34:27 +00:00
Jacopo Cappellato 3a97100842 Fix for the initial value of inventory gl account.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883468 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 19:16:22 +00:00
Jacopo Cappellato 22df920f51 Small layout improvements to the PDF version of the Balance Sheet
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883461 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 18:55:47 +00:00
Jacopo Cappellato 3279f9361e Small fixes for comments and formatting.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883449 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 18:35:26 +00:00
Jacopo Cappellato 287200a9ca A bunch of enhancements to demo data related to general ledger:
1) the value of inventory in gl now matches the value of inventory items
2) the purchase cost of fixed assets also matches the value in gl
3) fixed several demo accouting transactions with better accounts

Now the Balance Sheet looks in much better shape (but there is still a lot to do).



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883445 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 18:18:01 +00:00
Anil Patel 914591615d [OFBIZ-3251] Patch to fix Format the FinAccountTransAssociatedWithPayment section in the PaymentOverview screen. Thanks Aswath Satrasala for patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883410 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 17:02:08 +00:00
Bilgin Ismet Ibryam 9190cdeb89 Renamed AgreementWorkEffortAppl entity to AgreementWorkEffortApplic in order to change relation types so that assigning WorkEfforts to Agreements is possible w/o specifying an agreementItemSeqId.
Added a migrateAgreementWorkEffortAppl service to migrate existing data to the new entity.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883140 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 20:17:38 +00:00
Bruno Busco 342e9cb614 Accounting application
Moved TabBar Menus from the "body" decorator-section to the "pre-body" decorator section.
This makes better the rendering of themes such as Dropping Crumbs.

Removed several redundant <section><widget> tags also

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883139 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 20:14:11 +00:00
Bruno Busco e4c40b9a3c Moved several TabBar Menus from the "body" decorator-section to the "pre-body" decorator section.
Having the TabBar menu in the "pre-body" seems to be the right pattern (already present in several screens) that should always be followed.
This change allows a much better rendering of the Dropping Crumbs while having a very little TabBar menu shift in other themes.
All other screens will be changed accordingly.
This commit also fixes OFBIZ-3240

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883020 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 00:39:41 +00:00
Ashish Vijaywargiya 0ff0adf348 Applied patch from Mukesh Marathe to remove the error message from costcenter page after short duration.
Steps to reproduce:
Go to - https://localhost:8443/accounting/control/CostCenters

-- Enter the values for cost center 1, 2 and 3 so that the total is not equals to 100.
-- The error appears on click submit, now correct the values in respective fields so total is equals to 100.
-- On click on submit the values save in the DB, but error still shows on the page - remove error message after short duration.

Thanks Mukesh for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882535 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 12:28:10 +00:00
Jacques Le Roux 96ca14f622 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
Frmatting and tidy up using the itemized and orderedlist docbook commands for Tax Authorities. I've also included some documentation on the Bank Reconciliation process.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882452 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 08:52:53 +00:00
Jacques Le Roux 5f3dd64e70 Revert r882217 and by consequence r882217 from Adam's advice on dev ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882342 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 22:45:56 +00:00
Jacques Le Roux 4094fe09ad Fix a possible conflict (MODE is a SQL reserved word). Thanks to Adrian on dev ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882337 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 22:28:56 +00:00
Jacques Le Roux eb2fdcdac9 Fix https://issues.apache.org/jira/browse/OFBIZ-3229 in a slightly different way
a) FixedAssetGeoLocation had its error response going to the wrong view "EditFacility" (which did not exist in this controller).
b) taxAuthorityVATReport was pointing to a view-map entry that was commented out; these are not used yet: WIP...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882326 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 22:10:06 +00:00
Jacques Le Roux d28f95ad2b Complete 882210, contains InvoiceWorker.java (got a conflict) and some other changes, mostly enhanced for loops instead of iterators with while loops
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882217 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 17:44:00 +00:00
Jacques Le Roux bff67dc987 A patch from Marc Morin "Resolve java warnings exposed in Eclipse : application - accounting" (https://issues.apache.org/jira/browse/OFBIZ-3157) - OFBIZ-3157¨
Patch for generic's warnings for accounting application 

I will soon commit InvoiceWorker.java (got a conflict) and some other changes I want to do, mostly enhanced for loops


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882210 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 17:26:03 +00:00
Jacques Le Roux 65601eeccd A patch from Abdullah Shaikh "SagePay payment gateway integrated" (https://issues.apache.org/jira/browse/OFBIZ-3180) - OFBIZ-3180
SagePay payment gateway integrated. All the gateway parameters are configurable using the Payment gateway configuration, also the transaction types that are available in sagepay are configurable.

I moved the httpclient httpcore jars to base/lib (also new jcip-annotations-1.0.jar)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882103 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 11:01:29 +00:00
Jacques Le Roux b53c6ab6d0 Some itemizedlists and orderedlists in Accounting Help
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882067 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 08:03:56 +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
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
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
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
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 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 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
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
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
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