ofbiz-framework

Clone Tools
  • last updated 29 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Improved: Update Geo information according to ISO notifications (OFBIZ-10028)

This follows this discussion http://markmail.org/message/xn7f552qvtpua2uq

Here are China, Germany, Hungary and Indonesia

Thanks: Kyra Pritzel-Hentley

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1820644 13f79535-47bb-0310-9956-ffa450edef68

    • -68
    • +68
    /framework/common/data/GeoData_CN.xml
    • -0
    • +109
    /framework/common/data/GeoData_HU.xml
    • -0
    • +92
    /framework/common/data/GeoData_ID.xml
Improved: ID should be the abbreviation for identity in English (OFBIZ-100131)

Completes r1820451

Thanks: James Yong for the Jira and r1820451 commit

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1820457 13f79535-47bb-0310-9956-ffa450edef68

Improved: ID should be the abbreviation for identity in English (OFBIZ-100131)

Cover translations that are missed earlier.

Also cover non-English translations.

Thanks: Jacques for the additional patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1820451 13f79535-47bb-0310-9956-ffa450edef68

    • -1
    • +1
    /applications/commonext/config/SetupUiLabels.xml
    • -68
    • +68
    /applications/content/config/ContentUiLabels.xml
    • -52
    • +52
    /applications/order/config/OrderUiLabels.xml
    • -1
    • +1
    /applications/party/config/PartyEntityLabels.xml
    • -44
    • +44
    /applications/party/config/PartyUiLabels.xml
    • -17
    • +17
    /framework/common/config/CommonUiLabels.xml
    • -3
    • +3
    /framework/webtools/config/WebtoolsUiLabels.xml
"Applied fix from trunk for revision: 1820441 " ------------------------------------------------------------------------ r1820441 | jleroux | 2018-01-07 11:51:39 +0100 (dim., 07 janv. 2018) | 8 lines

Improved: Update Geo information according to ISO notifications, Ecuador

(OFBIZ-10028)

This follows this discussion http://markmail.org/message/xn7f552qvtpua2uq

This is mostly to check WIP at INFRA-15394, INFRA-15785 and OFBIZ-10147

Thanks: Kyra Pritzel-Hentley

------------------------------------------------------------------------



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1820443 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +71
    /framework/common/data/GeoData_EC.xml
Improved: Update Geo information according to ISO notifications, Ecuador (OFBIZ-10028)

This follows this discussion http://markmail.org/message/xn7f552qvtpua2uq

This is mostly to check WIP at INFRA-15394, INFRA-15785 and OFBIZ-10147

Thanks: Kyra Pritzel-Hentley

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1820441 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +71
    /framework/common/data/GeoData_EC.xml
Fixed: ProductPriceRuleCondition 'is Product' (enum:PRIP_PRODUCT_ID) don't check the virtual product (OFBIZ-10149).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1820411 13f79535-47bb-0310-9956-ffa450edef68

Fixed: ProductPriceRuleCondition 'is Product' (enum:PRIP_PRODUCT_ID) don't check the virtual product (OFBIZ-10149).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1820410 13f79535-47bb-0310-9956-ffa450edef68

Fixed: Display the included vat amount on order item detail instead of 0 (OFBIZ-10148) When you use a product price with included vat tax, the orderAdjustment created have an amount to 0 but amount already included with the vat.

When we display the order adjustment detail for an order item we use only amount (so 0).

Now if the orderAdjustment have an amountAlreadyIncluded not empty, we display it instead.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1820404 13f79535-47bb-0310-9956-ffa450edef68

Fixed: Display the included vat amount on order item detail instead of 0 (OFBIZ-10148) When you use a product price with included vat tax, the orderAdjustment created have an amount to 0 but amount already included with the vat.

When we display the order adjustment detail for an order item we use only amount (so 0).

Now if the orderAdjustment have an amountAlreadyIncluded not empty, we display it instead.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1820403 13f79535-47bb-0310-9956-ffa450edef68

"Applied fix from trunk for revision: 1820375 " ------------------------------------------------------------------------ r1820375 | jleroux | 2018-01-06 08:13:44 +0100 (sam., 06 janv. 2018) | 8 lines

Improved: Update Geo information according to ISO notifications, Iceland

(OFBIZ-10028)

This follows this discussion http://markmail.org/message/xn7f552qvtpua2uq

This is mostly to check WIP at INFRA-15394, INFRA-15785 and OFBIZ-10147

Thanks: Kyra Pritzel-Hentley

Note: I backport this simple and harmless commit in order to test the new

ofbizBranch17Framework builder AGAIN!!!

------------------------------------------------------------------------

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1820402 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +39
    /framework/common/data/GeoData_IS.xml
"Applied fix from trunk for revision: 1820374 " ------------------------------------------------------------------------ r1820374 | jleroux | 2018-01-06 07:01:15 +0100 (sam., 06 janv. 2018) | 6 lines

Improved: Update Geo information according to ISO notifications, Cyprus

(OFBIZ-10028)

This follows this discussion http://markmail.org/message/xn7f552qvtpua2uq

Thanks: Kyra Pritzel-Hentley

Note: I backport this simple and harmless commit in order to test the new

ofbizBranch17Framework builder

------------------------------------------------------------------------

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1820386 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +35
    /framework/common/data/GeoData_CY.xml
Improved: Update Geo information according to ISO notifications, Iceland (OFBIZ-10028)

