Commit Graph
1409 Commits
Author SHA1 Message Date
Nicolas Malin fb95c796bb Fixed: Attribute default-field-type hidden doesn't work for auto-fields-service element (OFBIZ-12555)
When you define a widget form and wish populate hidden fields with the element auto-fields-service, OFBiz rendering each as edit field type.

    <form name="ListPartyQuals" ...>
        <auto-fields-service service-name="updatePartyQual" default-field-type="hidden"/>
    </form>

The problem came from the function ModelFormFieldBuilder.induceFieldInfoFromServiceParam didn't manage the case "hidden"
2022-02-03 11:24:56 +01:00
Jacques Le Roux c12a801d7b Fixed: Attribute 'placeholder' is not allowed to appear in element 'text'
Completes the previous fix by Wei Zhang. This was committed at a wrong place
for OFBIZ-5341. Only text was concerned, not date-time
2022-01-29 10:57:49 +01:00
Jacques Le Roux 8ec079fbfc Fixed: Add http to https redirect rule for ofbiz.apache.org (OFBIZ-10590)
This prevented to run the stable demo, hence the next
2021-07-20 07:38:34 +02:00
Nicolas Malin 076c1e254c Fixed: Link request-confirmation not generated on menus (OFBIZ-12278)
Menus link with request-confirmation and confirmation message do not generate the script that open confirmation

When you activate the following menu item :
      <menu-item name="statusToCancelled" title="${uiLabelMap.AccountingPaymentTabStatusToCancelled}">
          <link target="setPaymentStatus" request-confirmation="true" confirmation-message="You want to cancel this payment number ${payment.paymentId}?">
              ....
         </link>
      </menu-item>

OFBiz to not generate the js code link to the request-confirmation attribute because this functionality has been never implemented on java code for MenuRenderer

Thanks to Leila Mekika for raised this issue and solved it
2021-07-09 21:12:31 +02:00
Jacques Le Roux a5fdd7b063 Fixed: Ampersand in Party not displayed correctly (OFBIZ-12140)
In the reported case, ModelFormField::getDescription double HTML encodes the
description when both the entity and the description contain an ampersand.

A solution is to test if the description is already HTML encoded before encoding
it again. If HTML encoded then only String encodes it.

BTW I'm not sure it's useful but it's harmless, the same solution can be applied
to OFBIZ-12026 and similarly in renderableFtlFormElementsBuilder::encode. I'll
do as improvements...

Thanks: Andrew Waters for report and help in analysis
2021-01-23 17:49:35 +01:00
Jacques Le Roux 2c4824f9fa Fixed: Hyperlink title under form widget doesn't support character encoding for special characters (OFBIZ-12026)
When we use any title with special characters for hyperlink tag, it shows broken
string on UI, eg:
<hyperlink description="${uiLabelMap.CommonImportExport}"  target="ImportExport">
should render a button with the title "Import/Export. But it shows as
Import&#x2f;Export

jleroux: I have noticed that the same happens with special French characters.
So it's a general issue.
The title (description in code) is HTML encoded and that does not work for
special characters. I simply used a string encoder.

Thanks: Pradeep Choudhary for report, Sourabh Jain for a possible but not
general solution at OFBIZ-12023, ie using target-type="plain"
2020-12-11 13:42:51 +01:00
Jacques Le Roux 9cfd5a73e1 Fixed: Sorting of lists generates undesired results (OFBIZ-8302)
For this issue (OFBIZ-8302) I reverted the point 1 of
http://svn.apache.org/viewvc?view=revision&revision=1759555

As reported by Alvaro Munoz from GH security team it's not sufficient:
<<the second part of the fix was not effective, since the attacker can close the
raw string context with a double quote and write a new attribute or even close
the macro tag and write arbitrary FreeMarker code.>>

So this removes the 2nd part and add better solution to fix the OFBIZ-8302 issue
The solution is to encode only the QueryString and to handle it correctly in
UtilHttp::getParameterMap. I must say it was not a sinecure!

# Conflicts:
#	framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
#	framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
2020-10-31 19:14:21 +01:00
Jacques Le Roux 1866a3c464 Fixed: Server-Side Template Injection using Static (OFBIZ-11871)
Thanks to Alvaro's explanations, the problem was in MacroFormRenderer where, for
lookups, we retrieve _LAST_VIEW_NAME_ as a parameter without encoding it.

Thanks: Alvaro for advice

