Commit Graph
184 Commits
Author SHA1 Message Date
Deepak Dixit b15d57c11a Improved: Removed deprecated entities. (OFBIZ-9327)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1792176 13f79535-47bb-0310-9956-ffa450edef68
2017-04-21 10:31:59 +00:00
Deepak Dixit dd33f049ef Fixed: Found console warning related to attribute 'entity-alias' must appear on element 'condition-expr'
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1782658 13f79535-47bb-0310-9956-ffa450edef68
2017-02-12 11:36:05 +00:00
Jacques Le Roux 6dbbf2ee8f Fixed: In entitymodel.xsd entity-alias for condition-expr must be required
(OFBIZ-9184)

Currently in the entitymodel.xsd the line

<xs:attribute name="entity-alias" type="xs:string"/>

is wrong, should be

<xs:attribute name="entity-alias" type="xs:string"  use="required"/>

Else in line

this.entityAlias = entityAlias;

in ModelViewEntity.ViewConditionExpr() 

this.entityAlias 

receives null.

All supported branches are concerned


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1779625 13f79535-47bb-0310-9956-ffa450edef68
2017-01-20 14:20:47 +00:00
Deepak Dixit 834691742b (OFBIZ-6274) Renamed OFBiz artefacts from org.ofbiz.* to org.apache.ofbiz.*.Thanks to Taher for working on it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752920 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 10:30:49 +00:00
Jacopo Cappellato 85b2008053 OFBIZ-6760: Moved all entity definitions from the applications components into a new component named "datamodel".
This is a first step to refactor application components into independent parts that can be deployed when needed.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1720413 13f79535-47bb-0310-9956-ffa450edef68
2015-12-16 18:37:22 +00:00
Deepak Dixit 900db1f15b (OFBIZ-6687) Moved FixedAssetMaintWorkEffort view entity from specialpurpose/assetmaint to accounting.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710178 13f79535-47bb-0310-9956-ffa450edef68
2015-10-23 11:35:34 +00:00
Arun Patidar 3865ff485d [OFBIZ-6171] Applied patch from Pierre Smits for replacing 'Open for Business' references with 'Apache OFBiz'.Thanks Pierre for the contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1706589 13f79535-47bb-0310-9956-ffa450edef68
2015-10-03 14:15:21 +00:00
Jacopo Cappellato 373e0aba28 Moved the "bi" component from the framework to the specialpurpose folder; moved all the dependencies (client code) on the "bi" component from applications components to the "bi" component itself.
Now the "bi" component contains all the dimensions/facts/star schemas and all the logic to populate them and can be easily enabled/disabled.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1642027 13f79535-47bb-0310-9956-ffa450edef68
2014-11-27 06:14:06 +00:00
Jacopo Cappellato ce58b9e0c4 Usability improvement for management of manual Gl transactions (OFBIZ-5559): thanks to Anahita Goljahani for the patch and to Pierre Smits for the tests and review.
Main changes introduced:
* new "Not available" data types that can be applied when transaction, account and resource type are not specified
* fixed some screens that were still displaying the account pk rather than the account code
* misc enhancements to the editing of manual transactions and chart of accounts
 



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1589623 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 07:39:46 +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 c98ffafa00 add entity and services to be able to add content to payments
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1525495 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 03:13:04 +00:00
Hans Bakker ff9107cb25 replace groovy file with new view and add orderitemSeqId to invoiceitemlist
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1512132 13f79535-47bb-0310-9956-ffa450edef68
2013-08-09 03:08:25 +00:00
Hans Bakker c09114575f spelling error in reference number field invoice export/import
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1502116 13f79535-47bb-0310-9956-ffa450edef68
2013-07-11 04:33:04 +00:00
Hans Bakker ad8ae088de add a csv import/export invoices at an organizational level with partyid and productid translation functions, more imports/exports will follow
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1502093 13f79535-47bb-0310-9956-ffa450edef68
2013-07-11 03:14:30 +00:00
Jacques Le Roux f7b662bc46 A patch from Nicolas Malin for "Entity-Auto Engine : manage [create|lastModified]Date field" https://issues.apache.org/jira/browse/OFBIZ-5010
When a entity have fields createDate, lastModifiedDate, createByUserLogin and updateByUserLogin, the entity-auto engine set them.

Also makes all entities that have one of fields [create|lastModified][Date|ByUserLogin] to be consistent and have four fields

