Commit Graph
140 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 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 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 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
Anil Patel 10defe6957 Adding a view to fetch data from Payment Group Member, Payment and FinAccountTrans entities.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834715 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 23:53:23 +00:00
Anil Patel c5b51f17e8 Fix duplicate fk-name error.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834313 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 02:52:07 +00:00
Anil Patel 7abd273780 Fixed package name.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834012 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 10:42:14 +00:00
Anil Patel fb3242a2c5 Extend InvoiceAndType view, added StatusItem relation and InvoiceType desc alias.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833995 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 08:42:46 +00:00
Anil Patel 5c87c50f28 Adding PaymentAndTypeAndCreditCard. Allows to filter payments by credit card type.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833980 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 06:49:18 +00:00
Anil Patel 435045b761 Adding parentPaymentTypeId from PaymentType entity.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833630 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 05:05:05 +00:00
Anil Patel 10175e24f5 Fixed up batchPayments to use PaymentAndTypePartyNameView. Added necessary relationship attributes to view entity. Minor looks updates as well for consistency.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832319 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 07:23:03 +00:00
Anil Patel 9f76bc5dc3 Added view entity to fetch Payment, PaymentType desc, PaymentMethodType desc, status desc and Party names for display in UI. Fixed depositWithdrawPayment.ftl, now uses view.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832312 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 06:44:30 +00:00
Ashish Vijaywargiya 7131b2dbe3 Renaming the two fields from PaymentGatewayOrbital entity as reported on Dev mailing list.
1) password -> connectionPassword.
2) class -> engineClass.

