Commit Graph
291 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
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
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
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
Scott Gray 7b7b1047d5 Might as well add what I learned to the service description
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836007 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 21:44:53 +00:00
Hans Bakker da9bc51bf9 allow 'safe' html in invoice description and message
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835204 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 02:57:05 +00:00
Anil Patel 74d9d9bf56 Adding mass payment status change to find screen. Also added few more details in payments list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833636 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 06:27:52 +00:00
Anil Patel ebb7309ba1 Added bulk action for updating invoice status. Also cleaned up javascript code to take advantage of prototype library. Still remains to move javascript in separate file and also css trick to show button disabled when it is.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831648 13f79535-47bb-0310-9956-ffa450edef68
2009-11-01 07:22:50 +00:00
Anil Patel 8ca9954e5f When creating AP payment use PaymentMethod of organizationParty. FinAccount Transactions are created by fetching finAccountId from PaymentMethod.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831638 13f79535-47bb-0310-9956-ffa450edef68
2009-11-01 04:28:33 +00:00
Anil Patel 6589d8a4e2 Updated Check Run process to use PaymentMethod of paying organizationParty instead of FinAccount. finAccountId is now fetched from PaymentMethod and finAccount Transaction is created.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831637 13f79535-47bb-0310-9956-ffa450edef68
2009-11-01 04:08:22 +00:00
Ashish Vijaywargiya 7152b71548 Applied patch from jira issue OFBIZ-2783 - Cost Centers: implement new accounting screen to associate gl accounts to "cost centers"
Thanks Brajesh, Rishi, Anil.
Special thanks to Jacopo for providing wonderful notes for the implementation.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816517 13f79535-47bb-0310-9956-ffa450edef68
2009-09-18 08:09:02 +00:00
Jacopo Cappellato 7fb8790c56 Added missing out parameter that was causing a service validation error.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815715 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 10:45:01 +00:00
Jacques Le Roux 9850bbd560 A patch from Chirag Manocha "Out Parameter showing under In Parameter head for createAcctgTransAndEntries service reference." (https://issues.apache.org/jira/browse/OFBIZ-2917) - OFBIZ-2917
In service createAcctgTransAndEntries, there is no need to IN acctgTranId. It is required as OUT parameter. So behavior should be overridden instead of defining acctgTransId again. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815350 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 14:51: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
Anil Patel e1b147e9eb Update to average cost calculation process. Patch from OFBIZ-2914. Thanks Ratnesh for implementation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@812744 13f79535-47bb-0310-9956-ffa450edef68
2009-09-09 01:28:33 +00:00
Anil Patel ae7b11c3ee Now use can see all account trans related to bank reconciliation. Patch from OFBIZ-2893.
Thanks Ratnesh for implementation.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@812742 13f79535-47bb-0310-9956-ffa450edef68
2009-09-09 01:21:58 +00:00
Ashish Vijaywargiya b2dd527c06 Moving service definition and implementation to appropriate place - part of jira issue OFBIZ-2887.
Thanks Parimal for the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@810078 13f79535-47bb-0310-9956-ffa450edef68
2009-09-01 14:45:50 +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
Jacopo Cappellato 454a39cc10 Moved eca for gl transactions for payment applications to the right xml file.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@808043 13f79535-47bb-0310-9956-ffa450edef68
2009-08-26 15:09:53 +00:00
Ashish Vijaywargiya c96c8dee24 Applied patch from jira issue: OFBIZ-2839 (Add ability to Cancel a Reconciliation).
Thanks Parimal & Sumit for the contribution. 
Thanks Eva and Vince for requirements definition.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@807134 13f79535-47bb-0310-9956-ffa450edef68
2009-08-24 09:00:47 +00:00
Ashish Vijaywargiya 092e8d40c8 First pass on Orbital Gateway: http://download.chasepaymentech.com/
Following things are covered in this implementation: 

1) Services written for ccAuth, ccAuthCapture, ccAuthRelease, ccAuthRefund, ccCapture.
2) Instead of property files we have kept commonly used values in the entity - for this created new entity - PaymentGatewayOrbital.
3) The initialisation of "Configurator"(which is a class that is being used for the initialisation of configuration settings - like user credentials and many more things). For now configurator takes only file by name "linehandler.properties". So I have created new files by this name. 
4) Also added demo data in ecommerce files so it can be used if someone want to use it for gateway purpose. 
5) For now we have excluded the compilation of this gateway - I will provide an end user document for this soon so anybody would be able to configure it easily.

This is collaborative effort from me and following guys.

Scott Gray: Discussed so many things with me in the b/w this implementation. There were some security settings issue with jdk installation - Scott helped me in that area.
Anil  Patel & Tim Ruppert: Initial implementation plan discussed with Anil and there were so many things that I had discussed with Anil & Tim in b/w. Thanks Tim for encouraging us to put this gateway on OFBiz trunk so it could be used by larger audience.
Mridul & Sumit: I have asked these guys to see the results / outcome of implementation and asked them to provide their comments/ thoughts. 

Thanks a lot guys for your help - it was simply awesome. 

