Commit Graph
12781 Commits
Author SHA1 Message Date
Ashish Vijaywargiya 9e27ccfa94 Applied patch from jira issue OFBIZ-3138 - Refund for orders placed through PayPal Express checkout doesn't work.
Thanks Pranay Pandey / Arun Patidar for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832681 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 08:44:03 +00:00
Ashish Vijaywargiya 16fe50949c Applied patch from jira issue - OFBIZ-3139 - Correct refunded amount does not go to Google Checkout when we returns more than 1 qty of a item.
When we creates return for orders placed through Google Checkout then correct refunded amount does not go to Google Checkout.

Thanks Pranay / Arun for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832680 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 08:38:58 +00:00
Ashish Vijaywargiya be2c9f302a Applied patch from jira issue - OFBIZ-3140 - Process payment notification from Google Checkout in ofbiz.
Process payment notification of Authorization, Capture and Refund from Google Checkout in ofbiz.

Thanks Pranay / Arun for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832678 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 08:27:44 +00:00
Jacques Le Roux 29103e3d65 A patch from Bob Morley "Resolve java warnings exposed in Eclipse : framework - jetty" (https://issues.apache.org/jira/browse/OFBIZ-3114) - OFBIZ-3114
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832671 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 07:04:17 +00:00
Jacques Le Roux cd10618fcc A patch from Bob Morley "Resolve java warnings exposed in Eclipse : framework - datafile" (https://issues.apache.org/jira/browse/OFBIZ-3106) - OFBIZ-3106
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832669 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 06:58:07 +00:00
Adrian Crum 906e159702 Small fixup for last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832581 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 22:21:29 +00:00
Adrian Crum f30d44ccdc TimeDuration.java improvements. This is the first step in a duration data type implementation discussed here - https://issues.apache.org/jira/browse/OFBIZ-3125.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832574 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 21:58:00 +00:00
Bilgin Ismet Ibryam 2f84835b65 Enabled on-field-event-update-area on lookup elements which was already available in HtmlFormRenderer.
This can be seen in Add example feature application form.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832551 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 20:52:01 +00:00
Jacques Le Roux 72768078cd A patch from Matthieu Bollot "manufacturing/routing groovy have moved" (https://issues.apache.org/jira/browse/OFBIZ-3144) - OFBIZ-3144
Since https://issues.apache.org/jira/browse/OFBIZ-3067?page=com.atlassian.jira.plugin.ext.subversion%3Asubversion-commits-tabpanel some file have moved, but some path were still the old one.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832495 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 18:17:44 +00:00
Jacques Le Roux b3318c2536 These files were missing in r832368, thanks to Erwan's comment in the corresponding Jira issue: OFBIZ-3097
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832472 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 16:52:21 +00:00
Jacopo Cappellato 9b9033af70 Added form to filter cost components by currency; when used, the grand total for the currency selected is also shown.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832433 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 14:36:23 +00:00
Jacopo Cappellato 5a1e860c6d Improved code to get product costs; now all the costs of the same family are considered.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832420 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 13:57:33 +00:00
Jacques Le Roux 1bcd65177a Did not notice in r832404
Better French label

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832405 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 13:10:01 +00:00
Jacques Le Roux 2793433e3e A patch from Carsten Schinzer "Add Danish and Frisian Locale Labels" (https://issues.apache.org/jira/browse/OFBIZ-2861) - OFBIZ-2861
Danish (da) and Frisian (fy) are not fully detailed in the CommonUiLabels.xml.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832404 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 12:57:45 +00:00
Jacques Le Roux a5126b34e7 A patch from Rohit Jain " Add About Us link in eCommerced footer" (https://issues.apache.org/jira/browse/OFBIZ-3129) - OFBIZ-3129
Rohit : There Should be a link with name "About us" that will be shown detail for ofbiz.
Jacques : Not sure it's very helpful OOTB (there is already the same link from "Powered by OFBiz'), but may be used by third parties.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832402 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 12:28:16 +00:00
Ashish Vijaywargiya 174724c16b Adding missing Quote (") - Patch from Akash Jain (Thanks!)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832393 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 11:16:42 +00:00
Jacques Le Roux 246d05b752 Fix a bug introduced with r832368
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832371 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 10:05:28 +00:00
Jacques Le Roux 6e61b5e801 A patch from Erwan de FERRIERES "help link in example is not working" (https://issues.apache.org/jira/browse/OFBIZ-3097) - OFBIZ-3097
when clicking the help link in the example app, the showHelp request is not recognised.
-> added a request in the example controller
-> created the ExampleHelpData file
-> added the needed line to load the data in the Example ofbiz-component file.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832368 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 09:58:06 +00:00
Jacques Le Roux 79c7a4fe25 Remove a bunch of <label>&lt;br/&gt;</label> which are not correctly rendered in screens.
This follow https://issues.apache.org/jira/browse/OFBIZ-3143

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832366 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 09:52:29 +00:00
Jacques Le Roux 816960bcd4 A patch from Erwan de FERRIERES "<br> is displayed in NewLeadFromVCard and is not necessary" (https://issues.apache.org/jira/browse/OFBIZ-3143) - OFBIZ-3143
a label just with <br/> was wrongly included in the NewLeadFromVCard screen
+ Better French label

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832361 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 09:30:00 +00:00
Jacques Le Roux f51a7ee047 File names consistency and show right screen at end of payment (I think this needs a little clean up, will do ASAP)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832358 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 09:24:26 +00:00
Ashish Vijaywargiya 31eba1277a Applied patch from jira issue - OFBIZ-3137 - Show the values of form fields updated on change of website for Export to eBay form.
The form fields are not showing updated on change of website. Whenever websiteId changed update form fields by the filled value so that user not need to fill it again.

Thanks Parimal for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832336 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 08:14:20 +00:00
Jacques Le Roux 9c0b9e62e0 A patch from Bob Morley "Resolve java warnings exposed in Eclipse : framework - bi" (https://issues.apache.org/jira/browse/OFBIZ-3103) - OFBIZ-3103
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832331 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 08:05:40 +00:00
Anil Patel 10175e24f5 Fixed up batchPayments to use PaymentAndTypePartyNameView. Added necessary relationship attributes to view entity. Minor looks updates as well for consistency.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832319 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 07:23:03 +00:00
Hans Bakker 645e18a03b remove @override to keep compatible with java 1.5
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832317 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 07:09:06 +00:00
Anil Patel d2c731d03b reformatting, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832313 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 06:46:59 +00:00
Anil Patel 9f76bc5dc3 Added view entity to fetch Payment, PaymentType desc, PaymentMethodType desc, status desc and Party names for display in UI. Fixed depositWithdrawPayment.ftl, now uses view.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832312 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 06:44:30 +00:00
Anil Patel c667cd47bb Use Run UiLabel from CommonUiLabels.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832295 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 04:03:57 +00:00
Hans Bakker 7248f6db66 Jira issue: https://issues.apache.org/jira/browse/OFBIZ-3128
1. New SFA Account/contact/lead find/list screens replacing ftl/partysearch with form/performfind.
2. SFA now compatible with the party manager with the 'all' option still have the previous 'my' option
3. added new widget property: 'text find' to set the default here and not in the xsl
4. added 'container' as a field to the form in order to insert forms dynamically with an ajax request
5. fix bug for using radio field.
6. Implemented comments on this jira issue including using the find decorator 

Contribution by Chattree, an employee of Antwebsystems Co.Ltd.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832294 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 03:59:01 +00:00
Jacques Le Roux 1904799cf7 Some generics in POS
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832186 13f79535-47bb-0310-9956-ffa450edef68
2009-11-02 23:22:46 +00:00
Anil Patel e69b9bc5a2 Removed duplicate definition of CommonPartyDecorator. Added partyDecoratorLocation parameter to ar/ap web.xml file so they can find CommonPartyDecorator.
This issues was discussed on list after r829392 commit in response to patch on OFBIZ-3080.
 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831920 13f79535-47bb-0310-9956-ffa450edef68
2009-11-02 15:32:39 +00:00
Ashish Vijaywargiya 7131b2dbe3 Renaming the two fields from PaymentGatewayOrbital entity as reported on Dev mailing list.
1) password -> connectionPassword.
2) class -> engineClass.

Thanks Jacques for your comment on this.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831899 13f79535-47bb-0310-9956-ffa450edef68
2009-11-02 14:09:15 +00:00
Vikas Mayur 9812011ab1 Form enclosing missed in earlier commit, sorry about that.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831889 13f79535-47bb-0310-9956-ffa450edef68
2009-11-02 13:02:57 +00:00
Vikas Mayur d3e230bd8d Attempt to fix a secured URL in ftl.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831881 13f79535-47bb-0310-9956-ffa450edef68
2009-11-02 12:45:25 +00:00
Jacques Le Roux eef33a284f EmplLeaveReasonType Relation name was too long
EMP_LEAV_REAS_ELTP is ok now
Thanks to Scott on dev ML

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831842 13f79535-47bb-0310-9956-ffa450edef68
2009-11-02 10:14:18 +00:00
Scott Gray 42aa98280d Adding memberComments as an alias for ProductCategoryMember.comments in the ProductAndCategoryMember view entity
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831834 13f79535-47bb-0310-9956-ffa450edef68
2009-11-02 09:30:29 +00:00
Jacques Le Roux f620e32bf9 A patch from Marc Morin "Resolve java warnings exposed in Eclipse : framework - start" (https://issues.apache.org/jira/browse/OFBIZ-3118) - OFBIZ-3118
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831807 13f79535-47bb-0310-9956-ffa450edef68
2009-11-02 07:01:41 +00:00
Jacques Le Roux 1c947c3b81 A slightly modified patch from Deepak Dixit ""Order History", cart summary links are all smashed together - making it almost impossible to figure out what they say." (https://issues.apache.org/jira/browse/OFBIZ-3054) - OFBIZ-3054
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831805 13f79535-47bb-0310-9956-ffa450edef68
2009-11-02 06:46:04 +00:00
Jacques Le Roux e739fc04b9 A slightly modified patch from Deepak Dixit "List boxes are not displayed properly in bizznesstime theme." (https://issues.apache.org/jira/browse/OFBIZ-3134) - OFBIZ-3134
I simply used the same syntax than in other themes (XHTML)
+ added =multiple (XHTML compliant) where needed
+ fixed in product quick admin (wrong syntax multiple=true)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831801 13f79535-47bb-0310-9956-ffa450edef68
2009-11-02 06:15:12 +00:00
Jacques Le Roux 4695486068 A patch from Erwan de FERRIERES "Add an ant "clean-tempfiles" target in main build.xml" (https://issues.apache.org/jira/browse/OFBIZ-2447) - OFBIZ-2447
+ some target descriptions (for ant -p)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831778 13f79535-47bb-0310-9956-ffa450edef68
2009-11-01 23:02:29 +00:00
Jacques Le Roux ae4dd7bca2 Handle several promo codes in the Promo status bar and canceling them, with the customer selected as well
+ some better French labels
+ some generics
+ a MaxInactivity parameter has been introduced (was harcoded)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831753 13f79535-47bb-0310-9956-ffa450edef68
2009-11-01 20:04:17 +00:00
Bilgin Ismet Ibryam fea3c7fca3 A patch from Bruno Busco "Adding a page size selector in the pagination bar" - https://issues.apache.org/jira/browse/OFBIZ-3083
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831676 13f79535-47bb-0310-9956-ffa450edef68
2009-11-01 13:51:42 +00:00
Anil Patel ebb7309ba1 Added bulk action for updating invoice status. Also cleaned up javascript code to take advantage of prototype library. Still remains to move javascript in separate file and also css trick to show button disabled when it is.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831648 13f79535-47bb-0310-9956-ffa450edef68
2009-11-01 07:22:50 +00:00
Anil Patel 8ca9954e5f When creating AP payment use PaymentMethod of organizationParty. FinAccount Transactions are created by fetching finAccountId from PaymentMethod.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831638 13f79535-47bb-0310-9956-ffa450edef68
2009-11-01 04:28:33 +00:00
Anil Patel 6589d8a4e2 Updated Check Run process to use PaymentMethod of paying organizationParty instead of FinAccount. finAccountId is now fetched from PaymentMethod and finAccount Transaction is created.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831637 13f79535-47bb-0310-9956-ffa450edef68
2009-11-01 04:08:22 +00:00
Bilgin Ismet Ibryam 529b5dda47 Added parameter element declaration to tree links.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831607 13f79535-47bb-0310-9956-ffa450edef68
2009-10-31 22:20:53 +00:00
Bilgin Ismet Ibryam a5654d9e1a Added a missing curly brace.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831590 13f79535-47bb-0310-9956-ffa450edef68
2009-10-31 20:33:12 +00:00
Jacques Le Roux ef251da11e Some more generics with Eclipse help
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831559 13f79535-47bb-0310-9956-ffa450edef68
2009-10-31 15:58:57 +00:00
Jacques Le Roux 4d98cc143b Consistent French label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831558 13f79535-47bb-0310-9956-ffa450edef68
2009-10-31 15:58:17 +00:00
Jacques Le Roux 17c711893c Better French label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831555 13f79535-47bb-0310-9956-ffa450edef68
2009-10-31 15:35:12 +00:00