Commit Graph
104 Commits
Author SHA1 Message Date
David E. Jones 70f8da92bb Moved logo and icon images back to images component and removed from everywhere else; all references to these should be to there only now; fixes issue with logo in ecommerce and other little things
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766426 13f79535-47bb-0310-9956-ffa450edef68
2009-04-19 06:12:55 +00:00
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
Hans Bakker 3569bcaad5 move project info from myportal to projectmgr, added some demo data to test these screens
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762232 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 07:17:19 +00:00
Hans Bakker ed8503aa61 move list customer invoices from myportal into accounting
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762061 13f79535-47bb-0310-9956-ffa450edef68
2009-04-05 10:02:32 +00:00
Hans Bakker 07c39fdc4f add some more time periods, changed organizationPartyId on demo payment and invoices to 'company'
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@747669 13f79535-47bb-0310-9956-ffa450edef68
2009-02-25 05:58:50 +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
Hans Bakker 0402a21952 added supplier lookup, modified the sales/purchase input start screen to look better....should actually be converted to forms...do that next time
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746158 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 05:59:03 +00:00
Bruno Busco 32e70a513b Added seed data to have a WebSite entity for every webapp.
The new WebSite entity sets a relation to a VisualThemeSet so that when selecting a VisualTheme, only applicable VisualThemes are available in the VisualTheme Lookup screen.
More work is needed (i.e. move the OrderEntry WebSite from demo to seed) but I need to be sure this is a good direction.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744518 13f79535-47bb-0310-9956-ffa450edef68
2009-02-14 16:42:49 +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
Hans Bakker a986b1aa61 first phase of payrol completed. to test: create payrol invoice, add items under the 'items' tab, set to 'approved', go to accounting -> general ledger -> accounting -> checks and your check should appear there and you are able to print it
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@736590 13f79535-47bb-0310-9956-ffa450edef68
2009-01-22 08:44:25 +00:00
Hans Bakker 5d7accf40c first part of payrol, be able to create a payrol invoice see issue: OFBIZ-2117
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735949 13f79535-47bb-0310-9956-ffa450edef68
2009-01-20 07:15:19 +00:00
Hans Bakker 5ccce18358 added some demo data to show the invoices in different currencies and some error correction
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729414 13f79535-47bb-0310-9956-ffa450edef68
2008-12-25 10:57:34 +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
Anil Patel 913d4e3919 Some more data to suppot IsMgr application.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@720345 13f79535-47bb-0310-9956-ffa450edef68
2008-11-24 23:29:36 +00:00
Ashish Vijaywargiya 9942a64c3b Adding two record of FixedAssetType = COMPUTER_HARDWARE & COMPUTER_SOFTWARE.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@720133 13f79535-47bb-0310-9956-ffa450edef68
2008-11-24 08:38:21 +00:00
Adrian Crum 50724da6b9 More temporal expression work - additional JavaDocs, code fixups, converted all job sandbox jobs to temporal expressions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@695995 13f79535-47bb-0310-9956-ffa450edef68
2008-09-16 18:19:55 +00:00
Adrian Crum 7692f1851b Updated the job scheduler to use temporal expressions. Recurrence rules still work - so there is no rush to change existing installations.
I moved the recurrence count to the job sandbox. Keeping counters in the recurrence info was a bad idea. Any other code that relied upon counters in recurrence info will have to be redesigned to use temporal expressions.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@695695 13f79535-47bb-0310-9956-ffa450edef68
2008-09-16 00:10:17 +00:00
Jacques Le Roux a35201f4fb More complete ACCTG_PREF SecurityPermissions for FULLADMIN and BIZADMIN
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@684494 13f79535-47bb-0310-9956-ffa450edef68
2008-08-10 13:12:26 +00:00
Adrian Crum ba81bf9919 A couple of improvements to fixed asset maintenance:
1. When a fixed asset maint status is changed to Completed, the associated work effort status is changed to Completed as well. In addition, work effort party assignment thruDates are updated.

