Commit Graph
61 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
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
Bruno Busco 17288a9082 Part of OFBIZ-3067 - Menus and form widget files location
Party and Product components
Moved forms from webapp to widget folder
Removed empty folders

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829418 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 17:41:31 +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
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 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
Jacopo Cappellato 913d51870e Cleaned up the remaining csv widget forms that now use the new csv renderer.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@802402 13f79535-47bb-0310-9956-ffa450edef68
2009-08-08 15:55:50 +00:00
Jacopo Cappellato 16a1a6e98a Implemented CSV screen macro renderer; cleaned up existing csv widget forms that are now much more clean.
This is a good example of the great flexibility of widgets and the new macro renderer (no code was needed to implement the CSV renderer).


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@802400 13f79535-47bb-0310-9956-ffa450edef68
2009-08-08 15:49:04 +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 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 6cd39fd9ae Clened up, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797349 13f79535-47bb-0310-9956-ffa450edef68
2009-07-24 07:28:24 +00:00
Anil Patel c598d98de1 In Accounting Component cleanup and make UI labels name symmetric to "FormFieldTitle_*" so that can be used any where in Form-Widgets without giving "title" attribute.
Also added labels for missing title if any.
Patch from JIRA # OFBIZ-2744
Thanks Sumit and Arpit.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796253 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 11:22:26 +00:00
Anil Patel ace64ba232 Removed unnecessary code.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796241 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 10:24:50 +00:00
Anil Patel 0bf540f0c4 Code cleanup. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796224 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 09:54:20 +00:00
Anil Patel 768cb44c4a GL Account Name (to the right of the "GL Account Id" field).
Total of Current Fiscal Period (to the right of the "Total Amount" field): this is computed considering all the transactions posted to the account from the beginning of the Fiscal Period to the thruDate set by the user.