Thanks Jacques for your comment on this.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831899 13f79535-47bb-0310-9956-ffa450edef68
2009-11-02 14:09:15 +00:00
Anil Patel 788723c431 Add relationship from PaymentMethod to FinAccount entity. A finAccount can have zero or more related PaymentMethods.
When making Disbursements using PaymentMethods owned by InternalOrganization, we can create FinAccountTransaction. In reconciliation process user can then add FinAccountTransactions to reconciliation.
In next step we need to improve service creating disbursements to fetch finAccountId from PaymentMethod and put in context to enable finAccountTransaction eca services to create finaccounttransactions.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830048 13f79535-47bb-0310-9956-ffa450edef68
2009-10-27 03:36:47 +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
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 dd9f48cd44 Enhancements to commission report enhancements.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@803886 13f79535-47bb-0310-9956-ffa450edef68
2009-08-13 13:56:42 +00:00
Anil Patel e3218de18f Improvements in the Invoice Generation for commission run functionality. Patch from OFBIZ-2806. Thanks Rishi and Amit for help.
Thanks Eva and Vince for requirements definition.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@803508 13f79535-47bb-0310-9956-ffa450edef68
2009-08-12 13:48:26 +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 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 079af79e37 Adding Product Category and Member entity and related service and forms. Will be used for adding Cost Center reporting.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@798447 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 08:48:48 +00:00
Anil Patel cd79e41818 Cleaned up create commission invoice process. Added new search parameters to search process.
Thanks Sumit, Rishi, Amit and Awdesh.
Patch from OFBIZ-2713


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796289 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 13:22:26 +00:00
Hans Bakker 7b1ac902f5 make the link to GlAccountId and GlAccountClassId optional, so when any of these 2 fields are missing the entries of the gltrancation will now still be shown
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796134 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 03:06:35 +00:00
Anil Patel 11ebbcfba2 Fixed a type.
Rearrenged fields accountTransDetail report  
GlAccountTrialBalance now has current financial account selected.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@795812 13f79535-47bb-0310-9956-ffa450edef68
2009-07-20 13:05:58 +00:00
Anil Patel f90de0086d Adding a new field to the GlAccountGroupMember entity: "amontPercentage" - the field can be used to store percentage of the amount posted to the gl account that should be accounted in the group.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@795793 13f79535-47bb-0310-9956-ffa450edef68
2009-07-20 12:19:38 +00:00
Hans Bakker a4e3d7d8fa make transactionlist on invoice more readable and added some hyperlinks
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@795534 13f79535-47bb-0310-9956-ffa450edef68
2009-07-19 13:10: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
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
Scott Gray 3f2d963f91 Initial implementation of the Payflow Pro version of PayPal's Express Checkout OFBIZ-934
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@793866 13f79535-47bb-0310-9956-ffa450edef68
2009-07-14 11:43:21 +00:00
Ashish Vijaywargiya 106a62f1f3 >> [java] 2009-07-10 13:09:23,343 (main) [ GenericDelegator.java:258:WARN ] [RelFKNameGT18] The foregn key name (length:19) was greater than 18 characters in length for relation InvoiceItemAssocType of entity InvoiceItemAssoc.
This thing always confuses me. I was in impression that the maximum length allowed for fk-name is 20 but came to know that it is 18.
Thanks Vikas for report, will remember this in future :-).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@792826 13f79535-47bb-0310-9956-ffa450edef68
2009-07-10 07:58:40 +00:00
Ashish Vijaywargiya bbb48b527a fk-name duplication.
Thanks Deepak for your report on this.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@792811 13f79535-47bb-0310-9956-ffa450edef68
2009-07-10 06:17:06 +00:00
Ashish Vijaywargiya 1b13ccc33b Adding two more fields.
This will help in searching the records for which commission invoice has been created.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@792473 13f79535-47bb-0310-9956-ffa450edef68
2009-07-09 09:42:51 +00:00
Ashish Vijaywargiya b2738e41b4 Adding entities for the new work coming for commission invoice generation for more then one sales invoice.
For more details please refer OFBIZ-2713.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@792414 13f79535-47bb-0310-9956-ffa450edef68
2009-07-09 06:36:08 +00:00
Anil Patel 923314928b New report "GL Account Trial Balance"
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@792105 13f79535-47bb-0310-9956-ffa450edef68
2009-07-08 11:50:42 +00:00
Vikas Mayur a391b6d976 Arranged the entities added in last commit in alphabetical order.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@788964 13f79535-47bb-0310-9956-ffa450edef68
2009-06-27 12:56:45 +00:00
Vikas Mayur dce4a20ee3 Implemented entity, crud services and ui for payment groups which will be enable user to generate checks in a batch from selected bank account (which is not implemented yet).
Thanks to Jacopo for notes. 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@788963 13f79535-47bb-0310-9956-ffa450edef68
2009-06-27 12:45:11 +00:00
Marco Risaliti 1353949a92 Integration of new RBS WorldPay Select Junior and support of new Payment Gateway Config entity (OFBIZ-2498)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@777203 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 17:57:48 +00:00
Jacques Le Roux 058d6aed57 A patch from Ashish Vijaywargiya "Change Copyright Year" (https://issues.apache.org/jira/browse/OFBIZ-2346) - OFBIZ-2346
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@772936 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 10:56:14 +00:00
Marco Risaliti a344489973 Support of Authorize Dot Net v3.1 and use the new Payment Gateway Config features (OFBIZ-2417)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@771419 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 20:00:11 +00:00
Marco Risaliti 41fadf8700 Support of CyberSource v5.0.2 and use the new Payment Gateway Config features (OFBIZ-2370)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@769513 13f79535-47bb-0310-9956-ffa450edef68
2009-04-28 19:47:21 +00:00
Marco Risaliti 886295b88f Misc improvements on Payment Gateway Config (OFBIZ-2297)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@767278 13f79535-47bb-0310-9956-ffa450edef68
2009-04-21 19:57:57 +00:00
Marco Risaliti 157b52c1d2 PayPal IPN use the new Payment Gateway Config features (OFBIZ-2286)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764327 13f79535-47bb-0310-9956-ffa450edef68
2009-04-12 21:11:42 +00:00
Marco Risaliti a657adadf8 Move payment.properties to PaymentGatewayConfig entities (OFBIZ-2269)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763782 13f79535-47bb-0310-9956-ffa450edef68
2009-04-09 19:45:31 +00:00
Jacques Le Roux b9c3ddef08 2d part and end of an effort to remove trailing spaces
[ \t]+$ => "" (empty)
Should be easier to review when committing changes with trailing spaces removed automatically by anyedit or such tool (please refer to http://docs.ofbiz.org/x/mg)

Of course this effort to remove trailing spaces has no functional implications.

Actually, I was doing a 1st commit and as it's long to upload, I got conflicts with r763135
In the meantime I did some refactoring also in *.java and *.groovy files :
){ => ) {
if( => if (
while( => while (
}else => } else
else{ => else {
switch( => switch (
try{ => try {
}catch => } catch
catch( => catch (
}finally{ => } finally {

So these changes are also in this commit, should not be a problem anyway.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:54:51 +00:00
Jacques Le Roux a5042291f7 1st part of an effort to remove trailing spaces
" +/> => "/>
Should be easier when dealing with Eclipse S/R regexp

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762648 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 08:27:15 +00:00
Jacques Le Roux 352526599a Missing part of previous commit 747364 (the entity changes part)
I kept fixed-point for averageCost which I guess has been changed since Rashko creaed his patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@747377 13f79535-47bb-0310-9956-ffa450edef68
2009-02-24 13:33:43 +00:00
Jacques Le Roux ce297d5a9b Add geolocation screens to Facility ContactMechs, FacilityLocation and FixedAsset + miscellaneous enhancements, also in data.
I have began to refactor toward putting as much as possible geolocation artifacts in framework/common with the idea of creating an applications/common component where all shared (transversal) features/artifacts would be. More explanations on dev ML soon...
There is also an unused taxAuthorityVATReport request/view-map in accounting controller (part of another task I slowly work on)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@738452 13f79535-47bb-0310-9956-ffa450edef68
2009-01-28 11:03:20 +00:00
Jacques Le Roux 572b7683e0 All tabs to 4 spaces in *.groovy, *.java, *.xml : less problems in future with that aspect...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737003 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 11:08:47 +00:00
Jacques Le Roux 0500d6baef A 1st commit for "Add geolocation to data model" (https://issues.apache.org/jira/browse/OFBIZ-1923) OFBIZ-1923
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735404 13f79535-47bb-0310-9956-ffa450edef68
2009-01-18 09:09:32 +00:00