Conflicts handled by hand in UtilHttp.java
2020-08-03 11:02:32 +02:00
holivier 88f87f27f0 fixed: sort-order (field) not works in CompoundWidgets file (OFBIZ-11708)
In a form, when <sort-order tag is used, the children analyze not works
because, getTagName() is used not the getLocalName(). getTagName()
return "wf:sort-field" when getLocalName return "sort-field".
So change getTagName() to getLocalName() for sort-order children
2020-05-29 11:48:25 +02:00
holivier 6e845ccfc4 Fixed: drop-down field not work when in a compound-widget file (OFBIZ-11676)
When, in ModelFormField, FieldInfoWithOptions (which read xml file ) is
call, test on tag name is done with getName() and not getLocalName() so
none "option" is recognize when field is declare on a compound-widget
file. getName() is change to getLocalName()
2020-05-29 11:35:48 +02:00
Pawan Verma e15c82b254 Fixed: Theme files loading taking longer time
(OFBIZ-11665)

Thanks: Pierre and Jacques for the review.
2020-05-10 14:18:11 +05:30
Jacques Le Roux 54283206ad Fixed: Compound-widget not works with condition
(OFBIZ-11606)

Fixes a compilation issue due to backporting a line too much
2020-04-27 18:16:06 +02:00
Jacques Le Roux 1bdd636146 Fixed: Compound-widget not works with condition
(OFBIZ-11606)

Fixes "<**:condition" not well managed and generating an error

Changes all the getNodeName() by getLocalName() in the ModelX****Condition.java

Thanks: Olivier
2020-04-27 17:44:55 +02:00
Jacques Le Roux 0805e57f08 Fixed: Compound-widget not works with condition
(OFBIZ-11606)

rootElement is not correct for a compound file, it's necessary to do a
UtilXml.firstChildElement(rootElement, "forms"); to be correct.
It's done for screen, form but not for grid !

So correction is now added the correct read of rootElement.

Thanks: Olivier
2020-04-27 14:33:23 +02:00
Jacques Le Roux 9fa3dbe1ea Revert "Merge branch 'JacquesLeRoux-POC-for-CSRF-Token-OFBIZ-11306' into trunk"
This reverts commit 0add8bedbc.
2020-04-05 10:04:15 +02:00
Jacques Le Roux 0add8bedbc Merge branch 'JacquesLeRoux-POC-for-CSRF-Token-OFBIZ-11306' into trunk
Because of GitHub message on PR56:
This branch cannot be rebased due to conflicts

Conflicts handled by hand
RequestHandler.java
2020-04-04 18:33:11 +02:00
Daniel Watford 308982526d Documented: Backport - Documented use of field attribute parameter-name and
lookup field attribute target-parameter in widget-form.xsd

(OFBIZ-11418)

Backport cherry-picked from commit
5640de4eba.
2020-03-02 09:35:31 +00:00
Daniel Watford b518a5df2e Improved: Backport - Use FlexibleStringExpander in form widget lookup
field target parameters.

(OFBIZ-11418)

Changed target-parameter attribute of the form widget's Lookup field to
use the FlexibleStringExpander type rather than String. This has been
done to allow reference to other form fields which may have had their
parameter-name attribute set to a FlexibleStringExpander expression.

Backport cherry-picked from commit
08a371d047 with ModelFormFieldTest
removed.
2020-03-02 09:29:51 +00:00
Daniel Watford 1bd2caae4a Improved: Backport - Use FlexibleStringExpander for field parameter names.
(OFBIZ-11415)

Allows generation of unique names when repeating rendering of a form on a screen.

Backport cherry-picked from commit 52e21a3d2e with ModelFormFieldTest removed.
2020-02-25 13:52:27 +00:00
Nicolas Malin 2342e0e8bc Improved: Improve error message page to support Theming
(OFBIZ-10753)

When OFBiz raise an error, the framework use a jsp page to display it.
I improved the error page generation to support also ftl template rendering and by this way extend the theme engine to support to overide it

On controler.xml we can now use :
    <errorpage>/error/error.jsp</errorpage>
or 
    <errorpage>component://common/webcommon/error/Error.ftl</errorpage> (default configuration)

On your theme you can add your own error page :
    <template> 
      ...
      <template-file widget=menu location=component://common-theme/template/macro/HtmlMenuMacroLibrary.ftl/>
    + <template-file widget=error location=component://common-theme/template/ErrorPage.ftl/>
    </template>

The component://common/webcommon/error/Error.ftl contains the logic theming connection and to simplify source code, all framework old error page (error.jsp) have been removed to centralize all on this new page.