Added to the search for at the top of the screen an optional "Month" drop down field: it contains all the 12 months of the year; if a value (e.g. January) in this drop down is selected and the from/thru date are left empty then the system will compute the from/thru dates for the report considering the beginning and end of the selected month.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@795910 13f79535-47bb-0310-9956-ffa450edef68
2009-07-20 16:47:31 +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
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 f2ec2dddbb Adding tooltip for entering required fields.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@795341 13f79535-47bb-0310-9956-ffa450edef68
2009-07-18 11:02:30 +00:00
Anil Patel 1268699699 Enhanced Monthly trial balance report, added BigDecimal rounding and Internationalization.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@795331 13f79535-47bb-0310-9956-ffa450edef68
2009-07-18 09:36:14 +00:00
Anil Patel 1d3d85f1e0 Now form widget drop downs can handle non strings for key. Removing ftl in favor of form widget.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@795319 13f79535-47bb-0310-9956-ffa450edef68
2009-07-18 06:02:08 +00:00
Anil Patel 5a57761f99 Report for Monthly trial balance.
Accounting > Organization GL settings > Accounting > Reports > Monthly Trial Balance.
Brajesh Patel (Guru Dev), Thanks for working on it.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@794667 13f79535-47bb-0310-9956-ffa450edef68
2009-07-16 13:30:45 +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 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
Jacopo Cappellato a686ad49b5 Improved layout of the PDF version of the trial balance.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@791047 13f79535-47bb-0310-9956-ffa450edef68
2009-07-04 01:36:52 +00:00
Vikas Mayur f8c67390d5 Trial Balance reports can now be exported to CSV and PDF format.
Applied patch from Brajesh Patel and Kirti Dhakad, part of OFBIZ-2675 (https://issues.apache.org/jira/browse/OFBIZ-2675)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@790219 13f79535-47bb-0310-9956-ffa450edef68
2009-07-01 15:32:28 +00:00
Vikas Mayur 03c73c86ce Balance Sheet reports can now be exported to CSV and PDF format.
Applied patch from Brajesh Patel, part of OFBIZ-2673 (https://issues.apache.org/jira/browse/OFBIZ-2673)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@790208 13f79535-47bb-0310-9956-ffa450edef68
2009-07-01 15:10:12 +00:00
Vikas Mayur 55b3029be5 Income Statement report can now be exported to CSV and PDF format.
Applied patch from Brajesh Patel, part of OFBIZ-2676 (https://issues.apache.org/jira/browse/OFBIZ-2676)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@790136 13f79535-47bb-0310-9956-ffa450edef68
2009-07-01 12:20:45 +00:00
Vikas Mayur 5d9c79f5c6 Transaction Totals report can now be exported to PDF and CSV format.
Applied patch from Brajesh Patel, OFBIZ-2677 (https://issues.apache.org/jira/browse/OFBIZ-2677)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@790120 13f79535-47bb-0310-9956-ffa450edef68
2009-07-01 11:16:11 +00:00
Ashish Vijaywargiya baed74e0db Applied patch from jira issue OFBIZ-2678 (Currency not shown on the Transaction Totals search result.)
Thanks Brajesh for your contribution on this.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789784 13f79535-47bb-0310-9956-ffa450edef68
2009-06-30 15:05:54 +00:00
Jacopo Cappellato 4c0a8c2320 Misc enhancements to the "Transaction Totals" report; thanks to Sumit for the patch. OFBIZ-2611
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@785537 13f79535-47bb-0310-9956-ffa450edef68
2009-06-17 10:17:57 +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 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 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 e3f730799b 12th 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


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759562 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 19:45:05 +00:00
Marco Risaliti 14f189c2e3 A lot of hardcoded labels cleaning and changes some wrong references
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@753400 13f79535-47bb-0310-9956-ffa450edef68
2009-03-13 20:51:44 +00:00
Marco Risaliti 2d8f185142 A lot of hardcoded labels cleaning and changes some wrong references
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@753028 13f79535-47bb-0310-9956-ffa450edef68
2009-03-12 21:50:12 +00:00
Marco Risaliti e39f705523 A lot of hardcoded labels cleaning and changes some wrong references
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744265 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 22:22:34 +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
Scott Gray 2966935cc7 BigDecimal comparison fix
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@733109 13f79535-47bb-0310-9956-ffa450edef68
2009-01-09 18:44:15 +00:00
David E. Jones 874f02e9da Manual merge of typecheckcleanup200810 branch as of rev 731346 in that branch, resolved all conflicts; with this BigDecimal is not the native type for many entity fields and is used for many calculations; some work is still needed in certain areas of the project but this covers the most critical ones; thanks especially to Scott for his work on this
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731851 13f79535-47bb-0310-9956-ffa450edef68
2009-01-06 07:13:36 +00:00
Jacques Le Roux 10a97260af Revert 728176, should better be done in typecheckcleanup200810 branch (David's advice)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728247 13f79535-47bb-0310-9956-ffa450edef68
2008-12-20 08:16:36 +00:00
Jacques Le Roux cc616c4ea2 Some BigDecimals in xml files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728176 13f79535-47bb-0310-9956-ffa450edef68
2008-12-19 22:25:35 +00:00
Jacques Le Roux 0aa053f4e7 Following a dicussion on dev ML replace some Double by Bigdecimal when used in UEL expressions. Add some other, Long also. No functionnal changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@727783 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 18:22:21 +00:00
Scott Gray 6954c7c1fa Fix display issue reported by Sharan Foga in the user list
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@689026 13f79535-47bb-0310-9956-ffa450edef68
2008-08-26 10:45:25 +00:00
Marco Risaliti e61f0c159b Remove deprecated style viewManyTR1 that is now no more used.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@641362 13f79535-47bb-0310-9956-ffa450edef68
2008-03-26 16:01:10 +00:00
Vikas Mayur e63ac96ff3 Applied patch from Jira OFBIZ-1496 (https://issues.apache.org/jira/browse/OFBIZ-1496)
With few enhancements :
1) Added Apache License to TransactionTotals.bsh
2) Improved the bsh code.
3) Added style element to the Forms and Screen.

Many thanks to Rishi Solanki, Sumit Pandit & Ratnesh Upadhyay for posting and testing this patch.
Special thanks to Jacopo for his help on this issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@620794 13f79535-47bb-0310-9956-ffa450edef68
2008-02-12 13:34:13 +00:00
Marco Risaliti c9c9dcba26 Gl/Report Financial Summary forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1603)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@617306 13f79535-47bb-0310-9956-ffa450edef68
2008-01-31 23:52:40 +00:00
Jacopo Cappellato e55adb996e Misc fixes for the gl auto posting services.
Very first and incomplete version of the comparative balance sheet.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@609356 13f79535-47bb-0310-9956-ffa450edef68
2008-01-06 17:59:05 +00:00