You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/05/18 14:17:01 UTC
svn commit: r945612 - in /ofbiz/branches/release10.04: ./
applications/product/entitydef/entitymodel.xml
Author: jleroux
Date: Tue May 18 12:17:01 2010
New Revision: 945612
URL: http://svn.apache.org/viewvc?rev=945612&view=rev
Log:
"Applied fix from trunk for revision: 945610"
------------------------------------------------------------------------
r945610 | jleroux | 2010-05-18 14:12:44 +0200 (mar. 18 mai 2010) | 1 ligne
Fix 2 descriptions, thanks to Cimballi in dev ML
------------------------------------------------------------------------
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/applications/product/entitydef/entitymodel.xml
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 18 12:17:01 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610
Modified: ofbiz/branches/release10.04/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/entitydef/entitymodel.xml?rev=945612&r1=945611&r2=945612&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/release10.04/applications/product/entitydef/entitymodel.xml Tue May 18 12:17:01 2010
@@ -4333,7 +4333,7 @@ under the License.
<field name="useRoleTypeId" type="id"></field>
<field name="automaticExtend" type="indicator"><description>If this subscription is automatically extended with the same period as the initial period.</description></field>
<field name="canclAutmExtTime" type="numeric"><description>The time period (before the end of the thruDate) after which the automatic extension of the subscription will be executed.</description></field>
- <field name="canclAutmExtTimeUomId" type="id"><description>If this flag is set to 'Y' the subscription will be extended at the end of the subscription period with a new order.</description></field>
+ <field name="canclAutmExtTimeUomId" type="id"><description>Unit Of Measure used for the automatic extension of the subscription.</description></field>
<prim-key field="productId"/>
<prim-key field="subscriptionResourceId"/>
<prim-key field="fromDate"/>
@@ -4394,7 +4394,7 @@ under the License.
<field name="useTimeUomId" type="id"></field>
<field name="automaticExtend" type="indicator"><description>If this subscription is automatically extended with the same period as the initial period.</description></field>
<field name="canclAutmExtTime" type="numeric"><description>The time period (before the end of the thruDate) after which the automatic extension of the subscription will be executed.</description></field>
- <field name="canclAutmExtTimeUomId" type="id"><description>If this flag is set to 'Y' the subscription will be extended at the end of the subscription period with a new order.</description></field>
+ <field name="canclAutmExtTimeUomId" type="id"><description>Unit Of Measure used for the automatic extension of the subscription.</description></field>
<prim-key field="subscriptionId"/>
<relation type="one" fk-name="SUBSC_SRESRC" rel-entity-name="SubscriptionResource">
<key-map field-name="subscriptionResourceId"/>