2. A scheduled job looks for fixed asset product maints set up on time intervals and automatically creates maintenances when the specified time interval passes. Right now it only supports day, month, and year intervals. More can be added if needed.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@683418 13f79535-47bb-0310-9956-ffa450edef68
2008-08-06 21:22:29 +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
Jacopo Cappellato 70ee611d04 Initial data for purchase return invoices.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@679088 13f79535-47bb-0310-9956-ffa450edef68
2008-07-23 13:46:26 +00:00
Adrian Crum caec38b735 Asset Maintenance improvements:
1. Demo Data.
2. Product Maintenance screen.
3. Fixed non-functional product lookup buttons

Internationalization note: this commit contains a new UI label.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@673532 13f79535-47bb-0310-9956-ffa450edef68
2008-07-02 22:37:58 +00:00
Ashish Vijaywargiya 1bd0bca817 Applied patch from JIRA issue (Save an Invoice as Invoice Template) :- https://issues.apache.org/jira/browse/OFBIZ-1672
Here is the description :- 

Save Invoice as Template
1) Add Seed Invoice Type TEMPLATE.
2) Add two sub invoice Types SALES_INV_TEMPLATE and PUR_INV_TEMPLATE
3) Add [Save Invoice as Template] button on Create Invoice and Edit Invoice screens. On Click save Invoice data as Invoice Template.

Thanks Sumit Pandit for working on this.
Patched a typo.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@655851 13f79535-47bb-0310-9956-ffa450edef68
2008-05-13 13:19:50 +00:00
Jacques Le Roux c4aa7ac322 Fix a typo
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@651079 13f79535-47bb-0310-9956-ffa450edef68
2008-04-23 21:48:19 +00:00
Jacopo Cappellato fed9cd86a9 New comments for demo gl data.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@633047 13f79535-47bb-0310-9956-ffa450edef68
2008-03-03 11:55:13 +00:00
Jacopo Cappellato f2346ff789 Small fixes to the GlAccountType data to fix a data loading error reported by Pankaj Savita and others; however the data really need a careful review and cleanup.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@631906 13f79535-47bb-0310-9956-ffa450edef68
2008-02-28 09:50:42 +00:00
Jacopo Cappellato b007f2a55d Fix for bug that happens when you reload demo data (ant run-install) over existing data when you have already created at least one invoice.
The problem is that the PartyAcctgPreference.lastInvoiceNumber field (that contains the number of the last invoice) is overriden with 0.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@617515 13f79535-47bb-0310-9956-ffa450edef68
2008-02-01 15:16:09 +00:00
David E. Jones 39c32c1e98 Added _NA_ for other test internal orgs; thanks to Bilgin for catching this
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@610565 13f79535-47bb-0310-9956-ffa450edef68
2008-01-09 21:12:20 +00:00
David E. Jones e5582315c9 Cleaned up sub-org data, added relationships to Company
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@610489 13f79535-47bb-0310-9956-ffa450edef68
2008-01-09 18:09:18 +00:00
Ashish Vijaywargiya 88396f539b Applied patch from OFBIZ-1492.
Description :- Auto posting: Implement an automatic GL posting service for payment applications
It was not implemented correct.
I did patch work as per as the requirements.
Removed the iterate block.
We should fetch the PaymentApplication record from the input parameter "paymentApplicationId".
And then the related record from the Payment table.

