Commit Graph
64 Commits
Author SHA1 Message Date
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
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 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
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
Anil Patel 606d9facb9 Adding Find Bank Reconciliations screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835287 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 07:53:09 +00:00
Anil Patel 1e602479e8 Added style to paymentgroupmembers list header.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834620 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 19:24:23 +00:00
Hans Bakker 96d54615ca removed default-option='contains' because now set from widget.properties which is the current default
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834379 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 08:12:45 +00:00
Anil Patel e059f19611 [OFBIZ-3171] Patch. Minor looks enhancements to deposit slip screen. Removed Add payment group member screen for deposit slip because right way to do so is from Diposit screen in FinancialAccount.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833631 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 05:27:31 +00:00
Bruno Busco 4740d3a616 Part of OFBIZ-3067 - Menus and form widget files location
Accounting component
Moved forms from webapp to widget folder


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@828868 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 21:57:30 +00:00
Jacques Le Roux b7a941d4f6 Revert r813307 on Adrian's request
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813893 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 16:02:01 +00:00
Jacques Le Roux a7430a2fc2 A modified patch from Erwan de FERRIERES '"Automatic" sortable table headers" (https://issues.apache.org/jira/browse/OFBIZ-2921) - OFBIZ-2921
I was planning to wait longer, but I can't wait more. I have added a lot of small trivial changes in this patch and they are blocking me to go further on other issues...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813307 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 08:41:19 +00:00
Anil Patel cf6e700773 User can add openinig balance. Patch from OFBIZ-2918. Thanks Ratnesh for implementation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@812946 13f79535-47bb-0310-9956-ffa450edef68
2009-09-09 13:23:32 +00:00
Ashish Vijaywargiya 7a28b8b75a Applied patch from jira issue OFBIZ-2877 - Add a new field nanmed - "statusId" to "GlReconciliation" entity.
Thanks Parimal & Sumit for the Contribution.

Please don't forget to update the info about migration on: http://docs.ofbiz.org/x/XxQ

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@809984 13f79535-47bb-0310-9956-ffa450edef68
2009-09-01 11:51:29 +00:00
Scott Gray 12566c26b9 Wherever possible changed ELI queries to limit the result set to the actual rows required of the query, should improve time
and memory performance if a cursor isn't being used on large result sets quite a bit.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@808820 13f79535-47bb-0310-9956-ffa450edef68
2009-08-28 08:58:10 +00:00
Anil Patel d086571d4a If reconciliation is started then user cannot add new financial account transaction. Adding a service to check if a GlReconcilation is ready for completion (isGlReconciliationReconciled).
Manual FinancialAccount Transaction now default to CREATED status.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@806588 13f79535-47bb-0310-9956-ffa450edef68
2009-08-21 15:08:50 +00:00
Anil Patel ee49c47716 Create Gl transaction while creating financial transaction. Gl transaction is posted when finaccount transaction is reconciled.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@806276 13f79535-47bb-0310-9956-ffa450edef68
2009-08-20 17:51:30 +00:00
Anil Patel 13262d514b Order finaccounts in list by id.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@805767 13f79535-47bb-0310-9956-ffa450edef68
2009-08-19 11:56:57 +00:00
Anil Patel 7a0452c162 Status of finaccounttrans is not required.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@805475 13f79535-47bb-0310-9956-ffa450edef68
2009-08-18 16:09:07 +00:00
Ashish Vijaywargiya 7e7438d408 Misc. things are covered in this work:
1) Cancel and PDF button should not be displayed for expired payment group.
2) Fixed an error occurred at Payment Group Overview page, when it has not associated with any member.
3) Update Demo data for GLReconciliatation - assign correct glAccountId (previous - 111000, new - 111100).
4) At Reconciliation tab show  - reconciled balance  at same page, and update algorithm to calculate sum of transaction under reconciliation process. 

