Commit Graph
96 Commits
Author SHA1 Message Date
Suraj Khurana 61b451dd0b Improved: Consistency and Readability improvements for option (form widget) tag.
(OFBIZ-8930)
Thanks Devanshu Vyas for providing the updated patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1845081 13f79535-47bb-0310-9956-ffa450edef68
2018-10-29 08:02:45 +00:00
Jacques Le Roux 65147eb9cf No functional change, I could be wrong but I see no reasons to have an empty
action here

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1779934 13f79535-47bb-0310-9956-ffa450edef68
2017-01-23 14:26:04 +00:00
Deepak Dixit d09255c0b7 Reverted: Minilang code readability and consistency improvements done at r#1768222, this commit reversed key and description of drop-down in the code.
(OFBIZ-9114)

Thanks  Wei Zhang for reporting the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1772880 13f79535-47bb-0310-9956-ffa450edef68
2016-12-06 12:37:42 +00:00
Divesh Dutta 70eb7ff508 Improvement: Minilang code readability and consistency improvements.
(OFBIZ-8929) (OFBIZ-8930) (OFBIZ-8953) (OFBIZ-8965) (OFBIZ-8972) (OFBIZ-8986) (OFBIZ-8991) 

Thanks: Ankush Upadhyay, Anuj Jain, Abhijeet for your patches. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768222 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 14:34:00 +00:00
Divesh Dutta 738a12bec1 Improvement: Miniland code readability and consistency improvements
(OFBIZ-8744) (OFBIZ-8745) (OFBIZ-8746) (OFBIZ-8748) (OFBIZ-8829) (OFBIZ-8830) (OFBIZ-8907) (OFBIZ-8908) (OFBIZ-8924) (OFBIZ-8925) 