Thanks to Marine Desmarchelier for the error page design

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1856175 13f79535-47bb-0310-9956-ffa450edef68
2020-02-01 11:07:36 +01:00
Nicolas Malin 3ba95ef2ae Fixed: Default option for ModelFormField.DateFindField doesn't work
(OFBIZ-11212)
When you use a date-find element on form, the defaut option are in code like to greater_than and less _than

        public DateFindField(int fieldSource, String type) {
            super(fieldSource, type);
            this.defaultOptionFrom = greaterThanEqualTo;
            this.defaultOptionThru = lessThanEqualTo;
        }

but on macro

<#macro renderDateFindField ...
      <option value=greaterThan<#if defaultOptionFrom==greaterThan> selected=selected</#if>></option><#rt/>
      ...
      <option value=opLessThan<#if defaultOptionThru==opLessThan> selected=selected</#if>></option><#rt/>
      ...
</#macro>

So the value java isn't correct with ftl values and default value never used.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release18.12@1867583 13f79535-47bb-0310-9956-ffa450edef68
2019-09-26 15:31:46 +00:00
Suraj Khurana d63e7d20ec Applied fix from trunk for revision: 1859915
===

Fixed: Enable entity timestamp fields.
(OFBIZ-10959)
While working on a Production environment, it is found that for some reason entity timestamp fields are disabled at Search Results screen in Trunk and the previous release branch.

Thanks Pawan Verma for reporting the issue and providing the patch, Jacques, Gil, Mathieu for reviewing it.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release18.12@1859916 13f79535-47bb-0310-9956-ffa450edef68
2019-05-25 08:27:34 +00:00
Deepak Dixit adeac89d37 Applied fix from trunk for revision: 1854683
===

Preparation for JDK11 update, Updated following code to fix warning with respect to JDK11
- Replaced Class::newInstance occurrences
- Removed deprecated override method Object::finalize
(OFBIZ-10757)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release18.12@1854689 13f79535-47bb-0310-9956-ffa450edef68
2019-03-03 10:45:02 +00:00
Nicolas Malin 1c738446ba Fixed: Disable widget verbose property on context doesn't works for rendering ftl template
Backport from trunk

When OFBiz render a platform specific with a ftl template file, the widget verbosity throw function ModelWidget.widgetBoundary() was called with parameters as context. However this function control if a parameters is already present, so if you set a context.widgetVerbose = false, is was ignored and widget verbosity was present for ftl rendering. 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release18.12@1852533 13f79535-47bb-0310-9956-ffa450edef68
2019-01-30 16:20:24 +00:00
Akash Jain cefb7476d0 Fixed: Date format does not change on change of locale.
(OFBIZ-10736)
Length of date in any formate will always be 10 (2(DD)+1(/)+2(MM)+1(/)+4(YYYY))
Thanks, Aditi Patidar for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1849540 13f79535-47bb-0310-9956-ffa450edef68
2018-12-22 11:26:25 +00:00
Jacques Le Roux 2a96d29cbe Fixed: Date-find error when used in two forms of a same screen
(OFBIZ-10722)

When we have more than one form, in a screen, that use a date-find field, 
the second date-find picker is not working.

To reproduce, you can add a new form with a date-find and call it below 
FindInvoices in FindInvoices screen

