Commit Graph
398 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
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
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 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 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
Ashish Vijaywargiya b64228fab1 Applying patch from Sumit Pandit - Better UiLabels.
Thanks Sumit!

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836128 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 05:53:38 +00:00
Anil Patel 2d9f0497bf Bulk print Invoices.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835709 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 02:16:54 +00:00
Anil Patel 7af265dd3a Screenlets for Quick view into invoices past due and invoices coming due soon.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835622 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 22:55:35 +00:00
Ashish Vijaywargiya 965f37cbc3 Added new uiLabel for outstanding running total - patch from Awdesh.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835362 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 12:18:25 +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 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
Jacques Le Roux 17c711893c Better French label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831555 13f79535-47bb-0310-9956-ffa450edef68
2009-10-31 15:35:12 +00:00
Jacques Le Roux 8cb86ea147 Add a button to create an agreement from a product.
I have also modified the content of PageTitleEditAgreement label in French (only) because translation of the sole Edit was not enough to give some sense.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829895 13f79535-47bb-0310-9956-ffa450edef68
2009-10-26 18:39:43 +00:00
Jacques Le Roux 6dd78d7bd3 Better French labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829651 13f79535-47bb-0310-9956-ffa450edef68
2009-10-25 21:14:00 +00:00
Jacques Le Roux 06d24f1277 Better French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829605 13f79535-47bb-0310-9956-ffa450edef68
2009-10-25 15:25:24 +00:00
Marco Risaliti fa4acd4368 Some missing italian translations of accounting component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829439 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 19:54:10 +00:00
Jacques Le Roux 40b7bd039b Better French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@827944 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 09:41:04 +00:00
Bruno Busco 884b8a685a A patch from Raul Sieberath "Brazilian Portuguese Translations for Accounting - Part 1" (https://issues.apache.org/jira/browse/OFBIZ-3038) - OFBIZ-3038
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@826183 13f79535-47bb-0310-9956-ffa450edef68
2009-10-17 07:11:18 +00:00
Bruno Busco f5c36ab0c0 A patch from Raul Sieberath "Brazilian Portuguese Translations for Accounting - Part 1" (https://issues.apache.org/jira/browse/OFBIZ-3038) - OFBIZ-3038
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@825664 13f79535-47bb-0310-9956-ffa450edef68
2009-10-15 21:18:31 +00:00
Marco Risaliti 0df74c66fd Two wrong labels locale
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823932 13f79535-47bb-0310-9956-ffa450edef68
2009-10-10 20:55:05 +00:00
Jacques Le Roux 5143b8763b Better French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823873 13f79535-47bb-0310-9956-ffa450edef68
2009-10-10 15:34:11 +00:00
Ashish Vijaywargiya 9fbc2e84ab Applied patch from jira issue OFBIZ-3025 - English UiLabel changed to German - Reverting it back to English.
Thanks Brajesh for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823853 13f79535-47bb-0310-9956-ffa450edef68
2009-10-10 13:29:46 +00:00
Bruno Busco 0cc834344c Removed the word "Application" from the Application menu title (OFBIZ-3016)
At this stage I did this for the primary applications only.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823833 13f79535-47bb-0310-9956-ffa450edef68
2009-10-10 09:27:30 +00:00
Scott Gray deddd560fe UiLabel fix from Brajesh Patel OFBIZ-3013
A german translation was incorrectly tagged as english

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823402 13f79535-47bb-0310-9956-ffa450edef68
2009-10-09 04:20:19 +00:00
Anil Patel 5e1a81e8fe Updated UI label to use Edit instead of Create/Update, because its used on Edit screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823079 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 07:16:49 +00:00
Ashish Vijaywargiya f1ec15157c I think it will be "de"(German Translation) instead of "en".
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@820941 13f79535-47bb-0310-9956-ffa450edef68
2009-10-02 09:24:58 +00:00
Christian Geisert 3d86fc78f4 some german translations for accounting
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@820298 13f79535-47bb-0310-9956-ffa450edef68
2009-09-30 15:22:52 +00:00
Christian Geisert 77c9ac8c9f Another typo in AccountingUiLabels fixed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@817618 13f79535-47bb-0310-9956-ffa450edef68
2009-09-22 11:51:13 +00:00
Christian Geisert fc5cbabab2 Fixed problems in AccountingUiLabels.xml (lagn->lang and double entry) found with Label Manager
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@817602 13f79535-47bb-0310-9956-ffa450edef68
2009-09-22 11:07:25 +00:00
Jacques Le Roux e54998738f A slightly modified patch from Erwan de FERRIERES "Proposal on French translations" (https://issues.apache.org/jira/browse/OFBIZ-2958) - OFBIZ-2958
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816758 13f79535-47bb-0310-9956-ffa450edef68
2009-09-18 19:46:40 +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
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 7dd00f3fb9 Added a screen in AP to find and view Payment Group of type Check Run and Batch Payment Deposits in.
Patch from OFBIZ-2896.
Thanks Ratnesh for implementation.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@812743 13f79535-47bb-0310-9956-ffa450edef68
2009-09-09 01:25:48 +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
Jacques Le Roux 0504d491f3 Still some bugs in the Label Manager, still powerful too : fix some labels bugs
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@812709 13f79535-47bb-0310-9956-ffa450edef68
2009-09-08 22:00:05 +00:00
Jacques Le Roux cc41bd2564 Better French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@810925 13f79535-47bb-0310-9956-ffa450edef68
2009-09-03 13:08:08 +00:00
Ashish Vijaywargiya 1f735f0bb5 Following things are covered in this patch:
1) Reconciliation does not processed if Reconciliation Id does not exists.
2) Create GlReconciliation entries for Adjustments.

Thanks Parimal and Sumit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@807628 13f79535-47bb-0310-9956-ffa450edef68
2009-08-25 13:47:13 +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 21a53d36ab Limiting user to be only able to assign financial accounts trans that are in created status to bank reconciliation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@806182 13f79535-47bb-0310-9956-ffa450edef68
2009-08-20 14:16:21 +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 45cba0aabc Adding FinancialAccount details panel to Payment overview page.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@805753 13f79535-47bb-0310-9956-ffa450edef68
2009-08-19 11:34:53 +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 6f73d4e4ea Adding title to all financial account screens. And minor code cleanup.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@805735 13f79535-47bb-0310-9956-ffa450edef68
2009-08-19 10:29:55 +00:00
Anil Patel 6ef5c5e505 Adding check so user cannot add approved fin account transaction to GlReconciliation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@805456 13f79535-47bb-0310-9956-ffa450edef68
2009-08-18 15:36:06 +00:00
Ashish Vijaywargiya 6731a9e748 Applied patch from jira issue OFBIZ-2835 - Under Accounting - Report tab create a new screen for showing comparative income statements.
Following point is covered in this patch:
– Added option and functionality for generating CSV and PDF on same screen. 

Thanks Awdesh & Sumit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@804993 13f79535-47bb-0310-9956-ffa450edef68
2009-08-17 14:22:29 +00:00
Ashish Vijaywargiya 963c118e8d Applied patch from jira issue OFBIZ-2835 (Under Accounting - Report tab create a new screen for showing comparative income statements.)
Following points are covered in this patch:

1) Added New tab under Accounting -> Organization Gl Setting (Company) -> Reports with name Comparative Income Statment .
2) Used groovy for preparing list of compared income/expenses statements.
3) Added list form to show compared Income/expenses statements. 

Thanks Awdesh and Sumit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@804869 13f79535-47bb-0310-9956-ffa450edef68
2009-08-17 06:19:34 +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