Thanks: Ankush Upadhyay , Sega patidar , Abhijeet Ashapure for your patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768219 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 14:14:04 +00:00
Jacques Le Roux c8ba932772 Fixes a "typo" in last commit for "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
We used targetNamespace (should only be used in schema) instead of xsi:schemaLocation



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749634 13f79535-47bb-0310-9956-ffa450edef68
2016-06-22 05:58:26 +00:00
Jacques Le Roux 89212904bd Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
This is the 2nd step: puts back the original names, so it will be transparent for remaining references in xml catalogs, Java code, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749489 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:37:47 +00:00
Jacques Le Roux 4931db1ed9 Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061 by replacing xsd files references in xml files by -ns.xsd files and removing the concerned xsd files
This is a 1st step, in a 2nd I will put back the original names, so it will be transparent for remaining reference in xml catalogs, Java code, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749488 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:14:16 +00:00
Ashish Vijaywargiya 47a05fffbc Applied patch from jira issue - OFBIZ-5288 - Show quantityUom in InventoryValuation Report.
Thanks Ravi for the contribution and thanks Pierre for creating the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1744888 13f79535-47bb-0310-9956-ffa450edef68
2016-05-21 10:23:34 +00:00
Hans Bakker b7411c09bf https://issues.apache.org/jira/browse/OFBIZ-6802 : corrective patch for xml and pdf error
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1731348 13f79535-47bb-0310-9956-ffa450edef68
2016-02-20 09:05:08 +00:00
Hans Bakker 9d39583bcf be able to set accounting company in the header, so other companent can change it too. https://issues.apache.org/jira/browse/OFBIZ-6802
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1728584 13f79535-47bb-0310-9956-ffa450edef68
2016-02-05 01:45:50 +00:00
Nicolas Malin 895c9856b3 Cleaning forms code is needed after setting default-value in list-options and entity-options, patch related to OFBIZ-6524 and follows the resolution of OFBIZ-6490 and OFBIZ-6489. Thanks Gil Portenseigne for this effort
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1686674 13f79535-47bb-0310-9956-ffa450edef68
2015-06-20 21:58:05 +00:00
Jacopo Cappellato 96ddaf1818 Applied fix from OFBIZ-3551: Patch to only show organization's custom time periods at trialbalance screen dropdown; thanks to Willem Janssen for the contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1605707 13f79535-47bb-0310-9956-ffa450edef68
2014-06-26 08:54:08 +00:00
Jacopo Cappellato 3874109539 A pretty important refactoring of some GL data and code that fixes a series of long standing gaps, errors and design issues affecting account balances and the closure of fiscal periods (some of them introduced by me when I initially wrote the first version of these business logics; at that time I didn't have a clear and deep enough understanding of these accounting rules sigh…).
This new version is cleaner (less code, less redundancy of information), correct and it also resolves some pretty relevant issues (including some db deadlock errors) affecting performance in instances with medium/high number of GL postings.
Here is a list of changes introduced in this commit:
* removed the postedBalance field from GlAccount and GlAccountOrganization: this was a wrong design; the field in GlAccount was not used by the applications; the field in GlAccountOrganization was used but not consistently
* added openingBalance field to GlAccountHistory: now this entity has full information about an account in a financial period after the period closed (opening and ending balance, posted debits and credits); now the endingBalance is computed correctly both for Debits and Credits accounts
* updated demo data for the data model changes mentioned above
* the business logic to compute the account balances is now implemented in a service (computeGlAccountBalanceForTimePeriod) and reused consistently
* removed several FIXME/TODO comments now that the new code addresses the related gaps and issues
* removed some old, incorrect or no more used artifacts: getGlAcctgOrgWithPostedBalanceSplit (service), getNetBalance (utily methods)
* refactored the TrialBalanceReport and GlAccountTrialBalance reports and related pdf versions: the new versions have cleaner code and show the correct balances both for debits and credits
* fixed a series of Groovy compilation issues due to missing imports


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1530273 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 13:49:19 +00:00
Hans Bakker 167e101211 In 'TrialBalanceReport' form, add value of 'totalEndingBalance' field to totalPostedDebits – totalPostedCredits
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1003463 13f79535-47bb-0310-9956-ffa450edef68
2010-10-01 10:23:17 +00:00
Jacques Le Roux df40275120 A completed patch from Sascha Rodekamp "Lookup Layer Search of a Varient Product" (https://issues.apache.org/jira/browse/OFBIZ-3746) - OFBIZ-3746
Fix the variant issue in product lookups
Remove the temporary window presentation workaround (done at r939232)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940410 13f79535-47bb-0310-9956-ffa450edef68
2010-05-03 10:37:33 +00:00
Jacques Le Roux 92699050d0 A temporary workaround for the problem reported by Sam Hamilton at https://issues.apache.org/jira/browse/OFBIZ-3746: "Lookup Layer Search of a Variants Product"
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@939232 13f79535-47bb-0310-9956-ffa450edef68
2010-04-29 08:47:57 +00:00
Jacopo Cappellato 407f17ad61 Reimplemented "inventory valuation" report (that was buggy) and its csv and pdf variants: the new version is now based on the new LIFO and FIFO costing methods and it is more efficient because it is based on a single view-entity (that I have extended in order to be used in the new report).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@927014 13f79535-47bb-0310-9956-ffa450edef68
2010-03-24 11:28:17 +00:00
Ashish Vijaywargiya 0511d328c3 Applied patch from jira issue - OFBIZ-3332 - Implement Comparative Cash Flow Statement.
-- Here is modified patch for issue, now total of Receipts and disbursement is showing for selected time periods. 

Thanks Sumit & Jacopo for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@890784 13f79535-47bb-0310-9956-ffa450edef68
2009-12-15 13:11:45 +00:00
Ashish Vijaywargiya 12c66e4c2b Applied patch from jira issue OFBIZ-3332 - Implement Comparative Cash Flow Statement.
Thanks Sumit & Jacopo for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@890272 13f79535-47bb-0310-9956-ffa450edef68
2009-12-14 11:02:40 +00:00
Ashish Vijaywargiya adad2d41a1 Applied patch from jira issue OFBIZ-3326 - Imporve Cash Flow Statement.
Currently Cash flow statement showing many sections like asset, liability ..... that are not required. Sections contains account payable, receivable and these should no part of cash flow.
So doing improvements in Cash Flow Statement by showing only Cash_Equivalent transactions.

New implementation contains three parts -

    * Opening Cash flow
          o It will contain sum of transactions form last closing period to current from date.
    * Period Cash Flow
          o It will contain sum of transaction during date range.
    * Closing Cash flow
          o It will contain sum of amounts of opening cash flows and closing cash flow.

There is a last section of totals, which will in same format of other reports. 

Also PDF and CSV feature added in this work.

Thanks Sumit & Jacopo for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@889598 13f79535-47bb-0310-9956-ffa450edef68
2009-12-11 12:54:18 +00:00
Jacopo Cappellato aa321ed509 Enhanced the "Transaction Totals" financial reports with information about opening and closing balances; removed the "Monthly Trial Balance" report because the same (and improved) information is now available in the "Transaction Totals" report.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@888489 13f79535-47bb-0310-9956-ffa450edef68
2009-12-08 17:14:18 +00:00
Jacopo Cappellato 36e62e223b Renamed report month selection script; misc cleanups and enhancements to financial report screens.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@888305 13f79535-47bb-0310-9956-ffa450edef68
2009-12-08 10:16:42 +00:00
Jacopo Cappellato 48969ba20c Added form definition that I have erroneously deleted; thanks to Sumit Pandit for the patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@888042 13f79535-47bb-0310-9956-ffa450edef68
2009-12-07 17:41:03 +00:00
Jacopo Cappellato e55995a041 Implemented pdf and csv versions of the comparative balance sheet report; misc enhancements to the other financial reports.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@887870 13f79535-47bb-0310-9956-ffa450edef68
2009-12-07 09:50:36 +00:00
Anil Patel 267dc82186 Updated report to show GlAccountBalances by Cost Centers. Now following pattern established by Jacopo in other financial reports.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@887810 13f79535-47bb-0310-9956-ffa450edef68
2009-12-07 00:34:14 +00:00
Jacopo Cappellato 4b2e297c47 New and enhanced financial reports:
* new cash flow statement report from Sumit Pandit; this is a draft and a work in progress and it is only partially working at this stage
* reimplemented the comparative income statement
* misc enhancements to the other financial statements



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@887752 13f79535-47bb-0310-9956-ffa450edef68
2009-12-06 19:45:59 +00:00
Jacopo Cappellato 78c461adfe Reimplemented and improved the "comparative balance sheet" report; improved layout of totals for income statement and balance sheet.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@887308 13f79535-47bb-0310-9956-ffa450edef68
2009-12-04 18:14:14 +00:00
Jacopo Cappellato be995eedfc Misc cleanups; improved (for consistency) search result lists and links. Added ability to filter transactions by Fiscal Gl Type
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@887182 13f79535-47bb-0310-9956-ffa450edef68
2009-12-04 13:11:59 +00:00
Jacopo Cappellato 2e80ccb60d Reimplemented Balance Sheet report (added subtotals, improved layout, especially the one of the PDF version, misc fixes); misc enhancements to the Income Statement.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@887179 13f79535-47bb-0310-9956-ffa450edef68
2009-12-04 12:53:27 +00:00
Jacopo Cappellato 057b4b248c Completely reimplemented Income Statement: improved data preparation code, added more subtotals, cleaned up code, improved layout (especially of PDF version); still some work needs to be done (labels, layout).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@886815 13f79535-47bb-0310-9956-ffa450edef68
2009-12-03 15:27:10 +00:00
Jacopo Cappellato d2abea4691 Misc cleanups to the form widget definitions for the income statement.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@886139 13f79535-47bb-0310-9956-ffa450edef68
2009-12-02 13:33:08 +00:00
Jacopo Cappellato 33744fb2b3 Added default from/thru date values for income statement and cost center report; removed time period selection from cost center report because the report should not be based on this (still we have to improve the logic there).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885723 13f79535-47bb-0310-9956-ffa450edef68
2009-12-01 10:30:33 +00:00
Jacopo Cappellato b07c8e750c Completely reimplemented the "Transaction Totals" financial report because the existing one had a series of issues:
1) the bottom list was missing the last record
2) the grand totals were not computed
3) a bad selection strategy was a problem with big record sets
4) the code in general was messed up
5) improved the layout of the PDF export
6) meaningful default from and thru dates are pre set
7) misc enhancements



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885712 13f79535-47bb-0310-9956-ffa450edef68
2009-12-01 10:07:09 +00:00
Jacopo Cappellato 2b0f422531 Default (now) date is prepopulated in the balance sheet calling report form.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885482 13f79535-47bb-0310-9956-ffa450edef68
2009-11-30 16:24:18 +00:00
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