Commit Graph
14842 Commits
Author SHA1 Message Date
Erwan de Ferrieres c2ecf31559 A slighty modified patch from Chris Snow "Field description tooltips show key if help text is not found" OFBIZ-3749
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941261 13f79535-47bb-0310-9956-ffa450edef68
2010-05-05 11:53:06 +00:00
Scott Gray 87d4de1711 Missed one of the calls to the now deprecated methods. Removed a couple of unnecessary casts while I was at it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941205 13f79535-47bb-0310-9956-ffa450edef68
2010-05-05 08:51:07 +00:00
Jacques Le Roux 3bd4de035d Fix a bug reported by Sharan on user ML: wrong name for the lookup
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941199 13f79535-47bb-0310-9956-ffa450edef68
2010-05-05 08:33:55 +00:00
Scott Gray 2ed23a85e6 ModelMenu objects were being instantiated with (and then keeping references to) Delegator and LocalDispatcher objects. Obviously not ideal for multi-tenanting and the like.
To fix:
- Deprecated the ModelMenu constructor and replaced it with one that doesn't take a delegator/dispatcher
- Removed ModelMenu's dispatcher/delegator fields and deprecated the get methods for them
- Took the getDispatcher and getDelegator methods from ModelForm and pushed them down to ModelWidget so that they can be used by ModelMenu as well
- Deprecated the MenuFactory methods that take delegator/dispatcher and replaced them with ones that don't
- Altered any code that was using the newly deprecated methods

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941181 13f79535-47bb-0310-9956-ffa450edef68
2010-05-05 07:17:12 +00:00
Scott Gray 549302a5de Remove a couple of unnecessary casts
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941178 13f79535-47bb-0310-9956-ffa450edef68
2010-05-05 07:16:55 +00:00
Scott Gray 586cba41d6 Update the .classpath file so Eclipse can build again
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941177 13f79535-47bb-0310-9956-ffa450edef68
2010-05-05 07:16:44 +00:00
Scott Gray 94bc3f63ca Put the null check a little higher so that it actually does the check before an NPE can occur. Giving up on this transform, I hate the content component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941139 13f79535-47bb-0310-9956-ffa450edef68
2010-05-05 02:25:26 +00:00
Hans Bakker 9a39192005 Create a payment with the status 'not-paid' when a purchase order is approved setting the payment date according agreements
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941132 13f79535-47bb-0310-9956-ffa450edef68
2010-05-05 01:43:45 +00:00
Scott Gray 8bc1d451e0 Document the list of transform arguments (no idea what they do at the moment
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941130 13f79535-47bb-0310-9956-ffa450edef68
2010-05-05 01:13:58 +00:00
Scott Gray 5f0606e67f Rearrange some local variables in the hope of making things more readable
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941129 13f79535-47bb-0310-9956-ffa450edef68
2010-05-05 01:13:47 +00:00
Scott Gray 7f6d3ade75 Replace the copy/paste class description with a description I found in an old commit log
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941126 13f79535-47bb-0310-9956-ffa450edef68
2010-05-05 00:46:45 +00:00
Scott Gray f3855603ac Remove unused methods ahead of trying to figure out what the hell the transform does.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941119 13f79535-47bb-0310-9956-ffa450edef68
2010-05-05 00:17:17 +00:00
Adam Heath ca984e8550 Add reading of promo use and promo code from the database into the
shopping cart.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941109 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 23:44:35 +00:00
Adam Heath 667a49572e Fix cut and paste error with last commit, s/equal(/equals(/
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941107 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 23:44:24 +00:00
Adam Heath 80389b8cf4 Add flag to ProductPromoAction, that tells PROMO_GWP to use all
available item quantities as the new GWP quantity.  This requires the
quantity field to be null, and useCartQuantity to be 'Y'.  This allows
insanely huge quantities to be used on items that have GWP promos
attached.  Under testing, I've added products with a quantity of 10000
and 50000 items, with no variation in speed.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941048 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 21:19:41 +00:00
Adam Heath aa053eb1ae Add some caching to a few delegator calls, a few cases during the
loading of survey data were always hitting the database.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941047 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 21:19:28 +00:00
Erwan de Ferrieres 5243fd5b0b Small corrections on french uilabels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941017 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 19:59:27 +00:00
Erwan de Ferrieres fba12467f8 setting evalscripts to true so lookups can work in portal pages
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941014 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 19:52:55 +00:00
Erwan de Ferrieres 585db14ada Update on r938816 to make portals menus work again
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941007 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 19:44:05 +00:00
Erwan de Ferrieres 8b13942c6f juli-adapters are not used with Tomcat 6.0.26
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941006 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 19:32:38 +00:00
Anil Patel a34320fce3 Commenting debug message. Does not add much value.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940985 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 17:58:04 +00:00
Vikas Mayur 2527bf0faa No functional change. Only formatting changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940858 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 13:56:19 +00:00
Vikas Mayur 4823a5d9ed Fixed the description about input attribute on createInvoiceFromReturn service.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940853 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 13:41:23 +00:00
Vikas Mayur b3fdbfb95c Fixed a bug in vendor return. The service getReturnableItems returns a map containing the returable quantity corresponding to an item along with
certain other things. Earlier this service was returning an empty map for a purchase order and a vendor return. On order detail page action 
block there is a check on this map and if the map comes out to be empty the system does not show the options to create return for the 
purchase order. Similary if you create a vendor return directly from the Return Header screen and try to add items on the Return Item screen
using an order Id, this display a message "No returnable items found for order" 

Also the method sendItemsShipped in the service sendGoogleShipRequest was throwing a NPE because the code try to pull a product through
ItemIssuance > OrderItem > Product

In the vendor return of type refund the items are issued to the return shipment and a purchase return invoice is generated and hence the process
is not linked to any Order. Adding a condition on the ECA so that this service is not invoked.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940851 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 13:35:19 +00:00
Jacques Le Roux be5dce281e Fix a non visible NPE
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940849 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 13:32:21 +00:00
Jacques Le Roux 28bb8e6684 Forgot this one at r940410
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940815 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 12:01:23 +00:00
Ashish Vijaywargiya db765efdd2 Reverting my commit r938446 based on the comments received on mailing list. For now I am keeping old email address in place (i.e ofbiztest@yahoo.com) keeping in mind that email will not go in spam folder. If others think test@example.com will also behave same then please go ahead commit the changes.
Very soon I will revert my changes on release10.04 branch.
Thanks to everybody who has provided their comments!  

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940814 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 11:57:35 +00:00
Hans Bakker b63f00d516 be able to enter a shipping extimate per shipping group on purchase order entry
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940803 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 11:00:44 +00:00
Jacques Le Roux 5a5956d467 A patch from Atul Vani "No Message for duplicate login name" https://issues.apache.org/jira/browse/OFBIZ-3468 - OFBIZ-3468
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940779 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 09:07:19 +00:00
Adrian Crum 043c15ee63 Removed deprecated temporal expression class.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940559 13f79535-47bb-0310-9956-ffa450edef68
2010-05-03 18:30:02 +00:00
Vikas Mayur 51fb47bee0 Fixed a relationship type on FixedAsset entity.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940430 13f79535-47bb-0310-9956-ffa450edef68
2010-05-03 12:21:37 +00:00
Jacques Le Roux 01d9292c72 A patch from Sascha Rodekamp "Missing Buttons on LookUp Search" (https://issues.apache.org/jira/browse/OFBIZ-3745) - OFBIZ-3745
This fixes the calendar issue in bluelight and remove the (X) button that broke the calendar layout (strangely was only from layered lookups)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940425 13f79535-47bb-0310-9956-ffa450edef68
2010-05-03 12:06:02 +00:00
Vikas Mayur 164ce63c94 Removed a comment on vendor return support. The support actually exists for last 20 months. For more details please refer
to jira issue OFBIZ-1893 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940411 13f79535-47bb-0310-9956-ffa450edef68
2010-05-03 10:39:27 +00:00
Jacques Le Roux df40275120 A completed patch from Sascha Rodekamp "Lookup Layer Search of a Varient Product" (https://issues.apache.org/jira/browse/OFBIZ-3746) - OFBIZ-3746
Fix the variant issue in product lookups
Remove the temporary window presentation workaround (done at r939232)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940410 13f79535-47bb-0310-9956-ffa450edef68
2010-05-03 10:37:33 +00:00
Jacques Le Roux dd11ac1b1a A patch from Ankit Jain "Allow to open a layer lookup from a layer lookup" https://issues.apache.org/jira/browse/OFBIZ-3446 - OFBIZ-3446
Uncomment the line to return the name in the calling screen

I have also added groupName in the name returned (when looking for  partyGroup)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940401 13f79535-47bb-0310-9956-ffa450edef68
2010-05-03 09:10:49 +00:00
Jacques Le Roux bc012f02ae A patch from Ankit Jain "Allow to open a layer lookup from a layer lookup" https://issues.apache.org/jira/browse/OFBIZ-3446 - OFBIZ-3446
It does not hurt but I'm not quite sure it fix anything actually

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940309 13f79535-47bb-0310-9956-ffa450edef68
2010-05-02 19:26:48 +00:00
Bilgin Ismet Ibryam 0c28946a40 Moved autocompleter indicator creation to javascript.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940274 13f79535-47bb-0310-9956-ffa450edef68
2010-05-02 17:44:01 +00:00
Jacques Le Roux 465213125f Temporary workaround to fix an issue in the lookup in lookup Example
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940248 13f79535-47bb-0310-9956-ffa450edef68
2010-05-02 15:48:53 +00:00
Adrian Crum 2f3e21e31b Fixed a problem with the Ajax auto-completer code. Empty src attribute in an img element causes some browsers to load the page more than once.
Many thanks to Scott for pointing me in the right direction.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940245 13f79535-47bb-0310-9956-ffa450edef68
2010-05-02 15:10:36 +00:00
Jacques Le Roux 4891c2f0cd A modified patch from Sascha Rodekamp "Missing Buttons on LookUp Search" (https://issues.apache.org/jira/browse/OFBIZ-3745) - OFBIZ-3745
For the pagination issue in bluelight and droppingcrumbs, the calendar issue in bluelight still exists
I have also added 2 lookup and calendar test fields in the 2d lookups.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940234 13f79535-47bb-0310-9956-ffa450edef68
2010-05-02 14:15:34 +00:00
Erwan de Ferrieres 2bf9b537e5 Removing non-seed portal names
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940059 13f79535-47bb-0310-9956-ffa450edef68
2010-05-01 15:45:22 +00:00
Erwan de Ferrieres 8a2fe83488 This file was misssing for using the new portals screens, will also be added to release10.04
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940053 13f79535-47bb-0310-9956-ffa450edef68
2010-05-01 15:09:16 +00:00
Jacques Le Roux 88806e9dc4 Another issue with a layered lookup I forgot to commit, bypassed for now using a popup
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940025 13f79535-47bb-0310-9956-ffa450edef68
2010-05-01 14:01:50 +00:00
Jacques Le Roux 8f11d470b9 Some other issues with layered lookups, bypassed for now using popups
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@939999 13f79535-47bb-0310-9956-ffa450edef68
2010-05-01 12:43:34 +00:00
Jacques Le Roux 03edb6250c ChartOfAccountsEntityLabelsdoes not exist yet and his blocking LookupGlAccount.
Try it at https://demo-trunk.ofbiz.apache.org/accounting/control/EditTaxAuthorityGlAccounts?taxAuthPartyId=_NA_&taxAuthGeoId=_NA_

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@939990 13f79535-47bb-0310-9956-ffa450edef68
2010-05-01 12:16:17 +00:00
Jacques Le Roux e8ebd0a1b2 This lookup does not exist, is there for a long time? (I did not find its date of introduction, the older I found is r615322) and I can't see anything close
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@939988 13f79535-47bb-0310-9956-ffa450edef68
2010-05-01 12:07:08 +00:00
Scott Gray 839e98de6a Fix problem where inlined simple map processors weren't being given the locale correctly, reported by Saad Hage on the user list
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@939966 13f79535-47bb-0310-9956-ffa450edef68
2010-05-01 10:07:41 +00:00
Bruno Busco ea1a5dbe67 A patch from Blas Rodriguez Somoza
OFBIZ-3701 - Errors (with visible stacktraces) in screen: Order -> Order List -> Select (a sales order) -> Edit items
https://issues.apache.org/jira/browse/OFBIZ-3701
Fixed two errors in "edit items" from a sales order with visible stacktraces
Error 1 - Expression orderItemStatus.statusDatetime is undefined on line 133, column 37 in component://order/webapp/ordermgr/order/editorderitems.ftl
Error 2 - Expression catalogCol is undefined on line 37, column 18 in component://order/webapp/ordermgr/order/appendorderitem.ftl.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@939938 13f79535-47bb-0310-9956-ffa450edef68
2010-05-01 07:12:21 +00:00
Vikas Mayur b0f17cbd77 I think it would be a good idea to show Category Name instead of Category description. The chances are that the former
would be present in most of the cases. This fix an issue with the quick add feature on order manager where the drop for 
quick add categories wasn't showing any thing because the description is not present on the quick add categories. This 
eventually fixes the same issue in the ecommerce because the ecommerce inherits this feature from order manager.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@939937 13f79535-47bb-0310-9956-ffa450edef68
2010-05-01 07:04:06 +00:00
Adrian Crum ed0e37d5c3 Turn off noisy logging.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@939896 13f79535-47bb-0310-9956-ffa450edef68
2010-05-01 01:32:01 +00:00