Permalink
Commits on Dec 23, 2013
Commits on Dec 21, 2013
  1. Fix a bug reported by Chris Snow at https://issues.apache.org/jira/br…

    JacquesLeRoux committed Dec 21, 2013
    …owse/OFBIZ-2847 for "Create New Inventory Item - user entered Inventory Item Id overwritten with system generated one"
    
    It does not make sense to allow entering an inventoryItemId. It is and must be generated by the system anyway (to prevent collisions)
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1552908 13f79535-47bb-0310-9956-ffa450edef68
  2. From a wrong Christian Carlow's patch for "ShipBeforeDate/ShipAfterDa…

    JacquesLeRoux committed Dec 21, 2013
    …te of additional ship groups displayed incorrectly on shipping options page of Customer Order Entry app" https://issues.apache.org/jira/browse/OFBIZ-5381
    
    ShipBeforeDate/ShipAfterDate of ship groups are displayed incorrectly on the shipping options page of the Customer Order Entry app.  The dates is set correctly but the shipping options page does not get the shipping date by shipGroupIndex.  Instead it gets the shipBeforeDate/shipAfterDate of the order item.  The page should be changed to get the dates by passing in the shipGroupIndex: cart.getShipAfterDate(shipGroupIndex)
    
    To reproduce
    1.  Create new order for DemoCustCompany
    2.  Add productId "GZ-BASKET" with quantity 10
    3.  Click "Finalize Order" link
    4.  Click "Create New Ship Group" button on Shipping page and then click "Continue" link
    5.  Assign 5 of GZ-BASKET to Ship Group 2 and click "Continue" link
    6.  Select shipping methods and set shipBeforeDate/shipAfterDate and click "Continue" link
    7.  Click the "Options" link to return to previous ship options page
    8.  Notice the dates of the second ship group are incorrectly set to the same values as the date of the first ship group
    
    jleroux: Christian's patch was reversed, with his comment I eventually got the idea
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1552901 13f79535-47bb-0310-9956-ffa450edef68
Commits on Dec 20, 2013
  1. Adds a French label (at least have main menus localised) and fixes cr…

    JacquesLeRoux committed Dec 20, 2013
    …ap as expected
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1552674 13f79535-47bb-0310-9956-ffa450edef68
  2. Fixed a (now?) wrong URL (to Eclipse tips in wiki)

    JacquesLeRoux committed Dec 20, 2013
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1552650 13f79535-47bb-0310-9956-ffa450edef68
  3. Fixes a formatting issue, there from long

    JacquesLeRoux committed Dec 20, 2013
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1552500 13f79535-47bb-0310-9956-ffa450edef68
Commits on Dec 19, 2013
  1. Fixed a FreeMarker exception.

    adrian-crum committed Dec 19, 2013
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1552316 13f79535-47bb-0310-9956-ffa450edef68
  2. A slightly modified patch from Praveen Agrawal for "Order Return Proc…

    JacquesLeRoux committed Dec 19, 2013
    …ess doesn't override the Order Adjustment Amount that is provided from Return Screen GUI" https://issues.apache.org/jira/browse/OFBIZ-5439
    
    OFBiz return services (OrderReturnServices.java - createReturnAdjustment) contains a bug when generating the Return Adjustments based on the Order Adjustments.
    The bug is it is ignoring the 'overriding amount' entered on the screen.
    For example If an order has an Shipping Charge Order Adjustment in the amount of 7.95 and from the screen the cleint wants to return only 5.95 (override), the return services ignores the 5.95 entry and returns the full 7.95.
    
    jleroux: I removed a BigDecimal amount declaration which was conflicting
    I formatted the if block
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1552290 13f79535-47bb-0310-9956-ffa450edef68
  3. Even if I don't like much never-ending stacks in logs, this adds a lo…

    JacquesLeRoux committed Dec 19, 2013
    …g error in case the exception would be swallowed (recommended practice)
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1552249 13f79535-47bb-0310-9956-ffa450edef68
Commits on Dec 18, 2013
  1. Fixes an issue where externalKeyParam was not escaped in link so was …

    JacquesLeRoux committed Dec 18, 2013
    …useless (this is only in .ftl files)
    
    Actually the right thing to do should be to work on migrating all freemarker templates in backend to widgets and using target-type="inter-app" for those. I know Adrian has opened a Jira for that, next task in my TODO list. 
    Without this effort we will never be able to style the backend uniformly, notably in custom projects...
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1552149 13f79535-47bb-0310-9956-ffa450edef68
  2. No functional change. As suggested Adrian on dev ML, creates the Atom…

    JacquesLeRoux committed Dec 18, 2013
    …icReference update outside the try-catch block.
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1552120 13f79535-47bb-0310-9956-ffa450edef68
  3. No functional automated changes

    JacquesLeRoux committed Dec 18, 2013
    Add @Override annotations
    Fixes comments indentation
    Removes trailing blanks
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1552077 13f79535-47bb-0310-9956-ffa450edef68
  4. Fixes <<FIXME: Replace DCL code with AtomicReference>>

    JacquesLeRoux committed Dec 18, 2013
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1552073 13f79535-47bb-0310-9956-ffa450edef68
Commits on Dec 17, 2013
  1. A slightly modified patch from Leon for "sequence-bank-size attribute…

    JacquesLeRoux committed Dec 17, 2013
    …s does not work anymore" https://issues.apache.org/jira/browse/OFBIZ-5429
    
    No matter how I set "sequence-bank-size" for an entity (in my example, its "EntityAuditLog"), the bank size is always default value "10".
    It seems that this feature was lost by a serials update of revision 922724 to 922733 submitted by doogie.
    
    jleroux: This thread http://markmail.org/message/ifosqek74gqtv7fz trace the root cause
    Leon's fix is safe from a concurrency perspective. I just added a check on SequenceBank.maxBankSize and put some doc in the XSD
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1551744 13f79535-47bb-0310-9956-ffa450edef68
  2. A slightly modified patch from Pierre Smits for "Improvement of Dutch…

    JacquesLeRoux committed Dec 17, 2013
    … localization in WorkEffortMgr" https://issues.apache.org/jira/browse/OFBIZ-5435
    
    jleroux: Removed few duplicates en labels
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1551609 13f79535-47bb-0310-9956-ffa450edef68
  3. A slightly modified patch from Pierre Smits for "Improvement of Dutch…

    JacquesLeRoux committed Dec 17, 2013
    … localization in PartyMgr" https://issues.apache.org/jira/browse/OFBIZ-5433
    
    jleroux: 
    French label change wrong, removed
    <value xml:lang="fr">OFBiz : Gestionnaire d'acteur</value>
    Removed duplicates en
    <value xml:lang="nl">Team</value>
    <value xml:lang="nl">Account</value>
    <value xml:lang="nl">Project team</value>
    <value xml:lang="nl">Sponsor</value>
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1551605 13f79535-47bb-0310-9956-ffa450edef68
  4. A patch from Pierre Smits for "Improvement of Dutch localization of O…

    JacquesLeRoux committed Dec 17, 2013
    …rderEntityLabels.xml" https://issues.apache.org/jira/browse/OFBIZ-5432
    
    jleroux: the French label change was wrong, removed (forgot in previous commit)
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1551600 13f79535-47bb-0310-9956-ffa450edef68
  5. A slightly modified patch from Pierre Smits for "Improving Dutch loca…

    JacquesLeRoux committed Dec 17, 2013
    …lization of OrderUiLabel.xml" https://issues.apache.org/jira/browse/OFBIZ-5431
    
    jleroux: the French label change was wrong, removed
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1551596 13f79535-47bb-0310-9956-ffa450edef68
  6. Misc. cleaning in labels

    JacquesLeRoux committed Dec 17, 2013
    Removes all empty ones
    Removes some redundant/duplicates ones (please committers don't commit those again, I know it's not easy to catch, hopefully now we should have less of them)
    Automatically replaces some tabs
    Few French labels improvements
    Removes 2 orphan entries ("ja" & "cs")
    Fixes the schema header of WebtoolsUiLabels.xml
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1551594 13f79535-47bb-0310-9956-ffa450edef68
  7. Completed German translation for MarketingUiLabels

    chrisgt committed Dec 17, 2013
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1551585 13f79535-47bb-0310-9956-ffa450edef68
  8. Removes nl labels which are actually duplicates of en.

    JacquesLeRoux committed Dec 17, 2013
    Those were introduced (as wrong C/P I guess) at r732423
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1551460 13f79535-47bb-0310-9956-ffa450edef68
Commits on Dec 16, 2013
  1. No functional changes:

    JacquesLeRoux committed Dec 16, 2013
    Removes all remaining unchecked warnings
    Automatically adds some @Override
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1551207 13f79535-47bb-0310-9956-ffa450edef68
Commits on Dec 13, 2013
  1. Better to have this in another tab or window

    JacquesLeRoux committed Dec 13, 2013
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1550702 13f79535-47bb-0310-9956-ffa450edef68
  2. Better to have this in another tab or window

    JacquesLeRoux committed Dec 13, 2013
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1550690 13f79535-47bb-0310-9956-ffa450edef68
Commits on Dec 12, 2013
  1. I see no reasons to not have expand/collapse all for new product (cre…

    JacquesLeRoux committed Dec 12, 2013
    …ation). I guess it was simply a half-batched C/P from above item, so I will backport to releases (R11.04 is ok)
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1550515 13f79535-47bb-0310-9956-ffa450edef68
  2. Removes blank line

    JacquesLeRoux committed Dec 12, 2013
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1550434 13f79535-47bb-0310-9956-ffa450edef68
  3. No functional change. Removes useless check

    JacquesLeRoux committed Dec 12, 2013
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1550433 13f79535-47bb-0310-9956-ffa450edef68
  4. No functional changes, code improvements

    JacquesLeRoux committed Dec 12, 2013
    Fixes some dead code entries
    Automatically adds some override annotations
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1550429 13f79535-47bb-0310-9956-ffa450edef68
  5. I checked with Pierre this was a wrong C/P from above

    JacquesLeRoux committed Dec 12, 2013
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1550380 13f79535-47bb-0310-9956-ffa450edef68
  6. A patch from Pierre Smits for "Improving Dutch references in Accounti…

    JacquesLeRoux committed Dec 12, 2013
    …ngEntityLabels.xml" https://issues.apache.org/jira/browse/OFBIZ-5407
    
    jleroux: there are also few English labels changes and a new TaxAuthorityRateType.description.EXCISE_TAX labels with much languages
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1550378 13f79535-47bb-0310-9956-ffa450edef68
Commits on Dec 11, 2013
  1. No functional changes

    JacquesLeRoux committed Dec 11, 2013
    This removes a tab introduced with Christian Carlow's patch for "Cancelled ship groups show incorrect quantities on edit order items page" OFBIZ-5405
    It also puts the quantity check box near the quantity to avoid any confusion and modify the related label to clarify (English and French only), incidentally this removes a tab introduced with Thaï labels
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1550258 13f79535-47bb-0310-9956-ffa450edef68
  2. A patch from Christian Carlow for "Cancelled ship groups show incorre…

    JacquesLeRoux committed Dec 11, 2013
    …ct quantities on edit order items page" https://issues.apache.org/jira/browse/OFBIZ-5405
    
    Cancelled ship groups show incorrect quantities on the edit order items page.  I cancelled a ship group with a quantity of 2 for an order item but the quantity was still set to 2 when entering edit mode again.  Because its not set to 0 or blank, all cancelled ship groups must manually be set to one of those values in order for the quantity not to be added back after updating the order items.
    
    This patch resolves the problem. It calculates the ship group quantity with OrderItemShipGroupAssoc.quantity - OrderItemShipGroupAssoc.cancelQuantity in editorderitems.ftl
    
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1550255 13f79535-47bb-0310-9956-ffa450edef68