This follows this discussion http://markmail.org/message/xn7f552qvtpua2uq

This is mostly to check WIP at INFRA-15394, INFRA-15785 and OFBIZ-10147

Thanks: Kyra Pritzel-Hentley

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1820375 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +39
    /framework/common/data/GeoData_IS.xml
Improved: Update Geo information according to ISO notifications, Cyprus (OFBIZ-10028)

This follows this discussion http://markmail.org/message/xn7f552qvtpua2uq

Thanks: Kyra Pritzel-Hentley

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1820374 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +35
    /framework/common/data/GeoData_CY.xml
Fixed: typos in Javadoc comment.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1820307 13f79535-47bb-0310-9956-ffa450edef68

Applied fix from trunk for revision: 1820262 ===

Fixed: Hardcoded String in PaymentGatewayServices#processCaptureResult (OFBIZ-10143)

In this patch a hard coded String is replaced with a String variable, trailing whitespace is deleted and a small typo is fixed.

Thanks Kyra Pritzel-Hentley for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1820263 13f79535-47bb-0310-9956-ffa450edef68

Fixed: Hardcoded String in PaymentGatewayServices#processCaptureResult (OFBIZ-10143) In this patch a hard coded String is replaced with a String variable, trailing whitespace is deleted and a small typo is fixed. Thanks Kyra Pritzel-Hentley for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1820262 13f79535-47bb-0310-9956-ffa450edef68

Improved: DataEvents.java API (OFBIZ-10144)

Thanks: Wai

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1820160 13f79535-47bb-0310-9956-ffa450edef68

No functional change,

Removes the test error used to test the new Buildbot config.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1820051 13f79535-47bb-0310-9956-ffa450edef68

No functional change,

Voluntarily put a test error to test the new Buildbot config.

It will be removed as soon as Buildbot will run w/o duplicate warnings

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1820049 13f79535-47bb-0310-9956-ffa450edef68

Applied fix from trunk for revision: 1820038 ===

Fixed: Trailing fraction are not entertained by formatCurrency method of UtilFormatOut (OFBIZ-10142)

Thanks Suraj Khurana for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1820039 13f79535-47bb-0310-9956-ffa450edef68

Fixed: Trailing fraction are not entertained by formatCurrency method of UtilFormatOut (OFBIZ-10142) Thanks Suraj Khurana for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1820038 13f79535-47bb-0310-9956-ffa450edef68

Reverted: Revision #1816270 not able to add a option with empty key in drop-down, (OFBIZ-9759)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1819947 13f79535-47bb-0310-9956-ffa450edef68

No functional change, fixes French label

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1819925 13f79535-47bb-0310-9956-ffa450edef68

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

    • -9
    • +9
    /applications/content/config/ContentUiLabels.xml
    • -12
    • +12
    /applications/order/config/OrderUiLabels.xml
    • -25
    • +25
    /applications/product/config/ProductUiLabels.xml
    • -1
    • +1
    /framework/webtools/config/WebtoolsUiLabels.xml
"Applied fix from trunk for revision: 1819811" ------------------------------------------------------------------------ r1819811 | jleroux | 2018-01-02 13:22:17 +0100 (mar., 02 janv. 2018) | 6 lines

Fixed: Add WebSocket support in OFBiz

(OFBIZ-7073)

This was my bad at OFBIZ-7776

Thanks: Deepak for help on dev ML (good remembering)

------------------------------------------------------------------------



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1819812 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +1
    /framework/catalina/ofbiz-component.xml
Fixed: Add WebSocket support in OFBiz (OFBIZ-7073)

This was my bad at OFBIZ-7776

Thanks: Deepak for help on dev ML (good remembering)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1819811 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +1
    /framework/catalina/ofbiz-component.xml
"Applied fix from trunk for revision: 1819805" ------------------------------------------------------------------------ r1819805 | jleroux | 2018-01-02 13:07:51 +0100 (mar., 02 janv. 2018) | 7 lines

Improved: Make the number of initially visible applications in main menu a

(OFBIZ-10132)

Currently the number of initially visible applications is hardcoded to 8 in

TopAppBar.ftl

Completes r1819800 thankd to Deepak on dev ML

------------------------------------------------------------------------



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1819806 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +1
    /themes/rainbowstone/config/rainbowstone.properties
    • -0
    • +1
    /themes/rainbowstone/ofbiz-component.xml
Improved: Make the number of initially visible applications in main menu a (OFBIZ-10132)

Currently the number of initially visible applications is hardcoded to 8 in

TopAppBar.ftl

Completes r1819800 thankd to Deepak on dev ML

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1819805 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +1
    /themes/rainbowstone/ofbiz-component.xml
Improved: Make the number of initially visible applications in main menu a (OFBIZ-10132)

Currently the number of initially visible applications is hardcoded to 8 in

TopAppBar.ftl

This temporarily do it by putting an appMax properties in a

common/config/rainbowstone.properties file.

Putting it in themes/common/config/rainbowstone.properties does not work yet.

I have to find why, WIP in relation with OFBIZ-7073

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1819800 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +1
    /themes/common/config/rainbowstone.properties
    • -0
    • +1
    /themes/rainbowstone/config/rainbowstone.properties
No functional refactoring changes while reviewing r1819730

Removes useless exceptions handling.

Uses try-w/-ress for ByteArrayInputStream

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1819764 13f79535-47bb-0310-9956-ffa450edef68