svn commit: r1857693 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ applications/commonext/widget/ofbizsetup/SetupForms.xml

Author: jleroux
Date: Wed Apr 17 16:19:27 2019
New Revision: 1857693

URL: http://svn.apache.org/viewvc?rev=1857693&view=rev
Log:
"Applied fix from trunk for revision: 1857692"
------------------------------------------------------------------------
r1857692 | jleroux | 2019-04-17 18:19:00 +0200 (mer. 17 avr. 2019) | 5 lignes

Fixed: Stores can't be modified at ofbizsetup/control/updateProductStore
(OFBIZ-10930)

Same than parent issue (OFBIZ-10567) but in ofbizsetup component (which should
have been names setup BTW, I created a setup component for that in Jira)
------------------------------------------------------------------------

Modified:
    ofbiz/ofbiz-framework/branches/release18.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release18.12/applications/commonext/widget/ofbizsetup/SetupForms.xml

Propchange: ofbiz/ofbiz-framework/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 17 16:19:27 2019
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617
+/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692

Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/commonext/widget/ofbizsetup/SetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/commonext/widget/ofbizsetup/SetupForms.xml?rev=1857693&r1=1857692&r2=1857693&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/commonext/widget/ofbizsetup/SetupForms.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/commonext/widget/ofbizsetup/SetupForms.xml Wed Apr 17 16:19:27 2019
@@ -119,7 +119,8 @@
         <field name="payToPartyId"><hidden value="${partyId}"/></field>
         <field name="partyId"><hidden value="${partyId}"/></field>
         <field name="inventoryFacilityId"><hidden value="${parameters.facilityId}"/></field>
-        <field name="visualThemeId"><hidden value="EC_DEFAULT"/></field>
+        <!-- visualThemeId must be replaced by ecomThemeId because of Entity.field names conflict. See OFBIZ-10567 -->
+        <field name="ecomThemeId" entry-name="visualThemeId"><hidden value="EC_DEFAULT"/></field>
         <field name="manualAuthIsCapture"><hidden value="N"/></field>
         <field name="prorateShipping"><hidden value="Y"/></field>
         <field name="prorateTaxes"><hidden value="Y"/></field>