Then load page [https://localhost:8443/accounting/control/findInvoices] . 
You should see  that there is no picker on the second date-find

The patch adds an id that allow renderDateFindField macro script to work for 
both fields

Thanks: Leila Mekika

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1849165 13f79535-47bb-0310-9956-ffa450edef68
2018-12-18 11:20:28 +00:00
Jacques Le Roux df3e571060 Fixed: FindGeneric page broken
(OFBIZ-10711)

Due to r1848673 for "Fix or Silence various warnings" (OFBIZ-10701)
a try-with-resources was used but the Object passed in context (an 
EntityListIterator) should not be close there. It's reused in 
FindGeneric.groovy:107 by a performFind service defined in the 
dynamicAutoEntityFieldListForm String.

Thanks: Deepak Dixit for report.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1848954 13f79535-47bb-0310-9956-ffa450edef68
2018-12-14 15:33:43 +00:00
Jacques Le Roux bbfc62d47a Improved: Fix or Silence various warnings
(OFBIZ-10701)

In order to detect potential issues early, the linting compiler option should be 
used by default and disabled with {{./gradlew -PXlint:none build}}.

Additionally it is important to reduce the number of warnings otherwise new 
warnings will remain unnoticed.

The warning related to the com.googlecode.concurrentlinkedhashmap dependency 
should resolves itself once we handle upgrade to Caffeine like proposed in 
OFBIZ-6747.

Thanks: Mathieu Lirzin

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1848673 13f79535-47bb-0310-9956-ffa450edef68
2018-12-11 13:33:49 +00:00
Jacques Le Roux b0478d13f0 Improved: XML schemas should use predefined boolean type
(OFBIZ-10411)

To define boolean values, some ad-hoc enumeration of "true" and "false" are 
repeatedly used.  Since XML Schema defines a standard boolean datatype it's 
better to use it.

Thanks: Mathieu Lirzin

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1846727 13f79535-47bb-0310-9956-ffa450edef68
2018-11-16 16:38:24 +00:00
Julien Nicolas 995a39461a fixed: Change the Menu extends-resource management to allow structure changes by themes
(OFBIZ-10600)

Fixed the lack of menu theme definition in the xsd file

Thanks: To Jacques Le Roux for being more attentive to the log file than I have been ;)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1844697 13f79535-47bb-0310-9956-ffa450edef68
2018-10-23 20:11:00 +00:00
Julien Nicolas de65cd9acd Improved: Change the Menu extends-resource management to allow structure changes by themes
(OFBIZ-10600)
Thanks: Nicolas MALIN, Leila MEKIKA and Gil PORTENSEIGNE

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1844068 13f79535-47bb-0310-9956-ffa450edef68
2018-10-17 07:33:12 +00:00
Suraj Khurana 2d2aba0a4c Improved: Empty header row should not render if list to render in file is empty.
(OFBIZ-7598)
Thanks everyone for your inputs and suggestions.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1839729 13f79535-47bb-0310-9956-ffa450edef68
2018-08-31 06:33:07 +00:00
Suraj Khurana 5d317c08de Reverted: Empty header row should not render if list to render in file is empty.
(OFBIZ-7598)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1838823 13f79535-47bb-0310-9956-ffa450edef68
2018-08-24 11:37:16 +00:00
Deepak Dixit e7a7ba4876 Improved: Rendering different HTML container types with ScreenRenderer
(OFBIZ-10495)
Applied slightly modified patch 
Thanks Dennis Balkir for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1837827 13f79535-47bb-0310-9956-ffa450edef68
2018-08-10 18:23:11 +00:00
Jacques Le Roux 73096d0962 Improved: no functional change, was missing the ASL2 license
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1837642 13f79535-47bb-0310-9956-ffa450edef68
2018-08-08 11:42:12 +00:00
Gil Portenseigne ceea6ce791 Improved : Remove all unnecessary boxing and unboxing in Java classes
(OFBIZ-10504)

Thanks Taher, Jacques, Mathieu and Rishi for the review

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1837577 13f79535-47bb-0310-9956-ffa450edef68
2018-08-07 07:30:43 +00:00
Gil Portenseigne d3021c213b Improved : Use the stream API in FormRenderer
(OFBIZ-10505)

Thanks Mathieu for the patches

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1837460 13f79535-47bb-0310-9956-ffa450edef68
2018-08-05 09:18:20 +00:00
Gil Portenseigne 03107374d2 Improved : Inline ‘getFieldListsByPosition’ method
(OFBIZ-10503)

Refactors ‘getFieldListsByPosition’ method using stream. Thanks Mathieu for the patches

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1837348 13f79535-47bb-0310-9956-ffa450edef68
2018-08-03 07:28:34 +00:00
Gil Portenseigne b16339e90a Improved : Factorize and Refactor filtering of duplicated ‘use-when’ fields in ‘FormRenderer’
(OFBIZ-10502)

Thanks Mathieu for providing unit test and improvment patches

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1837254 13f79535-47bb-0310-9956-ffa450edef68
2018-08-01 20:02:09 +00:00
Suraj Khurana 65b5b117f7 Improved: Empty header row should not render if list to render in file is empty.
(OFBIZ-7598)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1835869 13f79535-47bb-0310-9956-ffa450edef68
2018-07-14 05:10:00 +00:00
Suraj Khurana 920050d685 Reverted: Empty header row should not render if list to render in file is empty because after this, search Result tables won't show first search result.
{OFBIZ-10438}

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1835042 13f79535-47bb-0310-9956-ffa450edef68
2018-07-04 05:24:41 +00:00
Jacques Le Roux 4472a0e39e Improved: no functional change, fix a typo in a comment
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1833388 13f79535-47bb-0310-9956-ffa450edef68
2018-06-12 09:22:40 +00:00
Rishi Solanki b9cf8a5d55 Improved: Add Support for Disable attribute in CheckBox Form Widget. Disabled attrivute can be used as
<field><check disabled=true/></field>