Impacted entityies:

    [Quote|Order|Return]Adjustment
    OrderPaymentPreference
    AcctgTrans
    GlReconciliation
    ValueLinkKey


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1407578 13f79535-47bb-0310-9956-ffa450edef68
2012-11-09 18:26:19 +00:00
Hans Bakker 20c8d5f282 foreign key name too long
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343122 13f79535-47bb-0310-9956-ffa450edef68
2012-05-28 01:15:16 +00:00
Hans Bakker ad1682658b add entities and services to be able to add content and notes to invoices
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1341765 13f79535-47bb-0310-9956-ffa450edef68
2012-05-23 07:22:30 +00:00
Erwan de Ferrieres edea4e0e19 OFBIZ-4640 French translation for RateType description and for WorkEffortTimesheetAlreadyExists label - A patch from Olivier Heintz
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1226964 13f79535-47bb-0310-9956-ffa450edef68
2012-01-03 21:57:24 +00:00
Hans Bakker b91483e35b correction on commit for rev: 1176145
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1176227 13f79535-47bb-0310-9956-ffa450edef68
2011-09-27 06:28:16 +00:00
Hans Bakker 483299c5ec New product type: Fixed Asset Usage For Rental of an asset which is shipped from and returned to inventory. Including Junit test and demo data. More explanation will follow in a blog on the 'what is new page'
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1167015 13f79535-47bb-0310-9956-ffa450edef68
2011-09-09 06:40:28 +00:00
Adam Heath 2343d4aee3 FIX: Correct several typos in various description fields.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1144107 13f79535-47bb-0310-9956-ffa450edef68
2011-07-08 00:38:27 +00:00
Ashish Vijaywargiya f33fb16e98 Bug fix. Adding support of x_duplicate_window that will help us not to see any duplicate authorization that can occur with customer in the predefined time limit. The time limit for this duplicate window is 120(2 minutes) - 28800 (8 hours). For more details please refer Authorize.net developer guide - Here is the screenshot for direct reference - http://oi55.tinypic.com/2ziah51.jpg. We have made this settings configurable so anyone can enable it if they are facing this issue on production instance.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1090226 13f79535-47bb-0310-9956-ffa450edef68
2011-04-08 12:54:33 +00:00
Andrew Zeneski 7fa3382f21 fixed a few entities missing index names for foreign keys
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1073943 13f79535-47bb-0310-9956-ffa450edef68
2011-02-23 20:55:16 +00:00
Jacques Le Roux 329c8e2431 A patch from Martin Kreidenweis "New Custom Method order ID generation implementation in OFBIZ-3765 broke backwards compatibility" (https://issues.apache.org/jira/browse/OFBIZ-4178) - OFBIZ-4178
Due to missed col-name attributes for the deprecated field names (old* fields) and a typo in the minilang code in the original patch (OFBIZ-3765), the backwards compatibility with the old enum IDs broke.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1070621 13f79535-47bb-0310-9956-ffa450edef68
2011-02-14 19:38:40 +00:00
Hans Bakker 06d0aae7d6 Add the 'ideal' payment gateway, often used in the Netherlands, see http://www.ideal.nl, install instruction in the thirdparty src folder
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1062608 13f79535-47bb-0310-9956-ffa450edef68
2011-01-24 02:27:11 +00:00
Andrew Zeneski 9134b5eeb6 added eway payment integration
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1053723 13f79535-47bb-0310-9956-ffa450edef68
2010-12-29 20:05:11 +00:00
Andrew Zeneski 1e0dc9b67d added support for the card present api to the authorize.net integration; this uses the cardpresent.authorize.net url as well as the market_type and device_type properties. These were added to the entity for configuration.
The request API was almost the same as the standard AIM; however the response is very different. Most of the changes here are around response processing and abstracting the position of the fields out of the main response class.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1033717 13f79535-47bb-0310-9956-ffa450edef68
2010-11-10 21:21:24 +00:00
Hans Bakker 98f6fa0137 add the securepay payment processor
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023735 13f79535-47bb-0310-9956-ffa450edef68
2010-10-18 10:56:30 +00:00
Adam Heath ac2299c50e Fix a bunch of no final newline issues.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@965918 13f79535-47bb-0310-9956-ffa450edef68
2010-07-20 17:15:21 +00:00
Erwan de Ferrieres abfdde6bfb OFBIZ-3765 - Use CustomMethod for select order, quote and invoice hook to resolve id (https://issues.apache.org/jira/browse/OFBIZ-3765)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@954388 13f79535-47bb-0310-9956-ffa450edef68
2010-06-14 09:38:33 +00:00
Jacques Le Roux 6193dd4e53 <author>None</author> is totally useless and we don't need an author OOTB
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949101 13f79535-47bb-0310-9956-ffa450edef68
2010-05-28 05:41:23 +00:00
Jacques Le Roux 63fd94e778 Not sure why, but my regexp S/R in the commit r948846 boke some formatting. I also removed some useless other stuff in this commit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@948852 13f79535-47bb-0310-9956-ffa450edef68
2010-05-27 14:45:59 +00:00
Jacques Le Roux 2a1a5aee14 We don't need
<copyright>Copyright 2001-.* The Apache Software Foundation</copyright>
<copyright><year>.*</year><holder>Apache Foundation</holder></copyright>
<copyright><year>.*</year><holder>Apache Foundation.</holder></copyright>
<owner>Copyright 2001-.* The Apache Software Foundation</owner>

Less to update every year!

Thanks to BJ 1st effort at "update files from 2009 to 2010" (https://issues.apache.org/jira/browse/OFBIZ-3783) - OFBIZ-3783

Note: there are been a lot of efforts in 2009: there are plenty of data dated from this year!

I hope I did not broke anything (should not, but of course I did not try all changes...) Anyway, this can be easily reverted...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@948846 13f79535-47bb-0310-9956-ffa450edef68
2010-05-27 14:23:22 +00:00
Vikas Mayur 51fb47bee0 Fixed a relationship type on FixedAsset entity.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940430 13f79535-47bb-0310-9956-ffa450edef68
2010-05-03 12:21:37 +00:00
Jacques Le Roux 03edb6250c ChartOfAccountsEntityLabelsdoes not exist yet and his blocking LookupGlAccount.
Try it at https://demo-trunk.ofbiz.apache.org/accounting/control/EditTaxAuthorityGlAccounts?taxAuthPartyId=_NA_&taxAuthGeoId=_NA_

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@939990 13f79535-47bb-0310-9956-ffa450edef68
2010-05-01 12:16:17 +00:00
Jacopo Cappellato 42693db752 Added externalId field to GlAccount entity in order to store the id of the account in an external system where the accounts are imported/exported.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@938845 13f79535-47bb-0310-9956-ffa450edef68
2010-04-28 10:03:24 +00:00
Jacopo Cappellato c2d9606772 Implemented first version of FIFO and LIFO costing methods in accounting:
1) added new fields to InventoryItem/InventoryItemDetail to keep track of the units posted to INVENTORY accounts according to the costing methods in use
2)  added new field to AcctgTransEntry to keep track of the inventoryItemId that was used to get the cost according to LIFO/FIFO etc... strategy
3) modified existing demo data to support the new costing strategies; enabled by default the LIFO strategy for Company accounting (it was average cost before)
4) code that implements LIFO/FIFO for inventory receipts and sales shipments


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@926090 13f79535-47bb-0310-9956-ffa450edef68
2010-03-22 14:02:46 +00:00
Jacopo Cappellato 8c4dd5cb6e First step in the implementation of automatic transactions for fixed assets:
* new entity to setup account mappings for all assets, by asset type or for a specific asset
* screen to setup mappings for a specific asset



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@900727 13f79535-47bb-0310-9956-ffa450edef68
2010-01-19 11:24:34 +00:00
Jacopo Cappellato 774a349970 Removed unused and invalid entity: depreciation methods are maintained in the CustomMethod entity.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@900394 13f79535-47bb-0310-9956-ffa450edef68
2010-01-18 13:48:45 +00:00
Jacopo Cappellato 01707fdddb Implemented form to list, in the fixed asset depreciation screen, the accounting transactions created for the fixed asset.
Fixed a couple of invalid simple method operations I committed in my last commit.
 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@899158 13f79535-47bb-0310-9956-ffa450edef68
2010-01-14 10:59:44 +00:00
Hans Bakker b6a334c615 changed view entities so there are no warnings of duplicated fields at start-up
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@895583 13f79535-47bb-0310-9956-ffa450edef68
2010-01-04 09:03:38 +00:00
Ashish Vijaywargiya df7db96318 Applied patch from jira issue OFBIZ-3331 - Restrict Cancelled Financial Account operation on AP New Payment Screen.
Thanks Awdesh & Sumit for the contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@890229 13f79535-47bb-0310-9956-ffa450edef68
2009-12-14 08:55:48 +00:00
Jacopo Cappellato 3dc4c4abec Fixed warning messages reported by Scott Gray in the dev list.
Added two fields to the acctg trans entry totals view entity, that will be used to compute balances in the upcoming improved script for the income statement.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@886138 13f79535-47bb-0310-9956-ffa450edef68
2009-12-02 13:32:23 +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 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