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 2016/03/28 11:31:54 UTC
svn commit: r1736846 - in /ofbiz/trunk: applications/datamodel/entitydef/
framework/common/entitydef/
Author: jleroux
Date: Mon Mar 28 09:31:53 2016
New Revision: 1736846
URL: http://svn.apache.org/viewvc?rev=1736846&view=rev
Log:
Patches from Pierre Smits for <<Enhancing *Attribute entities with a description field>> https://issues.apache.org/jira/browse/OFBIZ-6962
Modified:
ofbiz/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml
ofbiz/trunk/applications/datamodel/entitydef/content-entitymodel.xml
ofbiz/trunk/applications/datamodel/entitydef/order-entitymodel.xml
ofbiz/trunk/applications/datamodel/entitydef/party-entitymodel.xml
ofbiz/trunk/applications/datamodel/entitydef/product-entitymodel.xml
ofbiz/trunk/applications/datamodel/entitydef/shipment-entitymodel.xml
ofbiz/trunk/applications/datamodel/entitydef/workeffort-entitymodel.xml
ofbiz/trunk/framework/common/entitydef/entitymodel.xml
Modified: ofbiz/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml?rev=1736846&r1=1736845&r2=1736846&view=diff
==============================================================================
--- ofbiz/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml (original)
+++ ofbiz/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml Mon Mar 28 09:31:53 2016
@@ -69,6 +69,7 @@ under the License.
<field name="budgetId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="budgetId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="BUDGET_ATTR_BDGT" rel-entity-name="Budget">
@@ -106,6 +107,7 @@ under the License.
<field name="budgetItemSeqId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="budgetId"/>
<prim-key field="budgetItemSeqId"/>
<prim-key field="attrName"/>
@@ -385,6 +387,7 @@ under the License.
<field name="finAccountId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="finAccountId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="FINACCT_ATTR" rel-entity-name="FinAccount">
@@ -499,6 +502,7 @@ under the License.
<field name="finAccountTransId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="finAccountTransId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="FINACCT_TX_ATTR" rel-entity-name="FinAccountTrans">
@@ -690,6 +694,7 @@ under the License.
<field name="fixedAssetId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="fixedAssetId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="FIXEDAST_ATTR" rel-entity-name="FixedAsset">
@@ -1217,6 +1222,7 @@ under the License.
<field name="invoiceId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="invoiceId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="INVOICE_ATTR" rel-entity-name="Invoice">
@@ -1412,6 +1418,7 @@ under the License.
<field name="invoiceItemSeqId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="invoiceId"/>
<prim-key field="invoiceItemSeqId"/>
<prim-key field="attrName"/>
@@ -1563,6 +1570,7 @@ under the License.
<field name="invoiceTermId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="invoiceTermId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="INVOICE_TRM_ATTR" rel-entity-name="InvoiceTerm">
@@ -1829,6 +1837,7 @@ under the License.
<field name="acctgTransId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="acctgTransId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="ACCTTX_ATTR" rel-entity-name="AcctgTrans">
@@ -3069,6 +3078,7 @@ under the License.
<field name="paymentId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="paymentId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="PAYMENT_ATTR" rel-entity-name="Payment">
Modified: ofbiz/trunk/applications/datamodel/entitydef/content-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/datamodel/entitydef/content-entitymodel.xml?rev=1736846&r1=1736845&r2=1736846&view=diff
==============================================================================
--- ofbiz/trunk/applications/datamodel/entitydef/content-entitymodel.xml (original)
+++ ofbiz/trunk/applications/datamodel/entitydef/content-entitymodel.xml Mon Mar 28 09:31:53 2016
@@ -464,6 +464,7 @@ under the License.
<field name="contentId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="contentId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="CONTENT_ATTR" rel-entity-name="Content">
@@ -824,6 +825,7 @@ under the License.
<field name="dataResourceId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="dataResourceId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="DATA_REC_ATTR" rel-entity-name="DataResource">
@@ -1084,6 +1086,7 @@ under the License.
<field name="documentId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="documentId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="DOCUMENT_ATTR" rel-entity-name="Document">
Modified: ofbiz/trunk/applications/datamodel/entitydef/order-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/datamodel/entitydef/order-entitymodel.xml?rev=1736846&r1=1736845&r2=1736846&view=diff
==============================================================================
--- ofbiz/trunk/applications/datamodel/entitydef/order-entitymodel.xml (original)
+++ ofbiz/trunk/applications/datamodel/entitydef/order-entitymodel.xml Mon Mar 28 09:31:53 2016
@@ -165,6 +165,7 @@ under the License.
<field name="orderAdjustmentId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="orderAdjustmentId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="ORDER_ADJ_ATTR" rel-entity-name="OrderAdjustment">
@@ -232,6 +233,7 @@ under the License.
<field name="orderId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="orderId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="ORDER_ATTR_HDR" rel-entity-name="OrderHeader">
@@ -649,6 +651,7 @@ under the License.
<field name="orderItemSeqId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="orderId"/>
<prim-key field="orderItemSeqId"/>
<prim-key field="attrName"/>
@@ -1267,6 +1270,7 @@ under the License.
<field name="orderItemSeqId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="termTypeId"/>
<prim-key field="orderId"/>
<prim-key field="orderItemSeqId"/>
@@ -1415,6 +1419,7 @@ under the License.
<field name="quoteId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="quoteId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="QUOTE_ATTR" rel-entity-name="Quote">
@@ -1563,6 +1568,7 @@ under the License.
<field name="quoteItemSeqId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="termTypeId"/>
<prim-key field="quoteId"/>
<prim-key field="quoteItemSeqId"/>
@@ -1789,6 +1795,7 @@ under the License.
<field name="custRequestId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="custRequestId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="CUST_REQ_ATTR" rel-entity-name="CustRequest">
@@ -2146,6 +2153,7 @@ under the License.
<field name="requirementId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="requirementId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="REQ_ATTR" rel-entity-name="Requirement">
Modified: ofbiz/trunk/applications/datamodel/entitydef/party-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/datamodel/entitydef/party-entitymodel.xml?rev=1736846&r1=1736845&r2=1736846&view=diff
==============================================================================
--- ofbiz/trunk/applications/datamodel/entitydef/party-entitymodel.xml (original)
+++ ofbiz/trunk/applications/datamodel/entitydef/party-entitymodel.xml Mon Mar 28 09:31:53 2016
@@ -118,6 +118,7 @@ under the License.
<field name="agreementId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="agreementId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="AGRMNT_ATTR" rel-entity-name="Agreement">
@@ -175,6 +176,7 @@ under the License.
<field name="agreementItemSeqId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="agreementId"/>
<prim-key field="agreementItemSeqId"/>
<prim-key field="attrName"/>
@@ -361,6 +363,7 @@ under the License.
<field name="agreementTermId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="agreementTermId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="AGRMNT_TERM_ATTR" rel-entity-name="AgreementTerm">
@@ -961,6 +964,7 @@ under the License.
<field name="contactMechId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="contactMechId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="CONT_MECH_ATTR" rel-entity-name="ContactMech">
@@ -1824,6 +1828,7 @@ under the License.
<field name="partyId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="partyId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="PARTY_ATTR" rel-entity-name="Party">
Modified: ofbiz/trunk/applications/datamodel/entitydef/product-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/datamodel/entitydef/product-entitymodel.xml?rev=1736846&r1=1736845&r2=1736846&view=diff
==============================================================================
--- ofbiz/trunk/applications/datamodel/entitydef/product-entitymodel.xml (original)
+++ ofbiz/trunk/applications/datamodel/entitydef/product-entitymodel.xml Mon Mar 28 09:31:53 2016
@@ -234,6 +234,7 @@ under the License.
<field name="productCategoryId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="productCategoryId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="PROD_CTGRY_ATTR" rel-entity-name="ProductCategory">
@@ -836,6 +837,7 @@ under the License.
<field name="costComponentId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="costComponentId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="COST_COMP_ATTR" rel-entity-name="CostComponent">
@@ -1060,6 +1062,7 @@ under the License.
<field name="facilityId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="facilityId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="FACILITY_ATTR" rel-entity-name="Facility">
@@ -1973,6 +1976,7 @@ under the License.
<field name="inventoryItemId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="inventoryItemId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="INV_ITEM_ATTR" rel-entity-name="InventoryItem">
@@ -2926,6 +2930,7 @@ under the License.
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
<field name="attrType" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="productId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="PROD_ATTR" rel-entity-name="Product">
@@ -4545,6 +4550,7 @@ under the License.
<field name="subscriptionId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="subscriptionId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="SUBSC_ATTR" rel-entity-name="Subscription">
Modified: ofbiz/trunk/applications/datamodel/entitydef/shipment-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/datamodel/entitydef/shipment-entitymodel.xml?rev=1736846&r1=1736845&r2=1736846&view=diff
==============================================================================
--- ofbiz/trunk/applications/datamodel/entitydef/shipment-entitymodel.xml (original)
+++ ofbiz/trunk/applications/datamodel/entitydef/shipment-entitymodel.xml Mon Mar 28 09:31:53 2016
@@ -705,6 +705,7 @@ under the License.
<field name="shipmentId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="shipmentId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="SHPMNT_ATTR" rel-entity-name="Shipment">
Modified: ofbiz/trunk/applications/datamodel/entitydef/workeffort-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/datamodel/entitydef/workeffort-entitymodel.xml?rev=1736846&r1=1736845&r2=1736846&view=diff
==============================================================================
--- ofbiz/trunk/applications/datamodel/entitydef/workeffort-entitymodel.xml (original)
+++ ofbiz/trunk/applications/datamodel/entitydef/workeffort-entitymodel.xml Mon Mar 28 09:31:53 2016
@@ -320,6 +320,7 @@ under the License.
<field name="fromDate" type="date-time"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="workEffortIdFrom"/>
<prim-key field="workEffortIdTo"/>
<prim-key field="workEffortAssocTypeId"/>
@@ -371,6 +372,7 @@ under the License.
<field name="workEffortId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<prim-key field="workEffortId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="WK_EFFRT_ATTR_WE" rel-entity-name="WorkEffort">
Modified: ofbiz/trunk/framework/common/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/entitydef/entitymodel.xml?rev=1736846&r1=1736845&r2=1736846&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/framework/common/entitydef/entitymodel.xml Mon Mar 28 09:31:53 2016
@@ -818,6 +818,7 @@ under the License.
<field name="portletSeqId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
<field name="attrValue" type="value"></field>
+ <field name="attrDescription" type="description"></field>
<field name="attrType" type="value"></field>
<prim-key field="portalPageId"/>
<prim-key field="portalPortletId"/>