and default value for attribute will be false.
(OFBIZ-10367)
Thanks Pawan Verma for reporting the improvement and providing patch for that.
Thanks James Yong for testing the work.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1833231 13f79535-47bb-0310-9956-ffa450edef68
2018-06-09 12:34:49 +00:00
Jacques Le Roux 22b6c33e88 Improved: Empty header row should not render if list to render in file is empty
(OFBIZ-7598)

If list inside form doesn't contain data, then header row should not render from
better UI perspective and proper message should be shown to user.

Get to catalog/control/EditProductGoodIdentifications with eg 
productId=ID:GZ-1006 for a test 

Thanks: Suraj 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1832401 13f79535-47bb-0310-9956-ffa450edef68
2018-05-28 14:37:44 +00:00
Jacques Le Roux 5ed72f1e95 Improved: Replace Inline js with External js in renderFormClose macro
(OFBIZ-9846)

Replaced inline js from renderFormClose macro to external js in OfbizUtils.js
Done following:
Used custom data attributes: data-focus-field to define focus field for the form.
Used attribute selector to find elements and set focus on the particular field.

Added "requireValidation" class to all the forms with required fields.

Used the class selector to find such forms & attached Validator plugin to it.

Steps to verify:

At add ProdCatalog page: https://localhost:8443/catalog/control/EditProdCatalog

Dialogs:
New Example dialog on Find Example page 
    Go to Find Example page https://localhost:8443/example/control/FindExample
    Click on New Example button
    Validations should work in dialog on form submit.

Additional Changes:

Link for dialog in HtmlMenuMacroLibrary still had the inline code. 
Replaced the code with external js code.

Validations on forms rendered with renderSubmitField macro from 
HtmlFormMacroLibrary.ftl seems not working 
https://demo-trunk.ofbiz.apache.org/partymgr/control/NewEmployee, will create 
a separate ticket for it.

jleroux: 
I agree about NewEmployee issue
As mentionned Aditya themes/rainbowstone/template/HtmlMenuMacroLibrary.ftl was
redundant, removed
I also removed commented out code in rainbowstone HtmlMenuMacroLibrary.ftl 
(left by Aditya while working on the issue I guess)

Thanks: Aditya 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1832307 13f79535-47bb-0310-9956-ffa450edef68
2018-05-26 12:42:20 +00:00
Michael Brohl 02c37dc314 Fixed: EmailServices.sendMailFromScreen attachment rendering broken.
(OFBIZ-10246)

Thanks Martin for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1826674 13f79535-47bb-0310-9956-ffa450edef68
2018-03-13 19:46:28 +00:00
Gil Portenseigne 65fe235f51 Implemented: Add the ability in performFind service to set OR search criteria
(OFBIZ-10195)

This improvement add a way to specify a condition-group attribute on search fields, for performFind service usage.
The same group conditions are gathered with AND operator, and each group is added with a OR
The resulting condition is added to the other with AND operator.
Thanks Taher for your reviews and ideas

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1825350 13f79535-47bb-0310-9956-ffa450edef68
2018-02-26 09:57:36 +00:00
Deepak Dixit 23e4b72f17 Fixed: Alert message : Developer: for lookups to work you must provide a form name! appears when try to select contentId from Lookup.
(OFBIZ-10012)
Applied slightly modified patch 
Thanks  Sonal for reporting and Aditya Sharma for providing patch for the issue


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1825205 13f79535-47bb-0310-9956-ffa450edef68
2018-02-24 10:22:18 +00:00
James Yong 38d0f7455d Fixed: ID should be the abbreviation for identity in English
(OFBIZ-10131)

Replaced the word 'Id' with 'ID' in the *Labels.xml files for "en" locale.
Improved the logic for auto title so that labels generated for variables like productTypeId 
will be 'Product Type ID' instead of 'Product Type Id'.

Thanks: Jacques for the review.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1819906 13f79535-47bb-0310-9956-ffa450edef68
2018-01-02 21:58:37 +00:00
Michael Brohl 50c4bba4b2 Improved: Replace all "e.printStackTrace();" by calls to the Debug class.
(OFBIZ-10083)

Thanks Jacques Le Roux for reporting and Kyra Pritzel-Hentley 
for providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818921 13f79535-47bb-0310-9956-ffa450edef68
2017-12-21 12:33:04 +00:00