Clone
 

daniel watford <daniel@watfordconsulting.com> in ofbiz-framework

Improved: Add 2020 version of Incoterms

(OFBIZ-11437)

Alter the parent type and descriptions of existing Incoterm TermTypes to

indicate the version of Incoterms they relate to.

Added new Incoterm TermTypes and descriptions correspoding to the

Incoterms 2020 set.

    • -13
    • +30
    /applications/datamodel/data/seed/PartySeedData.xml
    • -60
    • +165
    /applications/party/config/PartyEntityLabels.xml
Improved: Add 2020 version of Incoterms

(OFBIZ-11437)

Alter the parent type and descriptions of existing Incoterm TermTypes to

indicate the version of Incoterms they relate to.

Added new Incoterm TermTypes and descriptions correspoding to the

Incoterms 2020 set.

    • -13
    • +30
    /applications/datamodel/data/seed/PartySeedData.xml
    • -60
    • +165
    /applications/party/config/PartyEntityLabels.xml
Improved: Add 2020 version of Incoterms

(OFBIZ-11437)

Alter the parent type and descriptions of existing Incoterm TermTypes to

indicate the version of Incoterms they relate to.

Added new Incoterm TermTypes and descriptions correspoding to the

Incoterms 2020 set.

    • -13
    • +30
    /applications/datamodel/data/seed/PartySeedData.xml
    • -60
    • +165
    /applications/party/config/PartyEntityLabels.xml
Improved: Add 2020 version of Incoterms (OFBIZ-11437)

Alter the parent type and descriptions of existing Incoterm TermTypes to

indicate the version of Incoterms they relate to.

Added new Incoterm TermTypes and descriptions correspoding to the

Incoterms 2020 set.

Conflicts handled by hand:

applications/datamodel/data/seed/PartySeedData.xml

applications/party/config/PartyEntityLabels.xml

    • -15
    • +32
    /applications/datamodel/data/seed/PartySeedData.xml
    • -61
    • +166
    /applications/party/config/PartyEntityLabels.xml
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

5640de4eba0148e4a95d72528945866b7069d2ed.

    • -6
    • +23
    /framework/widget/dtd/widget-form.xsd
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

08a371d0471a506e663c879f30299f424fc70921 with ModelFormFieldTest

removed.

Improved: Set checkstyle to use LF line endings

(OFBIZ-11428)

Setting checkstyle to use LF line endings means that a newline at the

end of a source file is correctly detected no matter whether it is

checked out with LF or CRLF line endings.

Improved: Set checkstyle to use LF line endings

(OFBIZ-11428)

Setting checkstyle to use LF line endings means that a newline at the

end of a source file is correctly detected no matter whether it is

checked out with LF or CRLF line endings.

Fixed: Fixed line lengths in ModelFormFieldTest to adhere to coding standards

(OFBIZ-11418)

Fixed: Fixed line lengths in ModelFormFieldTest to adhere to coding standards

(OFBIZ-11418)

Documented: Documented use of field attribute parameter-name and lookup field attribute target-parameter in widget-form.xsd

(OFBIZ-11418)

    • -6
    • +23
    /framework/widget/dtd/widget-form.xsd
Documented: Documented use of field attribute parameter-name and lookup field attribute target-parameter in widget-form.xsd

(OFBIZ-11418)

    • -6
    • +23
    /framework/widget/dtd/widget-form.xsd
Improved: Use FlexibleStringExpander in form widget lookup field 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.

Improved: Use FlexibleStringExpander in form widget lookup field 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.

Improved: Use FlexibleStringExpander in form widget lookup field 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.

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 52e21a3d2e9123674e151d255fe898f86a5be72e with ModelFormFieldTest removed.

Improved: Added license header to MacroFormRendererTest

(OFBIZ-4035)

Improved: Added license header to MacroFormRendererTest

(OFBIZ-4035)

Documented: change the id Attribute for input fields in the model macro form renderer from String to FlexibleStringExpander

(OFBIZ-4035)

Document that the id-name attribute for a form widget's field

element can use ${} notation. Also document the default value if id-name is

not set.

    • -1
    • +12
    /framework/widget/dtd/widget-form.xsd
Improved: Added unit testing, using JMockit, to ensure that form macros are rendered using ids from ModelFormField#getCurrentContainerId.

(OFBIZ-4035)

Improved: Added unit testing, using JMockit, to ensure that form macros are rendered using ids from ModelFormField#getCurrentContainerId.

(OFBIZ-4035)

Improved: Ensure MacroFormRenderer uses ModelFormField#getCurrentContainerId rather than ModelFormField#getIdName to ensure any FlexibleStringExpander expression defined in the field's id-name property is processed before rendering into the container FTL macro.

(OFBIZ-4035)

Improved: Ensure MacroFormRenderer uses ModelFormField#getCurrentContainerId rather than ModelFormField#getIdName to ensure any FlexibleStringExpander expression defined in the field's id-name property is processed before rendering into the container FTL macro.

(OFBIZ-4035)

Improved: Added ModelFormField testing to ensure getting a field's current container id will return an evaulated FlexibleStringExpander expression.

(OFBIZ-4035)

Removed unused test imports.

Get Path from URI than a string representation of a file path when building Path to test resources.

Improved: Use FlexibleStringExpander for field parameter names. (OFBIZ-11330)

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

Added test cases to ensure parameter names can be built using FlexibleStringExpander.