Commit Graph
90 Commits
Author SHA1 Message Date
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
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
Hans Bakker 9edcd74a80 exclude double field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730025 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 01:15:32 +00:00
Hans Bakker a2c5b444ce OFBIZ-2097: show organizationPartyId in header(can be set in preferences), rewrote financial history to show currencies, invoice/p[aymentworker now can show in actual and organizationparty currency
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729396 13f79535-47bb-0310-9956-ffa450edef68
2008-12-25 06:26:14 +00:00
Hans Bakker 7ec1fb6789 Rate refactoring, now can have a base rate with diffrent currencies which can be overridden on a party or workeffort level. see OFBIZ-2037 for more info
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728894 13f79535-47bb-0310-9956-ffa450edef68
2008-12-23 07:26:55 +00:00
Jacques Le Roux d63b012d62 A patch from Sumit Pandit "A scheduled service to generate Invoice." (https://issues.apache.org/jira/browse/OFBIZ-1796) - OFBIZ-1796
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726662 13f79535-47bb-0310-9956-ffa450edef68
2008-12-15 09:43:34 +00:00
David E. Jones 13bbc5145e Added fields to keep track of order where a fixed asset was purchased
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@706837 13f79535-47bb-0310-9956-ffa450edef68
2008-10-22 01:24:29 +00:00
Jacques Le Roux 92dacb9091 Remove
taxCategory
    taxVatCode
    taxDutyCode
fields from Product entity and all things related. 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@690360 13f79535-47bb-0310-9956-ffa450edef68
2008-08-29 18:29:57 +00:00
Adrian Crum 973fd64442 Moved the auto-assign fixed asset party to fixed asset maintenance feature from the Asset Maint component to the Accounting component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@681711 13f79535-47bb-0310-9956-ffa450edef68
2008-08-01 15:03:31 +00:00
Jacques Le Roux 641ff10050 Update Copyright to 2008
A real replace in files feature was one of the reasons I use Eclipse 3.4 for near a year now (I even helped to test, a real must have :o)
Not sure previous commit was sent partially or not at all (I needed to update)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@677685 13f79535-47bb-0310-9956-ffa450edef68
2008-07-17 18:56:25 +00:00
Adrian Crum 97c8e2ecc6 Fixed duplicate index error introduced in previous commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@674262 13f79535-47bb-0310-9956-ffa450edef68
2008-07-06 05:39:09 +00:00
Adrian Crum 1f4e8de91d Fixed Asset Meter refactor, based on the patch in https://issues.apache.org/jira/browse/OFBIZ-1851.
This commit replaces the FixedAssetMaintMeter entity with a more generic FixedAssetMeter entity. There is a service available to migrate data in existing installations - migrateFixedAssetMaintMeter. The original FixedAssetMaintMeter behavior has been maintained - nothing changes from the user's perspective.

Meter readings will trigger the creation of a fixed asset maintenance if the fixed asset has been set up with product maintenances.

Many thanks to David Jones and Anil Patel for their help with this.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@673842 13f79535-47bb-0310-9956-ffa450edef68
2008-07-03 22:10:55 +00:00
Ashish Vijaywargiya ad83e56c89 Improved the relationship as suggested by Mr Tanakorn in Jira Issue # OFBIZ-1844.
Thanks Mr Tanakorn.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@670139 13f79535-47bb-0310-9956-ffa450edef68
2008-06-21 05:29:28 +00:00
Jacopo Cappellato ed4e0b7741 Workarounds to get localized descriptions (if available) for the GL accounts (until we will extend the support for localized entity content in the form widget).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@643856 13f79535-47bb-0310-9956-ffa450edef68
2008-04-02 11:33:26 +00:00
Jacopo Cappellato 8ea01ff5e1 Moved two CostComponent related entities to the right components.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@638002 13f79535-47bb-0310-9956-ffa450edef68
2008-03-17 18:19:51 +00:00
Jacques Le Roux eebd98c9c8 A patch from Chris Lombardi "POS: credit card data compliance" 'https://issues.apache.org/jira/browse/OFBIZ-1674) - OFBIZ-1674
+ a file which was missing in a previous commit (base component-load.xml)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@637395 13f79535-47bb-0310-9956-ffa450edef68
2008-03-15 11:31:20 +00:00
Vikas Mayur 0d35f81a22 Applied patch from Jira Issue OFBIZ-1686 (https://issues.apache.org/jira/browse/OFBIZ-1686)
Added new Entity definations for SalesOpportunityTrackingCode, SalesOpportunityCompetitor
with modifications to other entities for SFA component

Thanks to Jyotsna Rathore, Saurabh Nayak for the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@632034 13f79535-47bb-0310-9956-ffa450edef68
2008-02-28 15:55:59 +00:00
Si Chen 0a90e3b29a Add relation for GlAccountType's parent/child structure.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@631785 13f79535-47bb-0310-9956-ffa450edef68
2008-02-28 00:12:58 +00:00
Hans Bakker 47e230cb31 introduction of new reservation entities: OFBIZ-1590
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@630718 13f79535-47bb-0310-9956-ffa450edef68
2008-02-25 02:22:15 +00:00
Jacopo Cappellato 4a116318c3 Changed the alias name because "AT" seems to be a reserved word in some databases (including Derby).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@628119 13f79535-47bb-0310-9956-ffa450edef68
2008-02-15 16:49:41 +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
Vikas Mayur 3ab66ede73 Implement ability to map parties to GlAccounts
Applied patch from Shankar Soni, part of the issue OFBIZ-1541 (https://issues.apache.org/jira/browse/OFBIZ-1541) 

Thanks to Shankar Soni for the patch and Jacopo, Ashish for there help.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@613389 13f79535-47bb-0310-9956-ffa450edef68
2008-01-19 13:36:42 +00:00
Vikas Mayur 2ceb0c9e3b Applied Patch from Sumit Pandit and Santosh Malviya "Implement fixed asset depreciation (methods) (https://issues.apache.org/jira/browse/OFBIZ-1539)"- OFBIZ-1539 with few modifications.
Thanks to Sumit Pandit, Santosh Malviya for the patch and many thanks to Jacopo, Jacques for there review & help.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@611416 13f79535-47bb-0310-9956-ffa450edef68
2008-01-12 14:11:54 +00:00
Jacques Le Roux c6f925619c A patch from Amit Shinde "Discussion about the interaction between order total promotions and sales taxes" (https://issues.apache.org/jira/browse/OFBIZ-225) - OFBIZ-225
It's now possible to include promotions in sales tax calculations. In order for that to happen, make sure to set the 'taxPromotions' flag in the TaxAuthorityRateProduct table to 'Y'.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@606777 13f79535-47bb-0310-9956-ffa450edef68
2007-12-25 10:02:06 +00:00
Hans Bakker 37b1650380 missing currency field required for giftcard processing
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@602859 13f79535-47bb-0310-9956-ffa450edef68
2007-12-10 10:50:25 +00:00
Jacopo Cappellato 100f64aecb Improved the createAcctgTransAndEntries service:
- it automatically retrieves the glAccountId (if it is not passed) from the glAccountTypeId field;
- it automatically converts the origAmount from origCurrencyUomId to amount in currencyUomId;
- some misc improvements

Implemented the *first* service (as a proof of concept) that uses it to automatically create (triggered by a seca, for now disabled) an accounting transaction for sale shipment issuances.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@598582 13f79535-47bb-0310-9956-ffa450edef68
2007-11-27 10:05:02 +00:00
Jacopo Cappellato 631411469f Implemented new organization GL setup screen for journals; added field for error journal to the accounting preferences entity (and screens); implemented transaction/entries serches by journal id.
Misc cleanups.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@597976 13f79535-47bb-0310-9956-ffa450edef68
2007-11-25 12:24:58 +00:00
Jacopo Cappellato 19037b5b0a Misc improvements to the Accounting GL screens (especially for the search screen for accounting transactions).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@597099 13f79535-47bb-0310-9956-ffa450edef68
2007-11-21 14:16:38 +00:00
Si Chen a4e1b62b9c a few more fields for AcctgTransAndEntries
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@589041 13f79535-47bb-0310-9956-ffa450edef68
2007-10-27 02:19:09 +00:00
Si Chen 9ea8478dab Added group by glFiscalTypeId to AcctgTransEntryProdSums because without it, subtle bugs may crop up.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@588716 13f79535-47bb-0310-9956-ffa450edef68
2007-10-26 17:16:02 +00:00
Jacopo Cappellato a89a3e1c85 Defined relation to children inventory items.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@584155 13f79535-47bb-0310-9956-ffa450edef68
2007-10-12 13:00:29 +00:00
David E. Jones 56cb33ab46 Decided these are better gone than renamed, will then show up as unknown columns when doing the entity engine db meta data check, which should ALWAYS be done when updating
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@570050 13f79535-47bb-0310-9956-ffa450edef68
2007-08-27 09:17:29 +00:00
David E. Jones 2078c138c2 A bit of a change: removed isFrozen and inGoodStanding fields from FinAccount, replaced by the new statusId field and FinAccountStatus entity; added/changed supporting services; updated relevant UI and automated routines; should all be in place now
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@570039 13f79535-47bb-0310-9956-ffa450edef68
2007-08-27 08:42:11 +00:00
Andrew Zeneski ed151c22a6 added reason code to financial account transactions
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@568746 13f79535-47bb-0310-9956-ffa450edef68
2007-08-22 20:39:27 +00:00
David E. Jones 321219f207 Added descriptions for the isFrozen and inGoodStanding indicators
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@567743 13f79535-47bb-0310-9956-ffa450edef68
2007-08-20 16:32:52 +00:00
Jacopo Cappellato 2d8a84a005 Changed field name that was causing a warning because 'comment' is a reserved word.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@554591 13f79535-47bb-0310-9956-ffa450edef68
2007-07-09 10:09:24 +00:00
Andrew Zeneski 293c90dd8e added comments to financial account transactions
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@549593 13f79535-47bb-0310-9956-ffa450edef68
2007-06-21 20:05:11 +00:00
Jacopo Cappellato 9e2403fa95 Added overrideOrgPartyId field to ProductPromo and InvoiceItem for associating a promotion with a Internal Organization Party.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@549490 13f79535-47bb-0310-9956-ffa450edef68
2007-06-21 14:16:58 +00:00
Andrew Zeneski 2b88f1e5dc added new financial account field inGoodStanding
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@547480 13f79535-47bb-0310-9956-ffa450edef68
2007-06-15 01:41:39 +00:00
Jacopo Cappellato 7ed37eb27d A bunch of i18n and i10n improvements by Marco Risaliti: OFBIZ-1062 and OFBIZ-1057
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@545461 13f79535-47bb-0310-9956-ffa450edef68
2007-06-08 09:06:47 +00:00
David E. Jones 7d70c41c12 Did a big search/replace to change all xsd file refs from www.ofbiz.org to ofbiz.apache.org
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@539504 13f79535-47bb-0310-9956-ffa450edef68
2007-05-18 15:47:14 +00:00
Si Chen 80e2c9ca61 Added textValue to InvoiceTerm, OrderTerm and AgreementTerm to store an actual
description of what the term is and can be filled in with seed data.  The 
description fields are retained, but are intended to be user editable.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@536333 13f79535-47bb-0310-9956-ffa450edef68
2007-05-08 21:22:09 +00:00
Scott Gray 63ead57a0e Further support for calculating tax to 3 decimal places:
- Removed premature rounding from the order and invoices services
- Changed InvoiceItem to use currency-precise instead of currency-amount

Note: the UI is still displaying currency amounts to 2 decimal places so until that is changed an order/invoice total may not match the sum of the various items/adjustments displayed.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@535415 13f79535-47bb-0310-9956-ffa450edef68
2007-05-04 23:28:32 +00:00