Permalink
Commits on Apr 7, 2010
  1. Fixed some catch clauses.

    adrian-crum committed Apr 7, 2010
Commits on Apr 4, 2010
  1. Synchronized branch with trunk. Sorry for the huge commit - I tried t…

    adrian-crum committed Apr 4, 2010
    …o merge only the folders I was interested in, but there were too many cross-dependencies.
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/executioncontext20091231@930729 13f79535-47bb-0310-9956-ffa450edef68
  2. A patch from Bob Morley (https://issues.apache.org/jira/browse/OFBIZ-…

    adrian-crum committed Apr 4, 2010
    …3593) with modifications from me - fix Eclipse/compiler warnings in the Asset Maintenance application.
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930706 13f79535-47bb-0310-9956-ffa450edef68
  3. Removed double ampersands from autoCompleterTarget, because it was br…

    bibryam committed Apr 4, 2010
    …eaking autocompleters.
    
    Autocompleter code (a third party library) expects only one ampersand and adds the second one itself during ajax call.
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930670 13f79535-47bb-0310-9956-ffa450edef68
  4. Using == is more readable than = for comparisons (even both work the …

    bibryam committed Apr 4, 2010
    …same way in FTLs)
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930666 13f79535-47bb-0310-9956-ffa450edef68
  5. Committed a patch from OFBIZ-3541 "Using Widgets html form templates …

    bibryam committed Apr 4, 2010
    …in FTL files". This change will make autocompleter available also in ftl lookups.
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930660 13f79535-47bb-0310-9956-ffa450edef68
  6. Improved service "createQuoteFromCart" so that it could take Purchase…

    Ashish Vijaywargiya committed Apr 4, 2010
    … order case too for the creation of Quote.
    
    Also done formating in FTL file.
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930630 13f79535-47bb-0310-9956-ffa450edef68
  7. A patch from Bob Morley (https://issues.apache.org/jira/browse/OFBIZ-…

    adrian-crum committed Apr 4, 2010
    …3592) with modifications from me - fix Eclipse/compiler warnings in the Work Effort application.
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930626 13f79535-47bb-0310-9956-ffa450edef68
Commits on Apr 3, 2010
  1. A modified patch from BJ "Tenant login can cause a problem when conta…

    JacquesLeRoux committed Apr 3, 2010
    …cting a delegator" (https://issues.apache.org/jira/browse/OFBIZ-3578) - OFBIZ-3578
    
    If the tenantid has leading/trailing spaces
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930580 13f79535-47bb-0310-9956-ffa450edef68
  2. Remove the presentation="layer" position="center" attributes as at th…

    JacquesLeRoux committed Apr 3, 2010
    …e end they will not be needed as layer will be the default and the default position will finally be topleft. Actually they slipped in and I let them because it was not a problem, but now I prefer to have all consistent and clear.
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930575 13f79535-47bb-0310-9956-ffa450edef68
  3. In the service def. replaced <check-permission> with <permission-serv…

    Vikas Mayur committed Apr 3, 2010
    …ice> tag such that a permission checking is done using a permission
    
    service. Also moved the permission checking logic to service definition.
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930551 13f79535-47bb-0310-9956-ffa450edef68
  4. Improved the content rendering so that multiple levels of decoration …

    lektran committed Apr 3, 2010
    …are supported, previously you could have only one content and it's decorator, anything above that and the contents being decorated would get lost in the rendering logic.
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930544 13f79535-47bb-0310-9956-ffa450edef68
  5. Moved permission checking logic to service definition. This commit al…

    Vikas Mayur committed Apr 3, 2010
    …so fix a bad security permission check on updateQuantityBreak and
    
    deleteQuantityBreak services.
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930543 13f79535-47bb-0310-9956-ffa450edef68
  6. Moved permission checking logic to service definition. Applied applic…

    Vikas Mayur committed Apr 3, 2010
    …ations only part of my patch
    
    from jira issue OFBIZ-3632 (https://issues.apache.org/jira/browse/OFBIZ-3632)
    
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930537 13f79535-47bb-0310-9956-ffa450edef68
  7. Extending the <required-permissions> tag in service model such that i…

    Vikas Mayur committed Apr 3, 2010
    …t can contain one or more occurrence of <permission-service> tag.
    
    This is helpful when there is a need to check more then one permission using a permission service.
    
    Applied framework only part from my patch from jira issue OFBIZ-3632 (https://issues.apache.org/jira/browse/OFBIZ-3632)
    
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930536 13f79535-47bb-0310-9956-ffa450edef68
  8. A modified patch (indentation done mostly) from Blas Rodriguez Somoza…

    JacquesLeRoux committed Apr 3, 2010
    … "XHTML validation errors (framework/widget) Tree widget and Date time field rendering issues" https://issues.apache.org/jira/browse/OFBIZ-3628 - OFBIZ-3628
    
    htmlTreeMacroLibrary.ftl
    Tree widget renders unclosed <li> tags.
    Example from Accounting -> Global GL settings -> Navigate accounts
    <ul class="basic-tree">
    <li><ul class="basic-tree">
    <li>
    <li><a class="collapsed" href="/accounting/control/GlAccountNavigate?trail=null|100000"> </a><a href="/accounting/control/GlAccountNavigate?glAccountId=100000&trail=null">100000
    
    htmlFormMacroLibrary (macro renderDateTimeField)
    selected attribute without value
    <option value="AM" selected>
    input inside ul
    <ul>
    ......
    <input type="hidden" name="${compositeType}" value="Timestamp"/>
    </ul>
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930516 13f79535-47bb-0310-9956-ffa450edef68
  9. Fixed a potential NPE since ProductStore.storeName is an optional field.

    Vikas Mayur committed Apr 3, 2010
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930507 13f79535-47bb-0310-9956-ffa450edef68
  10. Specifying the decorator screen location. By defining a location para…

    Vikas Mayur committed Apr 3, 2010
    …m in your own web.xml the OOTB decorator in the screens can easily be overridden by a custom decorator.
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930486 13f79535-47bb-0310-9956-ffa450edef68
  11. Following on from r930477, removed another reference to currency for …

    lektran committed Apr 3, 2010
    …EditProduct's quantityUomId field. Thanks for the report Jacopo.
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930481 13f79535-47bb-0310-9956-ffa450edef68
  12. EditProduct's quantityUomId drop down should display all UomTypes exc…

    lektran committed Apr 3, 2010
    …ept CURRENCY_MEASURE, bug reported by Len Shein on the user list
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930477 13f79535-47bb-0310-9956-ffa450edef68
  13. Added run-install-multitenant ant target to make it easier to set up …

    adrian-crum committed Apr 3, 2010
    …the multi-tenancy demo.
    
    Caution: this creates three databases, with each one loaded with all demo data. Be aware of disk space use and the time required to run the task.
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930471 13f79535-47bb-0310-9956-ffa450edef68
Commits on Apr 2, 2010
  1. Improve getAttribute() method on ShoppingCart and CartShipInfo, so that

    eigood committed Apr 2, 2010
    calling code doesn't have to cast.
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930407 13f79535-47bb-0310-9956-ffa450edef68
  2. Switch the attributes instance variable to FastMap.

    eigood committed Apr 2, 2010
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930406 13f79535-47bb-0310-9956-ffa450edef68
  3. Add generics markup to orderAttributes. Baby steps.

    eigood committed Apr 2, 2010
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930404 13f79535-47bb-0310-9956-ffa450edef68
  4. A patch from Bob Morley "Resolve java warnings exposed in Eclipse (PO…

    JacquesLeRoux committed Apr 2, 2010
    …S part of OFBIZ-3100)" https://issues.apache.org/jira/browse/OFBIZ-3600 - OFBIZ-3600
    
    Changes across quite a few classes in the Pos area. Also minor changes to the CheckoutHelper - validatePaymentMethods and processPayment methods which were returning non-generic Maps.
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930373 13f79535-47bb-0310-9956-ffa450edef68
  5. Fix bad transaction pattern introduced with 927256.

    eigood committed Apr 2, 2010
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930332 13f79535-47bb-0310-9956-ffa450edef68
  6. Add support to loadCartFromOrder for reading of the OrderItemShipGroup

    eigood committed Apr 2, 2010
    information from the database.
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930325 13f79535-47bb-0310-9956-ffa450edef68
  7. Add a feature to loadCartFromOrder to allow it to include promo items

    eigood committed Apr 2, 2010
    into the cart, as they are read from the database.  This is useful when
    the cart will eventually be used in a read-only type fashion, as the
    cart will look identical to what it was before the order was created.
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930324 13f79535-47bb-0310-9956-ffa450edef68
  8. Don't constantly convert the internal ShoppingCartItemGroup.groupNumber

    eigood committed Apr 2, 2010
    from an int to a String; instead, do the conversion once inside the
    constructor.
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930322 13f79535-47bb-0310-9956-ffa450edef68