Thanks Sumit & Parimal for your contribution.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@804866 13f79535-47bb-0310-9956-ffa450edef68
2009-08-17 05:29:05 +00:00
Anil Patel 943798a9b9 Add Missing Links for Id in accounting component. Patch from OFBIZ-2826. Thanks Arpit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@803543 13f79535-47bb-0310-9956-ffa450edef68
2009-08-12 14:49:29 +00:00
Anil Patel 36f928bc42 Financial account reconcile enhancements. Patch from OFBIZ-2816. Thanks Parimal and Rishi for contribution.
Thanks Vince and Eva to help define requirements.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@802849 13f79535-47bb-0310-9956-ffa450edef68
2009-08-10 16:32:42 +00:00
Anil Patel fcbc3095bf Tools reconcile financial account. Patch from OFBIZ-2816. Thanks Rishi, Sumit and Parimal for contribution. Also Thanks for Vince and Eva for help in designing tools.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@802494 13f79535-47bb-0310-9956-ffa450edef68
2009-08-09 06:37:01 +00:00
Anil Patel d11d002355 If reconciliation is created from finaccount screen then its for finaccount, so default glAccountId from finaccount entity.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@800780 13f79535-47bb-0310-9956-ffa450edef68
2009-08-04 13:42:20 +00:00
Anil Patel 0f1f62b2f0 Adding more localization of screen labels. Thanks Arpit, Rishi and Hans for quick reminder.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@800414 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 15:09:23 +00:00
Anil Patel 7ca1a07d0a First version of Financial Account reconciliation tools. Patch from OFBIZ-2791. Thanks Rishi, Parimal, Sumit for implementation.
We got help from Jacopo, Vince and Eva in defining process and design. Thanks for helping build tools.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@800412 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 14:57:51 +00:00
Anil Patel fcd7462572 Added create new deposit payment and create new withdrawal payment option in Financial Account --> deposit/withdraw tab.
Patch from OFBIZ-2768. Thanks Rishi and Arpit.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@800209 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 06:22:37 +00:00
Anil Patel a061d9bbaa Add Find/List of deposit slips for the bankaccount. Patch from OFBIZ-2770. Thanks Sumit, Awdesh.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@799191 13f79535-47bb-0310-9956-ffa450edef68
2009-07-30 07:16:37 +00:00
Anil Patel 4f94d0b8cc Adding noConditionFind flag to search screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@799181 13f79535-47bb-0310-9956-ffa450edef68
2009-07-30 06:33:39 +00:00
Anil Patel 8b084410d0 Expire instead of deleting PaymentGroupMembers.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@798805 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 08:09:25 +00:00
Anil Patel f02bf5238f Patch from OFBIZ-2727 with minor improvements. Thanks Chirag, Surya, Sumit, Rishi and all who worked on it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@798790 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 06:26:13 +00:00
Anil Patel 17a4027b6e Adding smaller/cleaner find form to financial account. Advanced Search brings up classic big search form.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@798483 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 10:54:45 +00:00
Anil Patel 2b48e3487e Fin Account name is also active link. Navigates user to Finanacial Account Screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@798470 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 09:31:05 +00:00
Anil Patel 5a871b84bc Adding Tab for deposit slips for a bank account (financial account).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@798379 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 03:15:17 +00:00
Anil Patel 507755b9a2 Show status desciption and not Id.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797758 13f79535-47bb-0310-9956-ffa450edef68
2009-07-25 12:06:50 +00:00
Hans Bakker fe146772e2 take the default currency as set in the commonext component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@795474 13f79535-47bb-0310-9956-ffa450edef68
2009-07-19 03:54:22 +00:00
Anil Patel d3c579abf1 Setting financial account transaction status and Control firing seca based on status of financial account transaction.Thanks Sumit and Arpit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@795074 13f79535-47bb-0310-9956-ffa450edef68
2009-07-17 13:11:15 +00:00
Hans Bakker 7e815c48c7 sort currency by country and not by abbreviation in form dropdowns
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@794619 13f79535-47bb-0310-9956-ffa450edef68
2009-07-16 10:40:07 +00:00
Anil Patel 4845415e91 Adding service and UI components to link payments deposits and withdrawal with financial account. Patch from Jira#2717 with minor modifications.
Thanks Awdesh and Rishi.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@794217 13f79535-47bb-0310-9956-ffa450edef68
2009-07-15 10:23:45 +00:00
Anil Patel 2cf53b438e Add statusId field to the FinAccountTrans entity and verify that existing functionality is not broken. Patch from Jira issue #OFBIZ-2720
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@793969 13f79535-47bb-0310-9956-ffa450edef68
2009-07-14 16:39:25 +00:00
Ashish Vijaywargiya 51b8b5f0bd Applied patch from jira issue OFBIZ-2717 - Add a new "Deposit/Withdraw" screen to the FinAccount subscreens
This patch includes:
-- Implemented basic search form and list form.
-- Written groovy for data fetching.
-- Implemented running total functionality.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@793358 13f79535-47bb-0310-9956-ffa450edef68
2009-07-12 14:36:17 +00:00
Jacques Le Roux 999bd7c577 Fix following Chris Howe's message in dev ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764195 13f79535-47bb-0310-9956-ffa450edef68
2009-04-11 13:00:24 +00:00
Jacques Le Roux 76f5ca6638 Secure URLs, we don't need to duplicate in from-field when param-name is the same
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762215 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 06:25:24 +00:00
Jacques Le Roux 2ff381283b Securing URLs, link element in screens and menus : 30th set + tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761977 13f79535-47bb-0310-9956-ffa450edef68
2009-04-04 18:08:08 +00:00
Jacques Le Roux 67a602c3ed Securing URLs, link element in screens and menus : 28th set + tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761972 13f79535-47bb-0310-9956-ffa450edef68
2009-04-04 17:36:48 +00:00
Jacques Le Roux d3647429f9 Fix some bugs introduced by recent work to secure URLs in XML files
(Also some trailing blanks removed by chance)

Should be all clear now, waiting for inevitable typos or worse...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759700 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 14:42:55 +00:00
Jacques Le Roux 77a2ff1d9f 21th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements

We are near the end...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759684 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 14:02:55 +00:00
Jacques Le Roux 8c6d89fe75 18th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements

This one is huge, with some changes by hand, conversion from tabs to 4 spaces and some trailing spaces (I have activated it AnyEdit plugin following the changes I made in http://docs.ofbiz.org/display/OFBADMIN/Coding+Conventions but I wonder if I should not reverse all that - I mean my plugin setting and in wiki -, it's a nightmare!)

I did my best on this one, but I'm not sure some typos did not slip in. Anyway, alea jacta est


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759666 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 11:00:00 +00:00
Marco Risaliti 8ed72242d9 Artifact cleaning on accounting component after recent changes on xsd files (OFBIZ-2137)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737563 13f79535-47bb-0310-9956-ffa450edef68
2009-01-25 18:33:55 +00:00
Jacques Le Roux 66ffa47fd6 This does not hurt and help
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@732677 13f79535-47bb-0310-9956-ffa450edef68
2009-01-08 10:36:01 +00:00
Ashish Vijaywargiya 55b888849e Patch from JIRA issue # OFBIZ-1839.
Container to Screenlet conversion for Accounting component.

For now followed the CamelCase pattern starting with the First letter as capital one.
Thanks Awdesh Singh Parihar for your patch and Ratnesh Upadhyay for your Support.

Special thanks to Vikas Mayur and Adrian Crum for their useful comments.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@666968 13f79535-47bb-0310-9956-ffa450edef68
2008-06-12 06:09:10 +00:00