Thanks to all who has contributed in this task.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@609252 13f79535-47bb-0310-9956-ffa450edef68
2008-01-06 02:19:45 +00:00
Jacopo Cappellato dbbdc80c2b Misc improvements and bug fixes for the new Balance Sheet report.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@607208 13f79535-47bb-0310-9956-ffa450edef68
2007-12-28 11:27:32 +00:00
Jacopo Cappellato 5cbf2afd10 Demo data for tax accounts mappings.
Fix for auto posting service for sales invoices.
Misc enhancements to the Income Statement report.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@606153 13f79535-47bb-0310-9956-ffa450edef68
2007-12-21 10:17:48 +00:00
Jacopo Cappellato 89cbe395df Very simple (and beta) version of the Income Statement.
OFBIZ-1501

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@605973 13f79535-47bb-0310-9956-ffa450edef68
2007-12-20 16:30:30 +00:00
Jacopo Cappellato 68be645e7c A bit of 'ascii art' to document the GL Account Class tree.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@605881 13f79535-47bb-0310-9956-ffa450edef68
2007-12-20 10:44:31 +00:00
Ashish Vijaywargiya 4e948ee10c glAccountId field don't exists in the PaymentMethodType entity.
Instead we should provide defaultGlAccountId field in the same entity.

Thanks to Pranay Pandey for pointing it out.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@605035 13f79535-47bb-0310-9956-ffa450edef68
2007-12-17 23:02:25 +00:00
Jacques Le Roux 9126a0d719 Replacing unused ACCOUNTING_ATX_ by ACCTG_ATX_ (forgot this file in previous commit)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@604989 13f79535-47bb-0310-9956-ffa450edef68
2007-12-17 20:36:13 +00:00
Jacopo Cappellato 6e3e647516 Cleanups for the AcctgTransType seed data.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@604806 13f79535-47bb-0310-9956-ffa450edef68
2007-12-17 09:39:46 +00:00
Ashish Vijaywargiya 26f46d0d60 Applied patch from JIRA Issue # OFBIZ-1490 with Minor Changes.
Thanks to Brajesh Patel for your patch .
Brajesh I did an entry for "AcctgTransType" entity for the "INCOMING_PAYMENT" that somehow you had missed in your patch.

Also we are thankful to Pranay Pandey,Mridul Pathak and Vikas Mayur for helping Brajesh for finishing this work.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@604505 13f79535-47bb-0310-9956-ffa450edef68
2007-12-15 20:24:06 +00:00
Jacopo Cappellato 6c2f73518f First experimental implementation of the closeFinancialTimePeriod service.
OFBIZ-1522
Several misc improvements.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@604156 13f79535-47bb-0310-9956-ffa450edef68
2007-12-14 10:50:26 +00:00
Jacopo Cappellato d270c9ea74 Misc bug fixes and improvements after a first cursory test of the new posting services.
Now the secas that trigger them are enabled because, with the new seed data, they shoudn't cause any issue.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@603530 13f79535-47bb-0310-9956-ffa450edef68
2007-12-12 10:08:05 +00:00
Jacopo Cappellato 585f0826b2 Demo data required to test the gl auto posting services.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@603513 13f79535-47bb-0310-9956-ffa450edef68
2007-12-12 08:35:20 +00:00
Jacopo Cappellato 6c914183c4 Added a bunch of demo settings/mappings for the GL accounting setup.
WARNING: most of the glAccountId set in this file are probably not correct from an Accounting point of view; they will need to be seriously reviewed and corrected (by persons with a better accounting knowledge than me); but they are good to test the new and upcoming automatic transaction services.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@603172 13f79535-47bb-0310-9956-ffa450edef68
2007-12-11 08:16:24 +00:00
Scott Gray 830d853634 Added a GlAccountOrganization to the demo data, seems to be required to receive inventory with a $0 unit cost
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@601249 13f79535-47bb-0310-9956-ffa450edef68
2007-12-05 08:44:11 +00:00
Jacopo Cappellato 39cc720bcc Seed data for OFBIZ-1482 and OFBIZ-1483
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@600527 13f79535-47bb-0310-9956-ffa450edef68
2007-12-03 13:29:33 +00:00
Jacopo Cappellato 8f0930bb78 Seed data for OFBIZ-1481
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@600455 13f79535-47bb-0310-9956-ffa450edef68
2007-12-03 09:22:12 +00:00
Jacopo Cappellato 532e8d2d8f New seed data, part of OFBIZ-1472
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@600255 13f79535-47bb-0310-9956-ffa450edef68
2007-12-02 07:59:45 +00:00