Commit Graph
12781 Commits
Author SHA1 Message Date
Vikas Mayur 19da682b0e Reverting changes done in rev. 814553 as discussed on dev mailing list. Now the conventional profile screens are default again.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816469 13f79535-47bb-0310-9956-ffa450edef68
2009-09-18 04:49:22 +00:00
Vikas Mayur 500174b8af Markup cleanup, first pass.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816465 13f79535-47bb-0310-9956-ffa450edef68
2009-09-18 03:59:03 +00:00
Vikas Mayur 2d3e567988 Markup cleanup, first pass.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816463 13f79535-47bb-0310-9956-ffa450edef68
2009-09-18 03:56:04 +00:00
Ashish Vijaywargiya df0d501dfb Another pass in Ebay Integration.
-- We are trying to merge GetSellerTransactions & GetOrders request.
-- As GetOrders request don't read the seperate Transactions.

For more details please refer: 
http://ebay.custhelp.com/cgi-bin/ebay.cfg/php/enduser/std_adp.php?p_faqid=1468&p_created=1252434669&p_sid=mSqK4dIj&p_accessibility=0&p_redirect=&p_lva=&p_sp=cF9zcmNoPTEmcF9zb3J0X2J5PSZwX2dyaWRzb3J0PSZwX3Jvd19jbnQ9MzAsMzAmcF9wcm9kcz0wJnBfY2F0cz0mcF9wdj0mcF9jdj0mcF9zZWFyY2hfdHlwZT1hbnN3ZXJzLnNlYXJjaF9ubCZwX3NjZl85PSZwX3NjZl8xMD0mcF9zY2ZfMTI9JnBfc2NmXzEzPSZwX3BhZ2U9MSZwX3NlYXJjaF90ZXh0PUdldE9yZGVycw!!&p_li=&p_topview=1




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816459 13f79535-47bb-0310-9956-ffa450edef68
2009-09-18 03:53:06 +00:00
Adam Heath 44b87c4b9c Add support for generics markup in string type names.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816350 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 19:39:45 +00:00
Jacques Le Roux 48fda8a035 A patch from Brett Palmer "Adding Tomcat Catalina configuration for "privileged" applications" (https://issues.apache.org/jira/browse/OFBIZ-2945) - OFBIZ-2945
Out of the box Tomcat allows you to configure "privileged" applications by specifying the context as follows.
<Context path="/manager" debug="0" privileged="true"
   docBase="/usr/local/kinetic/tomcat6/server/webapps/manager">
</Context>

Since OFBiz is an embedded version of Tomcat it does not currently include a similar configuration for privileged applications.

The Tomcat manager application is a "privileged" application that includes utilities for monitoring JMX resources such as thread counts, connections, and any other configured JMX parameter. We use JMX with Hyperic to monitor our OFBiz servers

BTW, I used almost the same for Lambda Probe (https://issues.apache.org/jira/browse/OFBIZ-1397)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816335 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 18:56:36 +00:00
Jacques Le Roux 4f096038f2 A patch from Erwan de FERRIERES "time-dropdown should start at 0 and not 1" (https://issues.apache.org/jira/browse/OFBIZ-2950) - OFBIZ-2950
When using a time-dropdown, drop-downs are starting at 1 and not 0. So we can't select times between 00:00 and 1:00. Timers start at 01:01.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816255 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 16:12:17 +00:00
Hans Bakker e7e8ff14c6 unwanted change by the community
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816193 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 13:57:14 +00:00
Vikas Mayur 00aa08612f Typo in initial commit for class name, buttont -> button
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816168 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 12:34:13 +00:00
Vikas Mayur 93fc0fb3b9 Formatting changes again.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816167 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 12:33:03 +00:00
Vikas Mayur 4ad18bd25a Optimized code.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816165 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 12:28:54 +00:00
Vikas Mayur 796c220d75 Formatting changes only.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816163 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 12:24:51 +00:00
Vikas Mayur eaa54db795 Markup improvements.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816159 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 12:11:14 +00:00
Ashish Vijaywargiya 84556eab7e Removed unused imports.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816152 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 11:47:04 +00:00
Ashish Vijaywargiya 7717818c3a Oops just missed to revert these changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816149 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 11:36:11 +00:00
Ashish Vijaywargiya 5a91a1308c Provided option to see the list of orders from eBay first and then CSR can import the required orders in the system.
Thanks a lot Mridul & Rishi for discussing the better way to handle this case.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816148 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 11:31:48 +00:00
Scott Gray c96dd9d922 Return to EditProductContent rather than staying on the update screen after successfully updating the content
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816143 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 11:27:20 +00:00
Jacques Le Roux 0c9df22a34 A patch from Erwan de FERRIERES "still some references to smooth_feather" (https://issues.apache.org/jira/browse/OFBIZ-2952) - OFBIZ-2952
There was still some references to smooth_feather theme. This patch replaced them with a call to bizzness time

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816125 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 10:18:55 +00:00
Hans Bakker 03430a2895 added a 'setup' component to create a system from seed data only. After the required data is created with this component it is possible to enter a salesorder and quickship it and create an invoice successfully. The 'setup' component will only show in the tab selection if there is no accounting organization. Check the ofbiz document for more info or look in the file applications/commonext/documents/Setup.xml. Created and sponsored by Antwebsystems. Programmed by employee Tukkata
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816083 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 07:43:05 +00:00
Ashish Vijaywargiya 35fe74d6e5 Here comes the GUI support for eBay Configurations (CRUD operation for EbayConfig entity).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816060 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 05:43:32 +00:00
Jacopo Cappellato 8069ba7431 Escaping characters to prevent issues with fields containing quotes etc.
Thanks to Marco Risaliti for the bug report.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816051 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 05:01:42 +00:00
Hans Bakker 9161b85ce2 spaces for tabs
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816036 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 03:22:32 +00:00
Adam Heath 69a9cfb394 Fix typo in runAsync verbosity message.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816007 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 23:24:24 +00:00
Jacques Le Roux 089a34d6ad Fix r815974 where a wrong file was commited (ofbiz/trunk/framework/example/widget/example/ExampleForms.xml)
So here we go again :
A patch from Harmeet Bedi "startofbiz.sh does not have a default debug flag." (https://issues.apache.org/jira/browse/OFBIZ-2059) - OFBIZ-2059
$DEBUG flag is not specified even in comments causing people to dig an find it.
JLR's comment : that's not exactly true, there is already another DEBUG "flag" used for RMI, I think both are useful. So I have moved this "new" one near the older



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815982 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 21:54:45 +00:00
Jacques Le Roux 82119009f9 A patch from Ahmed Dini "Patch non-secure URL in EditCategoryProducts.ftl." (https://issues.apache.org/jira/browse/OFBIZ-2788) - OFBIZ-2788
How to regenerate the error:-
Catalog Manager ->Under Browse Categories section, select a category with products->Products tab then try to delete one of the products by clicking on the delete button. 

I have reformatted all the block, I did not have enough courage to check the all file though...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815977 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 21:42:31 +00:00
Jacques Le Roux 80e9079f1b A patch from Harmeet Bedi "startofbiz.sh does not have a default debug flag." (https://issues.apache.org/jira/browse/OFBIZ-2059) - OFBIZ-2059
$DEBUG flag is not specified even in comments causing people to dig an find it.
JLR's comment : that's not exactly true, there is already another DEBUG "flag" used for RMI, I think both are useful. So I have moved this "new" one near the older


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815974 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 21:20:54 +00:00
Adam Heath 5af665e7a4 Based on OFBIZ-891, allow Iterate to handle java.util.Iterator.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815936 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 19:33:44 +00:00
Adam Heath c8abe01fa5 Apply patch from OFBIZ-1023, adding returnSuccess(List); the javadoc
from the patch wasn't used, however.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815916 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 18:10:49 +00:00
Adam Heath 123d02c2e5 Move this code to TransactionUtil.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815914 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 18:06:54 +00:00
Adam Heath d834920a16 Apply patch from OFBIZ-2949, so that getPartyTelephone returns
contactMechId.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815898 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 17:26:00 +00:00
Adam Heath 3b8db80281 Fix OFBIZ-2943, sending an email in profile page when the current
UserLogin has no associated party.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815860 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 16:19:19 +00:00
Adam Heath aa9da17cc7 Add support for making the orig.tar.gz when using git locally.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815852 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 15:59:44 +00:00
Ashish Vijaywargiya bf8d032e86 Applied patch from jira issue OFBIZ-2936 - Update service - quickCreateCustomer, add a new field which facilitate user to signup for newsletter as well.
Thanks Awdesh & Sumit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815795 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 14:14:16 +00:00
Ashish Vijaywargiya 2b501534c2 Here comes the GUI support for eBay Shipping Methods (CRUD operation for EbayShippingMethod entity).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815789 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 14:04:31 +00:00
Ashish Vijaywargiya 7443ea744e Typo.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815779 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 13:49:57 +00:00
Jacques Le Roux 372e2f01fa Some typos fix, after Scott's remarks on dev ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815770 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 13:27:05 +00:00
Ashish Vijaywargiya c9a820ddc1 Minor changes from Sumit Pandit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815753 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 13:05:59 +00:00
Ashish Vijaywargiya a80dd88866 Moved ShippingMethod & Carrier Party info into entity named "EbayShippingMethod"(new entity).
Prepared demo data to support this feature.Ebay supports couple of shipping method. 
Supported shipping methods list: http://developer.ebay.com/DevZone/XML/docs/Reference/eBay/types/ShippingServiceCodeType.html

In future if we plan to support more methods then we should prepare demo data and we will be done by then.
I will also provide GUI support for this feature soon.

Thanks Jacopo for your comment on this feature implementation.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815743 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 12:48:21 +00:00
Jacques Le Roux b71383f6ac A patch from Nicolas Malin "Add confirm action before do submit action." (https://issues.apache.org/jira/browse/OFBIZ-2916) - OFBIZ-2916
Add this feature to forms in a consistent way with existing feature in menu (enhancing this previous feature)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815734 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 12:16:03 +00:00
Jacopo Cappellato 7fb8790c56 Added missing out parameter that was causing a service validation error.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815715 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 10:45:01 +00:00
Hans Bakker cd112d9227 added sorting and rearranged opportunity screens
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815702 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 10:05:44 +00:00
Ashish Vijaywargiya 8fcdabd321 Code cleanup for error / success message in old implementation of AddItemRequest in eBay.
It is not good practice to break the process of exporting to eBay if some product don't have starting price.

Instead of this I have collected all the products in the list that don't have starting price and then returned this list at the end. 
Also returned the list of products that has starting price and exported successfully to eBay.
Now after export the screen will looks like: http://farm3.static.flickr.com/2549/3924985627_60903d63bd_b.jpg


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815696 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 09:49:54 +00:00
Hans Bakker edfe6ace53 use the same datasource type for lead and opportunity
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815688 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 09:31:30 +00:00
Jacques Le Roux ef54998974 Fix a bug reported by James McGill on user ML :
content/control/EditSurveyResponse puts escaped HTML on the page instead of
the rendered survey.
applications/content/webapp/content/survey/EditSurveyResponse.ftl  has
${surveyString}    but
that apparently escapes the page.   ${surveyString?html} just adds another
level of escaping, and
I couldn't see how to "unescape" from here.
It looks to me like there really should be a call to surveyWrapper.render()
or something like that --
or is it the intended behavior to show the  HTML output instead of the
rendered survey?


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815687 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 09:28:30 +00:00
Hans Bakker 79c276ba3a added some sales opportunity data
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815681 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 09:18:17 +00:00
Jacopo Cappellato c020af7be0 Improved ui to better expose relationship between Payments and Gateway Responses.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815678 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 09:14:39 +00:00
Jacques Le Roux f6232d1c70 Better French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815668 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 08:43:47 +00:00
Jacopo Cappellato d852ca1f6b Better link to payment screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815663 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 08:28:15 +00:00
Jacques Le Roux 69bd17d99b A patch from Deepak Dixit "Demo data in OFBiz that explain "My Group" concept. (https://issues.apache.org/jira/browse/OFBIZ-2435) - OFBIZ-2435
Extend DEV and TESTING group to add few more groups that will be teams. These teams will be a party group in the role of Internal Organization.Each of these teams will have team members (Employees) and a Project Manager. This data will be used for "My Group" concept : It would be used for managing information of a group that the party is member of.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815658 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 08:16:27 +00:00
Jacopo Cappellato 1e45ca65f6 Quick fixes to prevent NPE (but the code should be reviewed/improved here).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815656 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 08:07:02 +00:00