Commit Graph
2250 Commits
Author SHA1 Message Date
Ashish Vijaywargiya 9adc1e0669 Applied patch from jira issue - OFBIZ-3924 - Bug on creating Communication event for order return emails(return accept, return complete and return cancel).
Bug on creating Communication event for order return emails(return accept, return complete and return cancel). Attached return pdf along with return emails.

Thanks Anurag for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@993387 13f79535-47bb-0310-9956-ffa450edef68
2010-09-07 15:03:20 +00:00
Bruno Busco 6cb038332c Removed settings of hideSearch field. This is not used any more.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@989397 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 22:54:50 +00:00
Jacques Le Roux 38372a7270 A quick workaround for a bug reported by Matt Warnock on user ML
When I go to the latest trunk demo, ecommerce store page, in the "browse forums" section on the left side bottom, there is an error that starts with "Expression forum.contentName is undefined on line 26".

It does not fix the reason though, which is somewhere upstream


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987813 13f79535-47bb-0310-9956-ffa450edef68
2010-08-21 18:53:29 +00:00
Bruno Busco 2c78313a9e Moved TabBar menus in the pre-body section
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987564 13f79535-47bb-0310-9956-ffa450edef68
2010-08-20 16:30:09 +00:00
Jacques Le Roux 4cf1de3119 Fix a bug reported in this thread http://markmail.org/message/2f6ryfm6fvvrvx74
"Cost calculation is still broken and no shipping costs are returned."

