Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Nov 14, 2013
  1. @JacquesLeRoux

    As discusses on dev ML, changes Eclipse project names for all release…

    JacquesLeRoux authored
    …s branches following this schema: ofbiz-release13.07
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1541895 13f79535-47bb-0310-9956-ffa450edef68
Commits on Aug 11, 2013
  1. @JacquesLeRoux
Commits on Jul 12, 2013
  1. @jacopoc

    Applied fix from trunk for revision: 1500772

    jacopoc authored
    ===
    
    Removed support for runtime nested expressions in FlexibleStringExpander.java.
    
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1502572 13f79535-47bb-0310-9956-ffa450edef68
Commits on Jul 5, 2013
  1. @jacopoc

    Applied fix from trunk for revision: 948387

    jacopoc authored
    ===
    
    Some changes to address issue of conflicting fromDate when expiring one ProductAverageCost record and creating another, this also checks for sub-second difference between old fromDate and new so that this stuff works more reliably on funny databases like MySQL
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1500023 13f79535-47bb-0310-9956-ffa450edef68
Commits on Jun 18, 2013
  1. @JacquesLeRoux

    "Applied fix from trunk for revision: 1494202 "

    JacquesLeRoux authored
    ------------------------------------------------------------------------
    r1494202 | jleroux | 2013-06-18 19:00:37 +0200 (mar., 18 juin 2013) | 2 lines
    
    A patch from Ankit for "Priority field is missing on Add/Edit Project form." https://issues.apache.org/jira/browse/OFBIZ-5230
    
    ------------------------------------------------------------------------
    ?\026
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1494239 13f79535-47bb-0310-9956-ffa450edef68
Commits on Jun 17, 2013
  1. @JacquesLeRoux

    "Applied fix from trunk for revision: 1493683"

    JacquesLeRoux authored
    ------------------------------------------------------------------------
    r1493683 | jleroux | 2013-06-17 10:39:48 +0200 (lun., 17 juin 2013) | 5 lines
    
    A patch from Deepak Dixit for "Row submit not working on Inventory Transfers  screens." https://issues.apache.org/jira/browse/OFBIZ-5228
    
    Row submit not working for "Complete Requested Transfers" flow. It missed the use-row-submit="true"
    
    
    ------------------------------------------------------------------------
    ?\026
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1493688 13f79535-47bb-0310-9956-ffa450edef68
  2. @jacopoc

    Applied fix from trunk for revision: 1493658

    jacopoc authored
    ===
    
    Removed appender-ref reference that I forgot to remove as part of 1489461; thanks to Deepak Dixit for reporting this.
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1493659 13f79535-47bb-0310-9956-ffa450edef68
Commits on Jun 15, 2013
  1. @JacquesLeRoux

    "Applied fix from trunk for revision: 1493393"

    JacquesLeRoux authored
    ------------------------------------------------------------------------
    r1493393 | jleroux | 2013-06-15 18:22:53 +0200 (sam., 15 juin 2013) | 7 lines
    
    A fixing patch from Sergei Biletnikov for "Search orders by good identification" https://issues.apache.org/jira/browse/OFBIZ-5031
    
      currentCarrierShipmentMethod = delegator.findByAnd("CarrierShipmentMethod", [partyId : carrierPartyId, shipmentMethodTypeId : shipmentMethodTypeId], null, false);
    is not correct, the result is the list, so the remedy is simple:
      currentCarrierShipmentMethod = EntityUtil.getFirst(delegator.findByAnd("CarrierShipmentMethod", [partyId : carrierPartyId, shipmentMethodTypeId : shipmentMethodTypeId], null, false));
    
    
    ------------------------------------------------------------------------
    ?\026
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1493394 13f79535-47bb-0310-9956-ffa450edef68
  2. @JacquesLeRoux

    Partially "Applied fix from R12.04 for revision: 1493353" PortalPageW…

    JacquesLeRoux authored
    …orker.java not concerned
    
    ------------------------------------------------------------------------
    r1493352 | jleroux | 2013-06-15 15:40:42 +0200 (sam., 15 juin 2013) | 40 lines
    
    A patch from Olivier Heintz for "Portal page personalization is not working" https://issues.apache.org/jira/browse/OFBIZ-5189
    
    A bug in portal page personalization.
    When trying to delete portlet or column in portal page, there is an error because in delete service, cache is used to read data before remove.
    
    Correction proposed is to remove use-cache="true"
    ------------------------------------------------------------------------
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1493356 13f79535-47bb-0310-9956-ffa450edef68
Commits on Jun 13, 2013
  1. @JacquesLeRoux

    "Applied fix from trunk for revision: 1492673 "

    JacquesLeRoux authored
    ------------------------------------------------------------------------
    r1492673 | jleroux | 2013-06-13 15:52:07 +0200 (jeu., 13 juin 2013) | 11 lines
    
    A patch from Ankit for "No the date fields showning on edit project page." https://issues.apache.org/jira/browse/OFBIZ-5222
    
    No date fields are showing on Edit project page(https://demo-trunk.ofbiz.apache.org:8443/projectmgr/control/EditProject?projectId=10005 create a new project) for the following:
    
    Estimated Start Date
    Estimated Completion Date
    Actual Start Date
    Actual Completion Date
    
    Also on the Project Summary page no dates are showing in Project Information.
    https://demo-trunk.ofbiz.apache.org:8443/projectmgr/control/projectView?projectId=10005
    ------------------------------------------------------------------------
    ?\026
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1492680 13f79535-47bb-0310-9956-ffa450edef68
Commits on Jun 5, 2013
  1. @jacopoc

    Applied fix from trunk for revision: 1489461

    jacopoc authored
    ===
    
    The content rendered in the Webtools "view log" screen is now rendered from the ofbiz.log file rather then the ofbiz.html file in order to provide more control on the html code rendered in the screen.
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1489784 13f79535-47bb-0310-9956-ffa450edef68
Commits on May 31, 2013
  1. @JacquesLeRoux

    Uses Stephen's patch to fix "CheckOutEvents setCheckOutPages" https:/…

    JacquesLeRoux authored
    …/issues.apache.org/jira/browse/OFBIZ-4161
    
    There is an extra check in CheckOutEvents.setCheckOutPages that prevents an error message from being produced when no payment method is selected on the "How shall you pay" step of the checkout process. 
    
    jleroux: and you got redirected to the order entry page, with the patch you stay on the payment method page.
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1488200 13f79535-47bb-0310-9956-ffa450edef68
  2. @JacquesLeRoux

    "Applied fix from trunk for revision: 1488127 "

    JacquesLeRoux authored
    ------------------------------------------------------------------------
    r1488127 | jleroux | 2013-05-31 10:27:48 +0200 (ven., 31 mai 2013) | 10 lines
    
    A patch from Ankit Jain for "User is redirected to showcart page when any error comes on checkout page." https://issues.apache.org/jira/browse/OFBIZ-5206
    
    On checkout page if any error comes it redirects user back to showcart page with an error message.
    Expected : Error should be shown on the same page.
    
    To reproduce the issue,
    Goto OrderEntry -> Add any product to cart -> click on Quick finalize order now select shipping address & shipping method but don't select any payment option and now click on "Continue to Final Order Review" link. You will be redirected to showcart page and with a error message. "Please select a method of payment."
    And expected behaviour is to show the error message on the same checkout page.
    
    
    ------------------------------------------------------------------------
    ?\026
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1488136 13f79535-47bb-0310-9956-ffa450edef68
Commits on May 30, 2013
  1. @JacquesLeRoux

    "Applied fix from trunk for revision: 1487854 "

    JacquesLeRoux authored
    ------------------------------------------------------------------------
    r1487854 | jleroux | 2013-05-30 15:21:28 +0200 (jeu., 30 mai 2013) | 25 lines
    
    A slightly modified patch from Parimal Gain for "Find Order functions - Not working when junk values entered for product Id" https://issues.apache.org/jira/browse/OFBIZ-5201
    
    Problem specification and step -
    1) Go to Order Manager app > Find Orders
    2) Enter valid product id for which order exists
    3) Relevant orders with entered product value would be shown in search results
    4) Enter invalid product id - JUNK value
    5) Error behvaior:All orders on the system would be highlighted 
    6) Actual behavior: No order should be shown as search results, as no order exists with this JUNK product id on system
    
    Observation -
    When looked into code level found that system apply check for two condition -
    1) If passes productId starts or ends with % or * then add that in condition list as it is and it returns all order that contains the word for product Ids.
    2) If the above condition is failed the check if the product corresponding to product id is present or not.
    3) If exists then check for variants (if its virtual)all this.
    4) If product not exists then the action is missing i.e. no condition is added and it returns all order available.
    
    Recommendation -
    There are two ways to solve the issue -
    1) If product corresponding to passes productId is not present then return message to user that order is not present.
    2) If the thought process for current behavior is show all record if product not available then user should get a message as well that "Order is not available for your search product but we have all these order in system" to convey the correct message to user. 
    
    jleroux: The 1st solution is used. I simply added in label that no productId entered would return all the orders, also in French
    
    
    ------------------------------------------------------------------------
    ?\026
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1487867 13f79535-47bb-0310-9956-ffa450edef68
Commits on May 29, 2013
  1. @JacquesLeRoux

    A patch from Stéphane DUCAS for "Pagination in find order screen does…

    JacquesLeRoux authored
    …n't work" https://issues.apache.org/jira/browse/OFBIZ-4332
    
    On find order screen when there is more than 20 orders (default) to display the pagination doesn't work: when the next button is pressed no orders are displayed.
    
    jleroux: There is maybe a better fix, but, since there are no issues in trunk and R12.04, I decided to apply this patch in R11.04 and R10.04 
    
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1487358 13f79535-47bb-0310-9956-ffa450edef68
  2. @JacquesLeRoux

    "Applied fix from trunk for revision: 1487130"

    JacquesLeRoux authored
    ------------------------------------------------------------------------
    r1487130 | jleroux | 2013-05-28 23:31:12 +0200 (mar., 28 mai 2013) | 3 lines
    
    Related to https://issues.apache.org/jira/browse/OFBIZ-4332  "Pagination in find order screen doesn't work (With patch)" but not the real issue which is only for R11.04 and R10.04
    
    This screen did not take into account the widget.form.defaultViewSize properties, here is the needed change
    ------------------------------------------------------------------------
    ?\026
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1487315 13f79535-47bb-0310-9956-ffa450edef68
Commits on May 27, 2013
  1. @JacquesLeRoux

    Backports r1486304,1486310,1486313 from branch 12.04 (wich was merged…

    JacquesLeRoux authored
    … by Adrian from trunk)
    
    r1486304: Backported GenericEntity immutable fixes from the trunk.
    r1486310: Backported entity cache fixes. This commit breaks the rule of no API changes in a release, but I am making an exception here because the methods that were removed should NEVER be used because they GUARANTEE data corruption
    r1486313: Marked some Delegator methods as deprecated because they should not be used
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1486533 13f79535-47bb-0310-9956-ffa450edef68
Commits on May 22, 2013
  1. @JacquesLeRoux

    "Applied fix from trunk for revision: 1485432 " (conflict resolved by…

    JacquesLeRoux authored
    … hand)
    
    ------------------------------------------------------------------------
    r1485432 | jleroux | 2013-05-22 23:29:02 +0200 (mer., 22 mai 2013) | 7 lines
    
    A sligthly modified patch from Jonatan Soto for "ConcurrentModificationException when cancelling an order" https://issues.apache.org/jira/browse/OFBIZ-5194
    
    After the order gets cancelled, there is a loop in OrderView.groovy@122 that removes promotional order line items retrieved from the OrderReadHelper class when cancelled. This is what makes the ConcurrentModificationException to be thrown.
    
    For further details, check out the following thread at the dev mailing list: http://ofbiz.markmail.org/message/vmm65cmbf5hkmqm6?page=2
    
    jleroux: I simply put a comment and removed the useless temporary orderItemListFiltered variable
    ------------------------------------------------------------------------
    ?\026
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1485438 13f79535-47bb-0310-9956-ffa450edef68
Commits on May 13, 2013
  1. @jacopoc