Suggestions and comments are most welcome - I will wait for them.
Thank you!

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@806643 13f79535-47bb-0310-9956-ffa450edef68
2009-08-21 17:00:55 +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 2c1727497e Ability to remove fin account transaction from bank reconciliation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@806517 13f79535-47bb-0310-9956-ffa450edef68
2009-08-21 12:01:58 +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 3ed1848088 Enhancement to screen for editing cost center shares.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@805875 13f79535-47bb-0310-9956-ffa450edef68
2009-08-19 16:41:29 +00:00
Anil Patel 6a282ce83d Improved process to create payment deposit batch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@805748 13f79535-47bb-0310-9956-ffa450edef68
2009-08-19 11:14:26 +00:00
Anil Patel f6d97cf9af Now user can select financial account to making payment (or receiving payment into) while creating payment.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@805743 13f79535-47bb-0310-9956-ffa450edef68
2009-08-19 10:50:25 +00:00
Anil Patel 25b03634d5 Add ablity to pass group name when creating from deposit withdraw payment in fin account.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@805471 13f79535-47bb-0310-9956-ffa450edef68
2009-08-18 16:01:44 +00:00
Ashish Vijaywargiya bb983e2580 Applied patch from jira issue OFBIZ-2785 - Invoice can be canceled when associated payment is in Confirmed status.
Thanks Sumit for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@804946 13f79535-47bb-0310-9956-ffa450edef68
2009-08-17 11:57:12 +00:00
Jacopo Cappellato 9dad9ae5ab Added support for eventDate parameter to the quickShipEntireOrder (and related services) to specify a date different from now; this makes the service more flexible (for example when used by import scripts).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@804510 13f79535-47bb-0310-9956-ffa450edef68
2009-08-15 18:21:47 +00:00
Hans Bakker 46cc75e0e5 add the possibility of adding sales tax to an invoice using the same functions as is used for an order. moved most tax demo data from ecommerce to accounting. fixed product entry on an invoiceitem
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@804105 13f79535-47bb-0310-9956-ffa450edef68
2009-08-14 07:43:30 +00:00
Anil Patel 164f4f082f Enhancements to Income Statement. Patch from OFBIZ-2827. Thanks Sumit for the patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@803854 13f79535-47bb-0310-9956-ffa450edef68
2009-08-13 12:08:59 +00:00
Anil Patel 07b37baf87 Adding service to check valid payment before create a new batch for payments. Patch from OFBIZ-2774. Thanks Awdesh for patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@803572 13f79535-47bb-0310-9956-ffa450edef68
2009-08-12 15:56:29 +00:00
Scott Gray 700d2e5dcb A few fixes for Express Checkout, including a wonderfully undocumented typo in PayPal's API - L_SHIPPINGOPTIONLABEL needs to be L_SHIPINGPOPTIONLABEL
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@803513 13f79535-47bb-0310-9956-ffa450edef68
2009-08-12 13:55:14 +00:00
Anil Patel aee7dd4ddc Fix for
1) PartyId is missing when create FinAccountTrans record.
2) PaymentGroup should not be created  when " Deposit Payment in: finAcount" is checked.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@803499 13f79535-47bb-0310-9956-ffa450edef68
2009-08-12 13:30:27 +00:00
Anil Patel 60a109302f Improvements in Cost Center report datafetching process and templates.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@803415 13f79535-47bb-0310-9956-ffa450edef68
2009-08-12 08:38:21 +00:00
Anil Patel 8ab04fa7af Implement Inventory Valuation report. Patch from OFBIZ-2824. Thanks Surya, Sumit for implementation and Jacapo, Vince and Eva for review.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@803363 13f79535-47bb-0310-9956-ffa450edef68
2009-08-12 04:54:50 +00:00
Anil Patel d65507493d User can not cancel batch of payment if it is associated in Reconcilation process. Patch from OFBIZ-2825. Thanks Parimal contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@803362 13f79535-47bb-0310-9956-ffa450edef68
2009-08-12 04:32:37 +00:00
Scott Gray 4423593ef8 Initial implementation of the standard PayPal Express Checkout (i.e. not using Payflow Pro) OFBIZ-934
There are still a couple of issues preventing the checkout from being 100% functional:
1. I'm having trouble getting Instant Update API to work correctly which is used by PayPal to retrieve shipping estimates from OFBiz
2. The shipping option label and name parameters aren't working as documented and means I'm currently stuck presenting the shipping option id (partyId@shipmentMethodTypeId) to the user

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@803151 13f79535-47bb-0310-9956-ffa450edef68
2009-08-11 15:20:32 +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 615362534c Use product average cost in COGS transactions. Thanks Sumit for patch. Thanks Vince and Eva for defining requirement and reviewing implementation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@802764 13f79535-47bb-0310-9956-ffa450edef68
2009-08-10 12:36:53 +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 1ed141d988 First pass of Cost Center report Gl Report. Patch from OFBIZ-2811. Thanks Brajesh for working on it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@802295 13f79535-47bb-0310-9956-ffa450edef68
2009-08-08 03:47:50 +00:00
Anil Patel 1324607e46 Keep history of changes to Cost Center config. GlAccountCategoryMember record Update call expires old record and creates new when amount value is changed.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@800720 13f79535-47bb-0310-9956-ffa450edef68
2009-08-04 10:15:47 +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 7d4f8f43e8 Initial version of screen to manage cost center share for organization glaccounts. More enhancements to come soon.
Brajesh, Thanks for putting up business requirements and helping with investments.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@799876 13f79535-47bb-0310-9956-ffa450edef68
2009-08-01 14:44:59 +00:00
Anil Patel 941b17600c Reorganized fields in list. Showing number of tranaction included in the totals. Show Party name instead of id.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@799861 13f79535-47bb-0310-9956-ffa450edef68
2009-08-01 13:49:41 +00:00
Anil Patel 27c0ba842d Delete invoice item assoc when Commission Invoice is cancelled. This will allow user to create new commission invoice if needed.
Rishi, Sumit, Amit, Thanks for working on it. Patch from OFBIZ-2776


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@799549 13f79535-47bb-0310-9956-ffa450edef68
2009-07-31 08:58:41 +00:00