Author: swapnilmmane
Date: Thu Feb 7 04:20:15 2019
New Revision: 1853111
URL:
http://svn.apache.org/viewvc?rev=1853111&view=revLog:
Applied fix from trunk for revision: 1853109
===
Improved: Made the ecomThemeId field optional, since it is not the part of PK
(OFBIZ-10567)
Modified:
ofbiz/ofbiz-framework/branches/release18.12/ (props changed)
ofbiz/ofbiz-framework/branches/release18.12/applications/product/servicedef/services_store.xml
Propchange: ofbiz/ofbiz-framework/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 7 04:20:15 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
+/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
Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/product/servicedef/services_store.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/product/servicedef/services_store.xml?rev=1853111&r1=1853110&r2=1853111&view=diff==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/product/servicedef/services_store.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/product/servicedef/services_store.xml Thu Feb 7 04:20:15 2019
@@ -40,7 +40,7 @@ under the License.
<auto-attributes include="nonpk" mode="IN" optional="true">
<exclude field-name="visualThemeId"/>
</auto-attributes>
- <attribute name="ecomThemeId" mode="IN" type="String"/>
+ <attribute name="ecomThemeId" mode="IN" type="String" optional="true"/>
</service>
<service name="reserveStoreInventory" engine="simple"