Note that nothing still is calculated for Fedex. I'm not quite sure if it's related, but Fedex has changed/is changing how things work. The API is deprecated, replaced by web services and will be totally unusable in May 2012

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@985856 13f79535-47bb-0310-9956-ffa450edef68
2010-08-16 10:14:45 +00:00
Jacques Le Roux 4ced84dd08 A patch from Karl Pitrich "When editing Portal Pages, Drag & Drop for Portlets does not work" (https://issues.apache.org/jira/browse/OFBIZ-3889) - OFBIZ-3889
When editing Portlet Pages, either in MyPortal or PortalAdm, Drag & Drop of Portlets does not work.
Where are several Issues in the MyPortal, some have fixes, none is commited to trunk.

Problems:

    * in myportal.js, function getDestinationInformationPortlets(): DOM ID's are not handled correctly
    * in framework/webtools/widget/PortalAdmScreens.xml: required javascript + css files are not included


JLR: 
While working on this I have found other issues: the login.ftl files used in hhfacility and myportal were not tenant enabled. They are different  but by chance in myportal very close to common so I was finally able  to do both at along with  Karl's changes. Actually I wanted to do 2 commits but forget to uncheck the files while doing a second attempt to commit.

MyPortal
 * The login process in MyPortal was not tenant enabled, it's done in this commit.
 * I kept its specificity : newRegisterLogin and wonder why it has not been extended to common?

hhfacility
The login process in hhfacility was not tenant enabled, it's done in this commit. Doing so, I saw there i18n is not done, not an issue for me...







git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@985163 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 11:43:38 +00:00
Hans Bakker 5b8fb74a32 change field name 'condition' because is a reserved word
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@985102 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 06:23:30 +00:00
Hans Bakker 422b10f3ed This feature is the automation of best offers. It is used to check and respond to an offer of a customer in the eBay Store.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@984366 13f79535-47bb-0310-9956-ffa450edef68
2010-08-11 10:39:10 +00:00
Hans Bakker 12ee138903 add new line at end of file
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@984364 13f79535-47bb-0310-9956-ffa450edef68
2010-08-11 10:33:42 +00:00
Jacques Le Roux f8c2c2be19 A patch from René Scheibe <<"createUpdateBillingAddressAndPaymentMethod" service called from one page checkout throws Exception due to incorrect field name>> (https://issues.apache.org/jira/browse/OFBIZ-3887) - OFBIZ-3887
Problem:
The method "createUpdateBillingAddressAndPaymentMethod" in CheckoutServices.xml refers to a "billToCardSecurityCode" parameter, which is not existing.
Instead OnePageCheckoutProcess.ftl defines this field with id="CVV2" and name="cardSecurityCode".

Solution:
1. Change the "id" and "name" in OnePageCheckoutProcess.ftl to meet the attribute name of "createUpdateBillingAddressAndPaymentMethod".
2. Extend the attribute mapping line in CheckoutServices.xml so that in case the CVV2 is not entered by the user, the field is defined anyway. (otherwise groovy.lang.MissingPropertyException is still thrown as the field is always accessed)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@983930 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 11:20:55 +00:00
Jacques Le Roux b552004b9b A patch from René Scheibe ""setShippingOption" service called from one page checkout throws Exception" (https://issues.apache.org/jira/browse/OFBIZ-3886) - OFBIZ-3886
The shippingTotal has to be a BigDecimal for the methods called...

    * org.ofbiz.base.util.UtilFormatOut.formatCurrency(...)
    * org.ofbiz.order.shoppingcart.ShoppingCart.setItemShipGroupEstimate(...)

...so in case it's null, initialize it with BigDecimal.ZERO instead of 0.00

Fixes also some JavaDoc in UtilFormatOut.java

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@983920 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 10:43:01 +00:00
Adam Heath b273b52dad Finally created a script to find and fix tons of missing final newlines.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@982870 13f79535-47bb-0310-9956-ffa450edef68
2010-08-06 04:46:48 +00:00
Scott Gray 3483832f8c Replace usage of deprecated method.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@982144 13f79535-47bb-0310-9956-ffa450edef68
2010-08-04 07:28:25 +00:00
Jacques Le Roux 83d2efe2b7 Fix a bug reported by Ruth " eCommerce checkout -> Edit Contact Information -> Save -> Go Back does not return user to checkout" (https://issues.apache.org/jira/browse/OFBIZ-3432) - OFBIZ-3432
Mostly to test the change I just did in mergefromtrunk.bat. Else I'd like to fix also the way the options are shown when using the std checkout (far below, very bad for newcomers). But I have not enough faith, at least today...

I tested enough, and this should not not introduce any side-effects.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@981288 13f79535-47bb-0310-9956-ffa450edef68
2010-08-01 19:36:40 +00:00
Scott Gray ace861ed08 Remove duplicate service definition, removed the one that was defined first so the existing behaviour is maintained.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@981173 13f79535-47bb-0310-9956-ffa450edef68
2010-08-01 08:51:28 +00:00
Scott Gray 4448c4a866 No functional changes, just removing a whole bunch of unused imports and reorganizing them along the way.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@981019 13f79535-47bb-0310-9956-ffa450edef68
2010-07-31 08:28:34 +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 c538130326 A patch from Bob Morley - OFBIZ-3857 - Fix bad field reference projectIdId should be projectId
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@964558 13f79535-47bb-0310-9956-ffa450edef68
2010-07-15 20:06:49 +00:00
Scott Gray 0a09814ebf URLs defined as javascript variables shouldn't be xhtml encoded because when they are assigned to an element's url attribute (action, href, etc.) the browser doesn't decode them before using them.
Applied patch from Deepak Dixit OFBIZ-3860 and additionally fixed some others that I found.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@963915 13f79535-47bb-0310-9956-ffa450edef68
2010-07-14 00:38:19 +00:00
Jacques Le Roux f2fbad78d5 Improvement on r960336. Fix a problem reported by Scott on dev ML.
I tested locally, and I think I have done it right this time


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@960491 13f79535-47bb-0310-9956-ffa450edef68
2010-07-05 09:10:19 +00:00
Scott Gray f4d1e4b6ae Removed references to a service provider's company name from the project
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@960405 13f79535-47bb-0310-9956-ffa450edef68
2010-07-04 21:50:21 +00:00
Jacques Le Roux 82aba53fa5 Improvement on r960336 (should fix a problem reported by Scott on dev ML.)
I tested locally, but I'm not quite sure it's sufficient


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@960401 13f79535-47bb-0310-9956-ffa450edef68
2010-07-04 21:23:47 +00:00
Hans Bakker 4f945b00d0 Handle ebaystore product Item Specifics
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@957428 13f79535-47bb-0310-9956-ffa450edef68
2010-06-24 06:13:20 +00:00
Hans Bakker 32fd5599b2 Revising Open Ebay item specific Listings
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@957427 13f79535-47bb-0310-9956-ffa450edef68
2010-06-24 06:10:29 +00:00
Hans Bakker 71eebb29cb update of ebaystore demo data
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@957150 13f79535-47bb-0310-9956-ffa450edef68
2010-06-23 10:31:02 +00:00
Scott Gray 375eec00c2 Update catalog urls to use the new OfbizCatalogUrl directive
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@956485 13f79535-47bb-0310-9956-ffa450edef68
2010-06-21 08:05:07 +00:00
Jacques Le Roux 9ef845d0ad A patch from BJ Freeman "complete web.xml for error reporting" (https://issues.apache.org/jira/browse/OFBIZ-3820) - OFBIZ-3820
BJ: when there is an error, the control servlet looks for an error path in <param-name>allowedPaths</param-name>
it does not find one throwing an exception which buries the orginal error.
instead of changing the code it is just easier to add the /error: path.
then the real error gets reported correctly.

JLR: This will maybe help to better understand some errors on demo servers, and can't hurt

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@954135 13f79535-47bb-0310-9956-ffa450edef68
2010-06-12 20:47:08 +00:00
Erwan de Ferrieres 5b2b852c2c Changing portlet category from PROFILE to PARTY_PROFILE to make it more understandable
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@953014 13f79535-47bb-0310-9956-ffa450edef68
2010-06-09 14:05:46 +00:00
Jacques Le Roux 86e817b533 Reverted on Scott's advice (useless and give some trouble on back button: POST => msg like "do you want to send again", not GET)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@952164 13f79535-47bb-0310-9956-ffa450edef68
2010-06-07 09:30:45 +00:00
Jacopo Cappellato 55df2c8979 Enhanced ebay order import to support auctions of different types (not only Chinese auctions).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@952129 13f79535-47bb-0310-9956-ffa450edef68
2010-06-07 07:53:51 +00:00
Jacques Le Roux 4943ab1e3b Secure some targets. Note that they have been introduced since OFBIZ-2243 has been closed.
Please committers use only target with parameter attribute (not in URL) for link and hyperlink fields when there is an action (ie DB modification)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@952119 13f79535-47bb-0310-9956-ffa450edef68
2010-06-07 07:02:02 +00:00
Anil Patel 37e569a115 Fix missing prefix for shipTo and billTo phone numbers.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@951251 13f79535-47bb-0310-9956-ffa450edef68
2010-06-04 03:19:45 +00:00
Jacques Le Roux eddce15982 A patch from Willem Janssen "Dutch labels patch" (https://issues.apache.org/jira/browse/OFBIZ-3800) - OFBIZ-3800
Adds Dutch translations in various UiLabel files, thanks to Vikas Raikwar for reviewing and checking

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@951124 13f79535-47bb-0310-9956-ffa450edef68
2010-06-03 19:24:26 +00:00
Jacopo Cappellato 653774e47f Fixed bug where eBay itemId was set as order's externaId instead of transactionId; transactionId was also stored in the order but never used.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@951099 13f79535-47bb-0310-9956-ffa450edef68
2010-06-03 18:24:45 +00:00
Marco Risaliti 1498a44fd4 Some missing security permissions for HHFacility, Setup and BI components
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950483 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02 10:45:44 +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
Jacques Le Roux cb591b9c6a Some languages don't use # for number http://en.wikipedia.org/wiki/Number_sign
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@947483 13f79535-47bb-0310-9956-ffa450edef68
2010-05-23 20:15:49 +00:00
Jacques Le Roux ca77bb5166 Fixes some French labels related to # which is n° in French
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@947479 13f79535-47bb-0310-9956-ffa450edef68
2010-05-23 20:07:55 +00:00
Jacques Le Roux fda988d301 Closes "Allow to open a layer lookup from a layer lookup recursively" (https://issues.apache.org/jira/browse/OFBIZ-3693) - OFBIZ-3693
This commit removes all remaining <presentation="window">

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@946073 13f79535-47bb-0310-9956-ffa450edef68
2010-05-19 07:36:02 +00:00
Erwan de Ferrieres e03acf5505 XHTML validation errors round 2++ (specialpurpose/ebay) - OFBIZ-3756 (https://issues.apache.org/jira/browse/OFBIZ-3756)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@945857 13f79535-47bb-0310-9956-ffa450edef68
2010-05-18 20:07:34 +00:00
Erwan de Ferrieres 36332bd0c2 XHTML validation errors round 2++ (specialpurpose/ecommerce) - OFBIZ-3757 (https://issues.apache.org/jira/browse/OFBIZ-3757)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@945852 13f79535-47bb-0310-9956-ffa450edef68
2010-05-18 19:57:57 +00:00
Erwan de Ferrieres a0eabf6760 XHTML validation errors round 2 (specialpurpose_webpos)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@945848 13f79535-47bb-0310-9956-ffa450edef68
2010-05-18 19:52:04 +00:00
Erwan de Ferrieres d885b6c0a7 XHTML validation errors (specialpurpose/myportal) - OFBIZ-3758 (https://issues.apache.org/jira/browse/OFBIZ-3758)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@945580 13f79535-47bb-0310-9956-ffa450edef68
2010-05-18 10:23:19 +00:00
Erwan de Ferrieres 9c801d2b7d XHTML validation errors round 2+ (specialpurpose/projectmgr) - OFBIZ-3672 (https://issues.apache.org/jira/browse/OFBIZ-3762)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@945573 13f79535-47bb-0310-9956-ffa450edef68
2010-05-18 10:03:01 +00:00
Jacques Le Roux 1bb9f348de A patch from Ankit Jain "Incorrect Data Format" https://issues.apache.org/jira/browse/OFBIZ-3544 - OFBIZ-3544
After login to Ecommerce, go to Profile and update Personal Information. Enter a valid date for Birth Date and Passport Expire Date (format: yyyy-mm-dd). Click "Save". Once back to the main screen, click on "Update" again to update the Personal Information. You will see that the two dates are displayed in wrong date formats, e.g. "Aug 25, 1972". So, the date is formatted wrongly somewhere.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@945118 13f79535-47bb-0310-9956-ffa450edef68
2010-05-17 12:47:48 +00:00
Jacques Le Roux 40b97913ac A patch from Bob Morley "Resolve java warnings exposed in Eclipse (ebay part of OFBIZ-3100)" https://issues.apache.org/jira/browse/OFBIZ-3594 - OFBIZ-3594
Bob's comment: three ebay related files along with CheckoutHelper in application/orders whose createOrder now returns a more complete Map<String, Object> instead of a non-generic Map. 
Actually CheckoutHelper  was already containing Bob's change but there are still a lot of warning, I began to work on them and also in CheckOutEvents, but I finally gave up...


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@944720 13f79535-47bb-0310-9956-ffa450edef68
2010-05-15 21:11:02 +00:00
Jacques Le Roux 62976e36fb We still have a problem with the find button in recursive cases (ie LookupWorkEffort and LookupContent).
It's not related to previous patches committed but an issue which is remaining and we have to face now.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@944647 13f79535-47bb-0310-9956-ffa450edef68
2010-05-15 14:13:03 +00:00
Jacques Le Roux 578662ae4c Now that we have fixed the layered lookup inside layered lookup issue and the recursive call case we can get rid of all the useless remaining presentation="window".
I keep the example and beware LookupTimeDuration is a special case

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@944623 13f79535-47bb-0310-9956-ffa450edef68
2010-05-15 12:13:00 +00:00