Commits on May 11, 2013
  1. @JacquesLeRoux

    Revert r1481281

    JacquesLeRoux authored
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1481298 13f79535-47bb-0310-9956-ffa450edef68
  2. @JacquesLeRoux

    "Applied fix from trunk for revision: 1481274"

    JacquesLeRoux authored
    ------------------------------------------------------------------------
    r1481274 | jleroux | 2013-05-11 10:52:25 +0200 (sam., 11 mai 2013) | 14 lines
    
    Fix "Name in List Related Contacts form doesn't get updated" reported by Karl Beecher at https://issues.apache.org/jira/browse/OFBIZ-5192
    
    If a person is set as a related contact for a party, updates to their name are not immediately displayed by the ListRelatedContacts form.
    
    To reproduce (with OFBiz demo data):
    * In the Party Manager, go to the profile page of DemoSupplier (they have a related contact called 'Peter Manager'
    * Follow the link to Peter Manager's profile page.
    * Click Update and change the name (e.g. to 'Peter Manageress')
    * Save
    * Return to DemoSupplier's profile page. Observe that the name of the related contact is still 'Peter Manager'. Refreshing doesn't change that.
    * Restart OFBiz
    * Refreshing the profile page now displays the updated name.
    
    jleroux: to test in trunk I used company and scrum employee
    ------------------------------------------------------------------------
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1481281 13f79535-47bb-0310-9956-ffa450edef68
Commits on May 2, 2013
  1. Applied bug fix from trunk r1478499.

    Ashish Vijaywargiya authored
    Applied bug fix from - OFBIZ-5085 - Search result for "Find Communications" does not work. Refer following section from OFBIZ-5085.
    =========================
    And secondly I think that in ListCommEvents form of CommunicationEventForms.xml partyId should be passed in place of the partyIdFrom. As in ViewCommunicationEvent screen, value of the partyIdFrom is set via parameters.partyId.
    =========================
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1478505 13f79535-47bb-0310-9956-ffa450edef68
  2. Applied bug fix from trunk r1426734. For more details please refer ji…

    Ashish Vijaywargiya authored
    …ra issue - https://issues.apache.org/jira/browse/OFBIZ-5073.
    
    My Portal Preferences error:
    Select My Portal > Preferences, displays bellow error.
    org.ofbiz.widget.screen.ScreenRenderException: Error rendering screen component://common/widget/CommonScreens.xml#GlobalDecorator: java.lang.NullPointerException (null)
    Reverting org/ofbiz/widget/WidgetWorker.java previous latest OFBIZ-2628 bug fix, then the problem recovered.
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1478489 13f79535-47bb-0310-9956-ffa450edef68
Commits on Apr 7, 2013
  1. @JacquesLeRoux

    "Applied fix from trunk for revision: 1465351"

    JacquesLeRoux authored
    ------------------------------------------------------------------------
    r1465351 | jleroux | 2013-04-07 11:35:26 +0200 (dim., 07 avr. 2013) | 9 lines
    
    billhuang noticed at https://issues.apache.org/jira/browse/OFBIZ-5172 that "description is incorrect":
    
    int org.ofbiz.base.util.UtilValidate.java file:
        public static final String isMinuteMsg = "The Hour must be a number between 0 and 59.";
        public static final String isSecondMsg = "The Hour must be a number between 0 and 59.";
    should be 
        public static final String isMinuteMsg = "The Minute must be a number between 0 and 59.";
        public static final String isSecondMsg = "The Second must be a number between 0 and 59.";
    
    ------------------------------------------------------------------------
    ?\026
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1465389 13f79535-47bb-0310-9956-ffa450edef68
Commits on Apr 3, 2013
  1. @jacopoc

    Applied fix from trunk for revision: 1463989

    jacopoc authored
    ===
    
    OFBIZ-5167 Applied patch from Leon to fix a wrong array index that was causing the proliferation of subfolders in the runtime/uploads directory.
    
    
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1463997 13f79535-47bb-0310-9956-ffa450edef68
Commits on Mar 31, 2013
  1. @JacquesLeRoux
  2. @JacquesLeRoux

    "Applied fix from trunk for revision: 1462948"

    JacquesLeRoux authored
    ------------------------------------------------------------------------
    r1462948 | jleroux | 2013-03-31 15:41:34 +0200 (dim., 31 mars 2013) | 13 lines
    
    A refactored patch from Leon for "Bug introduced by OFBIZ-4769, it makes <entity-one> failed if the context contains incorrect data" https://issues.apache.org/jira/browse/OFBIZ-5148
    
    How to reproduce:
    1. open "https://demo-trunk.ofbiz.apache.org/partymgr/control/editpartygroup?create_new=Y" (try to create a new party group)
    2. input any words in group name field, input any "incorrect" non-digits characters (e.g. "abcd" blah blah) to field "Annual revenue"
    3. click save
    It leads to an "exception" page instead of original input form with error message.
    
    I digged some codes and found it's related to r1426231 commit (of OFBIZ-4769).
    
    jleroux: the logic of code seemed good to me, I just refactored the cod a bit (in a previous refactoring attempt I missed the point that parametersObjExists might not be present. This new code is a simplified version of what does setAllFields internally. The PK fieldValues are set before being possibly overriden by context values. There is no Map casting. I tested the previous issues, all are resolved. 
    
    
    ------------------------------------------------------------------------
    ?\026
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1462977 13f79535-47bb-0310-9956-ffa450edef68
Commits on Mar 28, 2013
  1. Applied bug fix from trunk r1462257.

    Ashish Vijaywargiya authored
    Applied bug fix from jira issue - OFBIZ-5165 - Broken renderLabel functionality of screenfop view handler. 
    If we use label inside widget tag then renderLabel macro skip the label rendering due to wrong condition check.
    -- Corrected the conditions for label rendering.
    -- Also replaced fo:inline with fo:block as fo:inline can't render directly.
    Thanks Deepak.
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1462264 13f79535-47bb-0310-9956-ffa450edef68
  2. This is very old commit that needs to be committed in RB10.04. Applie…

    Ashish Vijaywargiya authored
    …d fix from trunk r1049650.
    
    Log Message: 
    Moved schedule service to seed-initial file; to stop duplicates when re-loading seed data
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1462253 13f79535-47bb-0310-9956-ffa450edef68
Commits on Mar 27, 2013
  1. @jacopoc

    Applied fix from trunk for revision: 1461551

    jacopoc authored
    ===
    
    OFBIZ-4908 Added missing target attribute from form definition that was preventing the update to work: thanks to Harsha Chadhar for the patch.
    
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1461554 13f79535-47bb-0310-9956-ffa450edef68
Commits on Mar 22, 2013
  1. @JacquesLeRoux

    "Applied fix from trunk for revision: 1459220"

    JacquesLeRoux authored
    ------------------------------------------------------------------------
    r1459220 | mor | 2013-03-21 11:38:28 +0100 (jeu., 21 mars 2013) | 1 line
    
    Slightly different patch to fix the auto save cart functionality for anonymous user reported by Mirko on OFBIZ-5157.
    ------------------------------------------------------------------------
    ?\026
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1459715 13f79535-47bb-0310-9956-ffa450edef68
Commits on Mar 15, 2013
Commits on Mar 12, 2013
  1. Applied bug fix from trunk revision: 1455407

    Ashish Vijaywargiya authored
    Bug Fix: Added check to avoid NPE if result-to-result is true.
    If we set result-to-result true then for some cases actionResult may be empty so it throws an NPE action while executing eca action. Thanks Deepak.
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1455411 13f79535-47bb-0310-9956-ffa450edef68
Commits on Mar 4, 2013
  1. @JacquesLeRoux

    "Applied fix from trunk for revision: 1452382"

    JacquesLeRoux authored
    ------------------------------------------------------------------------
    r1452382 | jleroux | 2013-03-04 17:42:33 +0100 (lun., 04 mars 2013) | 3 lines
    
    A patch from Shi Jinghai "Apply desiredUomId in ProductWorker.getProductWeight" https://issues.apache.org/jira/browse/OFBIZ-5147
    
    In getProductWeight method of applications/product/src/org/ofbiz/product/product/ProductWorker.java, the desiredUomId is not applied when calling convertUom service. I replaced "WT_lb" with desiredUomId.
    ------------------------------------------------------------------------
    ?\026
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1452561 13f79535-47bb-0310-9956-ffa450edef68
Commits on Feb 16, 2013
  1. @JacquesLeRoux

    "Applied fix from trunk for revision: 1446876"

    JacquesLeRoux authored
    ------------------------------------------------------------------------
    r1446876 | jleroux | 2013-02-16 12:54:50 +0100 (sam., 16 févr. 2013) | 4 lines
    
    A patch from Chatree Srichart for "The createDataResourceRole service does not check if partyId exists" https://issues.apache.org/jira/browse/OFBIZ-5133
    
    The createDataResourceRole service has a partyId attribute as optional but its implementation method does not check if the partyId exists before creating a DataResourceRole value.
    The ensurePartyRole service also has a partyId attribute as optional but its implementation method does not check if the partyId exists before creating a PartyRole value.
    ------------------------------------------------------------------------
    ?\026
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1446899 13f79535-47bb-0310-9956-ffa450edef68
Something went wrong with that request. Please try again.