Commit Graph
12781 Commits
Author SHA1 Message Date
Jacques Le Roux eb128771c2 Improve r813136
"Show the total taxes included in sub total when taxes included in prices is selected in store"


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814343 13f79535-47bb-0310-9956-ffa450edef68
2009-09-13 16:50:26 +00:00
Hans Bakker 158293ecec lookup person and partygroup should not show disabled parties
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814297 13f79535-47bb-0310-9956-ffa450edef68
2009-09-13 10:27:33 +00:00
Hans Bakker 0c1a4608f0 corrected spelling error
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814288 13f79535-47bb-0310-9956-ffa450edef68
2009-09-13 08:53:09 +00:00
Hans Bakker 96cf78008e added the 'main-roletype' to the party list screen, also added a helpscreen to explain it...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814287 13f79535-47bb-0310-9956-ffa450edef68
2009-09-13 08:50:54 +00:00
Anil Patel aafd55c39b Reformatting. Fixed a typo.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814263 13f79535-47bb-0310-9956-ffa450edef68
2009-09-13 03:59:18 +00:00
Anil Patel e24a90645f Oops, had little mistake in markup ending tags.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814262 13f79535-47bb-0310-9956-ffa450edef68
2009-09-13 02:54:13 +00:00
Anil Patel aab550246e Removed extra container.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814261 13f79535-47bb-0310-9956-ffa450edef68
2009-09-13 02:18:14 +00:00
Anil Patel 64c906feda Using style attribute value to determine appropriate html element and render it. Idea is to render better markup.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814260 13f79535-47bb-0310-9956-ffa450edef68
2009-09-13 02:03:46 +00:00
Adam Heath a88ea227a9 Protect closing of the EntityListIterator inside a finally block.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814251 13f79535-47bb-0310-9956-ffa450edef68
2009-09-12 23:23:49 +00:00
Jacques Le Roux 74320e9555 Fix the 1st point of "Multiple rendering issues in product screens" (https://issues.apache.org/jira/browse/OFBIZ-2597) - OFBIZ-2597
Section "Shipping Dimensions and Weights" in form (for example) "Quick Admin For: Giant Widget variant explosion [ID:WG-9943]" was rendered incorrectly

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814205 13f79535-47bb-0310-9956-ffa450edef68
2009-09-12 17:24:55 +00:00
Jacques Le Roux 6aa251f2e3 A patch from Bharat Soni "TAdd New Address popup of Manage Address page throwing NPE." (https://issues.apache.org/jira/browse/OFBIZ-2931) - OFBIZ-2931
Add New Address popup of Manage Address page in View profile throwing NullPointerException. (JLR : I suppose it's in the one page checkout, not the profile page from the main title bar see Jira issue for more)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814168 13f79535-47bb-0310-9956-ffa450edef68
2009-09-12 15:19:34 +00:00
Vikas Mayur 1a40a74ff1 Markup improvements. Thanks Bharat Soni for implementation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814152 13f79535-47bb-0310-9956-ffa450edef68
2009-09-12 12:08:02 +00:00
Vikas Mayur 7af64543ca Markup improvements. Thanks Rohit Jain for implementation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814146 13f79535-47bb-0310-9956-ffa450edef68
2009-09-12 11:35:00 +00:00
Scott Gray 8b9e1ee822 Fix some compilations errors I introduced, UtilMisc.toMap is nowhere near as much fun as it used to be
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814145 13f79535-47bb-0310-9956-ffa450edef68
2009-09-12 11:20:30 +00:00
Scott Gray 667039c550 Some more incorrect object comparisons
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814142 13f79535-47bb-0310-9956-ffa450edef68
2009-09-12 11:01:29 +00:00
Scott Gray 6b1d67954f Some more incorrect object comparisons
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814139 13f79535-47bb-0310-9956-ffa450edef68
2009-09-12 10:48:09 +00:00
Vikas Mayur 1aabc6eac3 Markup improvements. Thanks Deepak Dixit for implementation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814137 13f79535-47bb-0310-9956-ffa450edef68
2009-09-12 10:44:19 +00:00
Scott Gray ed27de4bfb Fix an incorrect BigDecimal comparison (==)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814135 13f79535-47bb-0310-9956-ffa450edef68
2009-09-12 10:42:31 +00:00
Scott Gray f1907c655c Generics and enhanced for loops
Also came across a static "successMessage" field being used in a non-thread safe manner

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814130 13f79535-47bb-0310-9956-ffa450edef68
2009-09-12 10:19:11 +00:00
Hans Bakker 5235d25459 send email not working on profile contactmech when there was more than one email address
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814116 13f79535-47bb-0310-9956-ffa450edef68
2009-09-12 08:44:21 +00:00
Jacques Le Roux b7a941d4f6 Revert r813307 on Adrian's request
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813893 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 16:02:01 +00:00
Ashish Vijaywargiya cfe95bfde5 HTML cleanup - patch from Sumit Pandit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813831 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 13:51:05 +00:00
Vikas Mayur 447714f706 Misc. improvements. Thanks Deepak Dixit for implementation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813765 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 10:33:19 +00:00
Vikas Mayur ef71735ae5 Fixed the layout of micro cart in ecommerce that was broken a bit with recent markup changes. Thanks Rohit Jain for implementation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813763 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 10:29:20 +00:00
Jacopo Cappellato 1b4bb306bc fixed bug reported by Giorgio Tomaselli: materials' standard costs, if already there, were not refreshed by the auto-create button.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813740 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 09:32:52 +00:00
Jacopo Cappellato ba696afc38 Better Italian translations
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813739 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 09:30:20 +00:00
Jacques Le Roux 00ea03a370 Better French translation (in relation with http://docs.ofbiz.org/display/~mattboll/Dictionary+for+French+translations)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813733 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 09:17:15 +00:00
Ashish Vijaywargiya 32d65bff54 Applied patch from jira issue OFBIZ-2913 - Write a new service for quick create customer profile.
After seeing a discussion in b/w Vikas and Sumit I am committing the previous patch in which there will be new service definition and implementation so further enhancements in SFA service and Party service will remain separate.

Thanks Awdesh, Sumit for the contribution & Vikas for providing useful comments.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813731 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 09:09:08 +00:00
Scott Gray f79b26dd69 increased the ProductFeature.idCode field from id to id-long (20 -> 60) as discussed on the dev list to better handle external identifiers
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813726 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 08:55:17 +00:00
Jacques Le Roux c1f2024e65 A patch from Pradeep Ruhil "This patch is for Improvent in HR module in Global Hr Setting tabs in Paygrade section." (https://issues.apache.org/jira/browse/OFBIZ-2739) - OFBIZ-2739
This issue is that when you select any payGradeId that is already created and then you check the Salary Steps for that payGradeId, it was showing the Salary Steps of all the payGradeId present. So I resolved that issue and now it will display the Salary Step for the selected payGradeId only.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813702 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 07:54:45 +00:00
Jacques Le Roux 3e248b994c A patch from Eric DE MAULDE "Translation error into OrderConfirmNotice screen" (https://issues.apache.org/jira/browse/OFBIZ-2925) - OFBIZ-2925
When OrderConfirmNotice screen call OrderNoticeEmail.ftl orderheader.ftl has some uiLabelMap variable without source to translate
+ a space in OrderUiLabels.xml


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813672 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 06:25:39 +00:00
Hans Bakker 9899efadde added more accounting help files contributed by Sharan OFBIZ-2219
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813657 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 03:17:22 +00:00
Ashish Vijaywargiya c9bb3989f8 Demo Data for Ebay - if we have configuration settings in advance then with the help of this data we can directly test product export to ebay.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813464 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 14:52:07 +00:00
Ashish Vijaywargiya d824f87f4f Initial pass on new call "GetOrders" (More to come in a day or so) - http://developer.ebay.com/DevZone/XML/docs/Reference/eBay/GetOrders.html. OOTB we have "GetSellersTransactions" call implemented but we have observed something strange in its functionality.
Here are few reason for this implementation:
-- In "GetSellersTransactions" itemId(ProductId in ebay) is provided in the OrderHeader.externalId field which doesn't seems correct.
-- Suppose we have Single Order created in eBay if some one wins the auction and in that order we have 3 order items.
Then "GetSellersTransaction" call creates three orders in OFBiz for all those three items that are associated with Single Ebay order.
In short "GetSellersTransaction" request treat three item as three transactions.
-- "GetOrders" call will return the list of orders on the basis of search criteria and then we will create(Import) the Order in OFBiz from the resultant list of orders.
-- Current implementation for "GetSellersTransactions" will remain as it is in trunk - as we don't know if someone might be using it in their custom projects.

Also did miscellaneous cleanup.
Thanks Jacopo for providing your notes for this implementation & also discussing issues in b/w development - as always your notes were awesome.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813444 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 13:58:33 +00:00
Jacopo Cappellato a38f8202aa New util method to find out if a "type" record has a given ancestor.
The method is also used to clean the code related to the two existing marketing package types (that have now in common the same parent).
This will make the framework more flexible because you will be able to create a new product subtype and the system will treat them as its parent type; then you can add custom code to treat it in the special way (if needed). This pattern can be extended in other areas of the system, starting from product types (right now it is also applied to marketing packages).
Thanks to Mridul Pathak for the patch - OFBIZ-2902

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813413 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 13:02:33 +00:00
Vikas Mayur 1e5a3d5a26 markup improvements.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813409 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 12:49:31 +00:00
Ashish Vijaywargiya 8fdc300081 Applied patch from jira issue OFBIZ-2922 - Update Sign up for Contact List (signUpForContactList) service.
Thanks Surya & Sumit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813362 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 10:47:18 +00:00
Jacopo Cappellato 86a3dd0f8a Fixed (hopefully, after a few attempts) issue with " character messing up csv exports.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813360 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 10:40:56 +00:00
Hans Bakker 972b3e8787 restored missing screen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813357 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 10:33:52 +00:00
Hans Bakker 81fef2125b unintended changes reversed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813327 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 09:25:54 +00:00
Jacques Le Roux 9b7ff81cce A bit better (done while looking at a problem on the Paypal Button, see message in user ML)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813316 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 08:55:29 +00:00
Hans Bakker 073906c5df help system now using the mapKey in ContentAssoc so its size is now limited to 100 instead of 20. Suggestion made by Scott: thanks
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813311 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 08:49:30 +00:00
Jacques Le Roux a7430a2fc2 A modified patch from Erwan de FERRIERES '"Automatic" sortable table headers" (https://issues.apache.org/jira/browse/OFBIZ-2921) - OFBIZ-2921
I was planning to wait longer, but I can't wait more. I have added a lot of small trivial changes in this patch and they are blocking me to go further on other issues...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813307 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 08:41:19 +00:00
Anil Patel 7d1177e15d use cache for customtimeperiod and internal org navigation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813290 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 08:04:09 +00:00
Jacques Le Roux 395b30921f A patch from Deepak Dixit "Duplicate specification of attribute "type" for script tag." (https://issues.apache.org/jira/browse/OFBIZ-2924) - OFBIZ-2924
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813283 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 07:56:52 +00:00
Jacopo Cappellato f6aa74a2d9 Misc enhancements to the production run's content display.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813277 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 07:35:09 +00:00
Scott Gray e0f56250cd Remove some random copy paste error
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813263 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 06:53:21 +00:00
Anil Patel 1545812238 Added use of BigDecimal and removed redundant permission check.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813241 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 06:03:31 +00:00
Hans Bakker a238e74d54 should be value, not field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813239 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 05:58:31 +00:00
Scott Gray 2574ff6ac3 Fix rounding issue caused by using an intermediate double while parsing a localized String into a BigDecimal - OFBIZ-2833 reported by Miles Huang
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813232 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 05:17:14 +00:00