Permalink
Commits on Feb 4, 2014
  1. Merges trunk HEAD

    JacquesLeRoux committed Feb 4, 2014
Commits on Feb 3, 2014
  1. When I replaced the deprecated findByPrimaryKey by a finByOne I forgo…

    JacquesLeRoux committed Feb 3, 2014
    …t to put a catch around, this fixes it.
    
    Also removed an useless logError, ServiceUtil.returnError will take care of it
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1564113 13f79535-47bb-0310-9956-ffa450edef68
  2. A (slightly modified) patch from Ritu Raj Lakhera for "Order return i…

    JacquesLeRoux committed Feb 3, 2014
    …s not refunding the money" https://issues.apache.org/jira/browse/OFBIZ-5528
    
    When we placed an order with two items and generate a return towards one item then code is refunding the money correctly.
    But if we again do return for second item then code is not refunding the money because first return-refund process has changed the status of OrderPaymentPreference from 'PAYMENT_SETTLED' to ‘PAYMENT_REFUNDED’.
    I think We should create the new OrderPaymentPreference with PAYMENT_REFUNDED status against old OrderPaymentPreference of 'PAYMENT_SETTLED' status at the time of return-refund process. So second return can also refund the money.
    
    In other words we should create the new OrderPaymentPreference for each refund amount as we are doing with Payment entity(processRefundResult PaymentGatewayServices.java).
    
    jleroux: I 
    * replaced the deprecated findByPrimaryKey by a finByOne
    * replaced Exception GenericServiceException in catch (as it was before)
    * reformatted some parts 
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1564111 13f79535-47bb-0310-9956-ffa450edef68
  3. Closes "Help screens in Manufacturing" https://issues.apache.org/jira…

    JacquesLeRoux committed Feb 3, 2014
    …/browse/OFBIZ-4802
    
    This simply follows "HELP_OFBizDocumentationSystem.xml" i18n directives which have been overlooked so far. Of course having all i18n files in the same folder is not very convenient, but at least it works. This files organisation could be reconsidered, I'd need more work...
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1563958 13f79535-47bb-0310-9956-ffa450edef68
  4. Fixes a typo

    JacquesLeRoux committed Feb 3, 2014
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1563949 13f79535-47bb-0310-9956-ffa450edef68
  5. makes explicit required fields

    JacquesLeRoux committed Feb 3, 2014
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1563832 13f79535-47bb-0310-9956-ffa450edef68
  6. Updates jQuery to 1.11.0

    JacquesLeRoux committed Feb 3, 2014
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1563799 13f79535-47bb-0310-9956-ffa450edef68
Commits on Feb 2, 2014
  1. A patch from Christian Carlow for "Mandatory and dependent production…

    JacquesLeRoux committed Feb 2, 2014
    … run links don't navigate to corresponding production run page when clicked" https://issues.apache.org/jira/browse/OFBIZ-5502
    
    When clicking the links associated with madatory or dependent production runs, the corresponding production run page is not loaded. This means its required to go back to the production run search page and lookup the productionRunId manually. I think the links should load the corresponding production run page when clicked.
    
    This simple patch resolves the problem. The <hyperlink> elements in the form widget needed the "link-type" attribute set to "anchor" otherwise it defaults to creating a link that submits a form that automatically sets the productionRunId to the current production run workEffortId which causes this issue.
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1563683 13f79535-47bb-0310-9956-ffa450edef68
Commits on Feb 1, 2014
  1. Put a warning about the version automatically downloaded by Ivy for a…

    JacquesLeRoux committed Feb 1, 2014
    …ctivemq, postgres and mySQL jdbc drivers
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1563406 13f79535-47bb-0310-9956-ffa450edef68
Commits on Jan 31, 2014
  1. Workaround for "Lookups (layered mode) and dropdown menus overlap" (i…

    JacquesLeRoux committed Jan 31, 2014
    …n BizznessTime Theme) https://issues.apache.org/jira/browse/OFBIZ-5519
    
    A good example is in order creation page, open the customer lookup and then try to close it.
    
    I think we should not fiddle with the theme, there is a faster and easier solution: center all lookups in the screen by default. It will not fix but hide the issue for now. Anyway the awful dropdown menu behaviour must be fixed and i will open another Jira for that.
    
    You may ask why I'm concerned with a theme which is no longer bundled in future releases? It's because some custom projects still use it...
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1563238 13f79535-47bb-0310-9956-ffa450edef68
Commits on Jan 30, 2014
  1. Closes https://issues.apache.org/jira/browse/OFBIZ-5521 as not a problem

    JacquesLeRoux committed Jan 30, 2014
    It was my bad, I was simply stupid on this, reverts r1519245
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1562767 13f79535-47bb-0310-9956-ffa450edef68
Commits on Jan 29, 2014
  1. This can be removed, the same is done in renderLookupField macro in h…

    JacquesLeRoux committed Jan 29, 2014
    …tmlFormMacroLibrary.ftl which is included above and called just below
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1562401 13f79535-47bb-0310-9956-ffa450edef68
Commits on Jan 28, 2014
  1. Since I have no news from Olivier about this effort, I decided to kee…

    JacquesLeRoux committed Jan 28, 2014
    …p the branch up to date by merging trunk HEAD.
    
    This is not only in memory of Tom, I believe it's an interesting feature, the current embedded help is crappy...
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/webhelp-2012-12-07@1562048 13f79535-47bb-0310-9956-ffa450edef68
Commits on Jan 27, 2014
  1. Some minor simplifications to ComponentContainer: removed some unnece…

    jacopoc committed Jan 27, 2014
    …ssary overloaded methods.
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1561757 13f79535-47bb-0310-9956-ffa450edef68
  2. Fixed typos.

    jacopoc committed Jan 27, 2014
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1561750 13f79535-47bb-0310-9956-ffa450edef68
Commits on Jan 26, 2014
  1. A fix for https://issues.apache.org/jira/browse/OFBIZ-5516, when addi…

    JacquesLeRoux committed Jan 26, 2014
    …ng a product to a category the from date field was not shown as required
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1561467 13f79535-47bb-0310-9956-ffa450edef68
Commits on Jan 25, 2014
  1. A Christian Carlow's patch for "ProductionRunServices.productionRunTa…

    JacquesLeRoux committed Jan 25, 2014
    …skReturnMaterial: Unknown parameter found: [productionRunTaskProduce.uomId]" https://issues.apache.org/jira/browse/OFBIZ-5506
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1561327 13f79535-47bb-0310-9956-ffa450edef68
  2. A Christian Carlow's patch for "EditEmplPositionReportingStructs Look…

    JacquesLeRoux committed Jan 25, 2014
    …upEmplPosition associated popup and dropdown empty" https://issues.apache.org/jira/browse/OFBIZ-5510
    
    LookupEmplPosition drop-down and popup window show no results on the EditEmplPositionReportingStructs page for the field.
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1561305 13f79535-47bb-0310-9956-ffa450edef68
  3. A (slightly enhanced) patch from Christian Carlow for "EditEmplPositi…

    JacquesLeRoux committed Jan 25, 2014
    …on form widget missing Internal Org drop down and title incorrect" https://issues.apache.org/jira/browse/OFBIZ-5509
    
    EditEmplPosition shows a partyId field as a text box instead of a <select> drop down that lists the internal orgs.  The field title should also be set to Internal Org instead of PartyId for consistency.
    
    jleroux: while at it I added a tooltip
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1561286 13f79535-47bb-0310-9956-ffa450edef68
Commits on Jan 23, 2014
  1. A patch from Justen Walker for "Missing import in FindGeneric.groovy" h…

    JacquesLeRoux committed Jan 23, 2014
    …ttps://issues.apache.org/jira/browse/OFBIZ-5504
    
    Revision 1560176 introduces a change to FindGeneric.groovy that extracts some logic into UtilMisc. However, this class is not imported in the file and results in a MissingProperty exception.
    This patch adds the import statement which resolves this bug.
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1560699 13f79535-47bb-0310-9956-ffa450edef68
Commits on Jan 22, 2014
  1. Somehow, though I put it in the comment, I missed to commit that at r…

    JacquesLeRoux committed Jan 22, 2014
    …1559769
    
    Comment was
    >Flat Grey application.js
    >    moves jQuery(document).ready(function() at bottom (spotted in Chrome console)
    
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1560276 13f79535-47bb-0310-9956-ffa450edef68
Commits on Jan 21, 2014
  1. A patch from Simon Maskell for "Fixed Asset Depreciation Method missi…

    JacquesLeRoux committed Jan 21, 2014
    …ng list-name from form ListFixedAssetDepMethods in FixedAssetForm" https://issues.apache.org/jira/browse/OFBIZ-5499
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1560205 13f79535-47bb-0310-9956-ffa450edef68
  2. Fixed a FreeMarker exception.

    adrian-crum committed Jan 21, 2014
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1560203 13f79535-47bb-0310-9956-ffa450edef68
  3. A patch from Gareth Carter for "last index for paging is not calculat…

    JacquesLeRoux committed Jan 21, 2014
    …ed correctly" https://issues.apache.org/jira/browse/OFBIZ-5497
    
    The last index (used on the last button) is not calculated correctly in ftl or the renderer classes. It currently users floor which works only for list sizes that are not multiples of the view size. When you have a list size which is a multiple of the view size, it does not subtract 1 for zero based index and therefore the last button goes to the last page + 1
    
    Examples
    
    listSize = 1
    viewSize = 10
    listSize / viewSize = 0.1
    floor(0.1) = 0
    This one produces the correct value
    
    listSize = 20
    viewSize = 10
    listSize / viewSize = 2
    floor(2) = 2
    Last index should be 1 because of zero based index but never occurs
    
    To reproduce, enter a view with a list and paging functionality, the list size must be a multiple of the view size
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1560176 13f79535-47bb-0310-9956-ffa450edef68
  4. Some Freemarker bug fixes.

    adrian-crum committed Jan 21, 2014
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1560056 13f79535-47bb-0310-9956-ffa450edef68
  5. Order view NPE bug fix. Don't assume a product store has a related fa…

    adrian-crum committed Jan 21, 2014
    …cility.
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1560048 13f79535-47bb-0310-9956-ffa450edef68
  6. Better French label

    JacquesLeRoux committed Jan 21, 2014
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1559997 13f79535-47bb-0310-9956-ffa450edef68
Commits on Jan 20, 2014
  1. A patch from Michael Ende for "SimpleMethod parameters doesnt work wi…

    JacquesLeRoux committed Jan 20, 2014
    …th prefix" https://issues.apache.org/jira/browse/OFBIZ-5371
    
    I experienced some problems when a form submitted parameters with prefix directly to a SimpleMethod (through the controller request). 
    In this case the prefix is not stripped from the parameter name. The patch updates the method ModelService.java:makePrefixMap().
    
    The idea of the prefixMap is: 
    If you have some fields like packageweight_1(value=55), packageweight_2(value=65) ... in a form and in a service you need a map called packageweight with the following key values 
    
    packageweight{1=55;2=56;...}
    
    The Problem is that the function makePrefixMap doesn't replace the Prefix.
    
    For Example:
    On the "Complete" button of the Facility->Shipment screen we call an event and not the completePack service directly.
    The event checks some user rights and after that he call the completePack service. If we call the service from an event there throws an NumberFormatException because the packeweight-PrefixMap contains the prefixes.
    
    This is my event description:
     <simple-method method-name="completePackCheckPermission"
            short-description="Check if this user has permission to create a picklist role"
            login-required="true">
            <check-permission permission="LOGISTICS_CREATE">
                <alt-permission permission="LOGISTICS_ADMIN"/>
                <fail-property resource="EcommerceLogisticsErrorUiLabels" property="NoPermissionForUsage" />
            </check-permission>
            <check-errors />
    
            <session-to-field field="packingSession"/>
            <set field="parameters.packingSession" from-field="packingSession"/>
    
            <set-service-fields service-name="completePack" to-map="serviceParameters"
                map="parameters" />
            <call-service service-name="completePack" in-map-name="serviceParameters" />
            <return />
        </simple-method>
    
    jleroux: I'm not quite sure there are no side-effects, but I was not able to find one. So I will wait some time before backporting...
    
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1559814 13f79535-47bb-0310-9956-ffa450edef68
  2. This is a major update of jQuery and related, it contains:

    JacquesLeRoux committed Jan 20, 2014
        jquery-1.8.2 to jquery-1.10.2 which implies using jquery-migrate-1.2.1 for plugins compatiblities
        jquery-ui-timepicker-addon-1.0.5 to jquery-ui-timepicker-addon-1.4.3 (using min now, better i18n)
        jquery-ui-1.9.0 to jquery-ui-1.10.3
        removes jquery.ui.datepicker.js now integrated in jquery.ui
        jquery.hotkeys-0.7.9 to jquery.hotkeys-0.8
        jquery.maskedinput-1.2.2 to jquery.maskedinput-1.3.1
        jquery.validate 1.10.0 to 1.11.1 
            I never realised how much efforts have been put in this plugin!  
            I fixed an issue in JsLanguageFilesMapping generation
            I removed the messages_ptbr.js and messages_ptpt.js files and the related conundrum in JsLanguageFileMappingCreator.java
            untested, found not use cases OOTB
        jquery.jcarousel ?(2006) to 0.3.0 (2013)
            untested, found not use cases OOTB
        jquery.flot 0.7 to 0.8.2 (lot of changes, still works)
            removes useless flotpie.ftl 
            removes empty flotr folder
        jquery.mobile-1.1.0-rc.1 to jquery.mobile-1.4.0
            untested, found not use cases OOTB
        jquery.cookie to jquery.cookie-1.4.0    
    
    
    Removes all useless/redundant js files (not only jQuery unused old versions)
        notably removes all under images/jquery/ui/development-bundle/ui
        removes now useless GooglemapMarkers.js and GooglemapSimple.js
    
    Flat Grey application.js
        moves jQuery(document).ready(function() at bottom (spotted in Chrome console) 
        
    css
        I did not find much issues, I spotted the title bar of the lookups, but got it fixed after some efforts.    
    
    Issues:
        Imagemanagement:  I got issues while testing, actually I'm not quite qure how it works, even in stable demo. It should be validated again. I commit nevertheless my changes:
            moves js part from product to images component
            removes useless calls to js files (mostly in imagemanagement, but not only)
            renames jquery.min.js to sizzle.min.js. 
            Inside sizzle.min.js, updates the Dojo part to v1.10.17-pre and removes the jQuery part
            changes to use ofbizContentUrl macro for generating js calls
            jquery.rotate.js NOT! It's jQueryRotateCompressed.js http://markmail.org/message/dit3dlh3ph4jnenp
            Got ERROR 22001: A truncation error was encountered trying to shrink VARCHAR 'D:\projectsASF\ofbizClean\framework\images\webapp\images\pro&' to length 100.  I opened OFBIZ-5501 for that
        I tried to update jstree  to jstree 3 but gave up. I let the jquery.jstree-3.0.0-beta3 files in place in case someone would give it a chance...
        
    Not related but while a it:
        removes <!--flot example requests--> from birt controller (moved recently to example component)
        
        
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1559769 13f79535-47bb-0310-9956-ffa450edef68
Commits on Jan 18, 2014
  1. A patch from Leon for "Form pagination fails if total length of searc…

    JacquesLeRoux committed Jan 18, 2014
    …h condition is more than about 2~3k bytes" https://issues.apache.org/jira/browse/OFBIZ-5478
    
    Since it uses "GET" method to submit the pagination request, it's restricted by the URL max length limitation.
    The patch attached changes the submit way from GET to "POST" if total length of URL > 2k.
    
    
    jleroux: I also sort of (found after it was due to it) reverted r1204170, I don't see the reason for this now, and it was uselessly duplicating the current entry in the page size dropdown
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1559338 13f79535-47bb-0310-9956-ffa450edef68