svn commit: r1743422 - in /ofbiz/trunk/applications/datamodel/entitydef: accounting-entitymodel.xml content-entitymodel.xml order-entitymodel.xml party-entitymodel.xml product-entitymodel.xml shipment-entitymodel.xml workeffort-entitymodel.xml

Author: jleroux
Date: Wed May 11 20:22:09 2016
New Revision: 1743422

URL: http://svn.apache.org/viewvc?rev=1743422&view=rev
Log:
A patch from Pierre Smits for "Enhance PartyTypeAttr with a description field" https://issues.apache.org/jira/browse/OFBIZ-6738

Currently there is no Uom selector in the terms form. And the display field in the terms list form only shows the uomId.

jleroux: I noticed that none of the *TypeAttr entities has a description field, why not adding it to them all?
Pierre: This patch addresses the issue in all applicable entities, and replaces the previously provided patch.

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

Modified: ofbiz/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml?rev=1743422&r1=1743421&r2=1743422&view=diff
==============================================================================
--- ofbiz/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml (original)
+++ ofbiz/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml Wed May 11 20:22:09 2016
@@ -136,6 +136,7 @@ under the License.
             title="Budget Item Type Attribute Entity">
       <field name="budgetItemTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="budgetItemTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="BUDGET_ITMTYPATTR" rel-entity-name="BudgetItemType">
@@ -312,6 +313,7 @@ under the License.
             title="Budget Type Attribute Entity">
       <field name="budgetTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="budgetTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="BUDGET_TPATR_BT" rel-entity-name="BudgetType">
@@ -528,6 +530,7 @@ under the License.
     <entity entity-name="FinAccountTransTypeAttr" package-name="org.ofbiz.accounting.finaccount" title="Financial Account Transaction Type Attribute Entity">
         <field name="finAccountTransTypeId" type="id-ne"></field>
         <field name="attrName" type="id-long-ne"></field>
+        <field name="description" type="description"></field>
         <prim-key field="finAccountTransTypeId"/>
         <prim-key field="attrName"/>
         <relation type="one" fk-name="FINACCT_TX_TYPATR" rel-entity-name="FinAccountTransType">
@@ -562,6 +565,7 @@ under the License.
         <field name="finAccountTypeId" type="id-ne"></field>
         <field name="attrName" type="id-long-ne"></field>
         <field name="attrValue" type="long-varchar"></field>
+        <field name="description" type="description"></field>
         <prim-key field="finAccountTypeId"/>
         <prim-key field="attrName"/>
         <relation type="one" fk-name="FINACCT_TYPE_ATTR" rel-entity-name="FinAccountType">
@@ -1007,6 +1011,7 @@ under the License.
             title="Fixed Asset Type Attribute Entity">
       <field name="fixedAssetTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="fixedAssetTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="FIXEDAST_TYPATTR" rel-entity-name="FixedAssetType">
@@ -1451,6 +1456,7 @@ under the License.
             title="Invoice Item Type Attribute Entity">
       <field name="invoiceItemTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="invoiceItemTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="INVOICE_ITEM_TATR" rel-entity-name="InvoiceItemType">
@@ -1597,6 +1603,7 @@ under the License.
             title="Invoice Type Attribute Entity">
       <field name="invoiceTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="invoiceTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="INVOICE_TPAT_TYP" rel-entity-name="InvoiceType">
@@ -2047,6 +2054,7 @@ under the License.
             title="Accounting Transaction Type Attribute Entity">
       <field name="acctgTransTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="acctgTransTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="ACCTTX_TYPE_ATTR" rel-entity-name="AcctgTransType">
@@ -3353,6 +3361,7 @@ under the License.
             title="Payment Type Attribute Entity">
       <field name="paymentTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="paymentTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="PAYMETH_TYPE_ATTR" rel-entity-name="PaymentType">

Modified: ofbiz/trunk/applications/datamodel/entitydef/content-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/datamodel/entitydef/content-entitymodel.xml?rev=1743422&r1=1743421&r2=1743422&view=diff
==============================================================================
--- ofbiz/trunk/applications/datamodel/entitydef/content-entitymodel.xml (original)
+++ ofbiz/trunk/applications/datamodel/entitydef/content-entitymodel.xml Wed May 11 20:22:09 2016
@@ -670,6 +670,7 @@ under the License.
             title="Content Type Attribute Entity">
       <field name="contentTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="contentTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="CONTENT_TPAT_TYP" rel-entity-name="ContentType">
@@ -959,6 +960,7 @@ under the License.
             title="Data Object Type Attribute Entity">
       <field name="dataResourceTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="dataResourceTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="DATA_OBTYPE_ATTR" rel-entity-name="DataResourceType">
@@ -1114,6 +1116,7 @@ under the License.
             title="Document Type Attribute Entity">
       <field name="documentTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="documentTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="DOC_TYPE_ATTR" rel-entity-name="DocumentType">

Modified: ofbiz/trunk/applications/datamodel/entitydef/order-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/datamodel/entitydef/order-entitymodel.xml?rev=1743422&r1=1743421&r2=1743422&view=diff
==============================================================================
--- ofbiz/trunk/applications/datamodel/entitydef/order-entitymodel.xml (original)
+++ ofbiz/trunk/applications/datamodel/entitydef/order-entitymodel.xml Wed May 11 20:22:09 2016
@@ -215,6 +215,7 @@ under the License.
             title="Order Adjustment Type Attribute Entity">
       <field name="orderAdjustmentTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="orderAdjustmentTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="ORDER_ADJ_TYPATTR" rel-entity-name="OrderAdjustmentType">
@@ -996,6 +997,7 @@ under the License.
             title="Order Item Type Attribute Entity">
       <field name="orderItemTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="orderItemTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="ORDER_ITEM_TYPATR" rel-entity-name="OrderItemType">
@@ -1299,6 +1301,7 @@ under the License.
             title="Order Type Attribute Entity">
       <field name="orderTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="orderTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="ORDER_TPAT_ORTYP" rel-entity-name="OrderType">
@@ -1597,6 +1600,7 @@ under the License.
             title="Quote Type Attribute Entity">
       <field name="quoteTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="quoteTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="QUOTE_TPAT_QTYP" rel-entity-name="QuoteType">
@@ -2014,6 +2018,7 @@ under the License.
             title="Customer Request Type Attribute Entity">
       <field name="custRequestTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="custRequestTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="CUST_REQ_TYPE_ATTR" rel-entity-name="CustRequestType">
@@ -2260,6 +2265,7 @@ under the License.
             title="Requirement Type Attribute Entity">
       <field name="requirementTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="requirementTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="REQ_TYPE_ATTR" rel-entity-name="RequirementType">

Modified: ofbiz/trunk/applications/datamodel/entitydef/party-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/datamodel/entitydef/party-entitymodel.xml?rev=1743422&r1=1743421&r2=1743422&view=diff
==============================================================================
--- ofbiz/trunk/applications/datamodel/entitydef/party-entitymodel.xml (original)
+++ ofbiz/trunk/applications/datamodel/entitydef/party-entitymodel.xml Wed May 11 20:22:09 2016
@@ -206,6 +206,7 @@ under the License.
             title="Agreement Item Type Attribute Entity">
       <field name="agreementItemTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="agreementItemTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="AGRMNT_ITEM_TYPATR" rel-entity-name="AgreementItemType">
@@ -388,6 +389,7 @@ under the License.
             title="Agreement Type Attribute Entity">
       <field name="agreementTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="agreementTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="AGRMNT_TYPE_ATTR" rel-entity-name="AgreementType">
@@ -437,6 +439,7 @@ under the License.
             title="Term Type Attribute Entity">
       <field name="termTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="termTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="TERM_TYPATR_TTYP" rel-entity-name="TermType">
@@ -1013,6 +1016,7 @@ under the License.
             title="Contact Mechanism Type Attribute Entity">
       <field name="contactMechTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="contactMechTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="CONT_MECH_TYP_ATR" rel-entity-name="ContactMechType">
@@ -2730,6 +2734,7 @@ under the License.
             title="Party Type Attribute Entity">
       <field name="partyTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="partyTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="PARTY_TYP_ATTR" rel-entity-name="PartyType">
@@ -2853,6 +2858,7 @@ under the License.
             title="Role Type Attribute Entity">
       <field name="roleTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="roleTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="ROLE_TYPATR_RTYP" rel-entity-name="RoleType">

Modified: ofbiz/trunk/applications/datamodel/entitydef/product-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/datamodel/entitydef/product-entitymodel.xml?rev=1743422&r1=1743421&r2=1743422&view=diff
==============================================================================
--- ofbiz/trunk/applications/datamodel/entitydef/product-entitymodel.xml (original)
+++ ofbiz/trunk/applications/datamodel/entitydef/product-entitymodel.xml Wed May 11 20:22:09 2016
@@ -550,6 +550,7 @@ under the License.
             title="Product Category Type Attribute Entity">
       <field name="productCategoryTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="productCategoryTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="PROD_CTGRY_TATTR" rel-entity-name="ProductCategoryType">
@@ -865,6 +866,7 @@ under the License.
             title="Cost Component Type Attribute Entity">
       <field name="costComponentTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="costComponentTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="COST_COMP_TATTR" rel-entity-name="CostComponentType">
@@ -1363,6 +1365,7 @@ under the License.
     <entity entity-name="FacilityTypeAttr" package-name="org.ofbiz.product.facility" title="Facility Type Attribute Entity">
         <field name="facilityTypeId" type="id-ne"></field>
         <field name="attrName" type="id-long-ne"></field>
+        <field name="description" type="description"></field>
         <prim-key field="facilityTypeId"/>
         <prim-key field="attrName"/>
         <relation type="one" fk-name="FACILITY_TPAT_FT" rel-entity-name="FacilityType">
@@ -2188,6 +2191,7 @@ under the License.
             title="Inventory Item Type Attribute Entity">
       <field name="inventoryItemTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="inventoryItemTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="INV_ITEM_TYP_ATTR" rel-entity-name="InventoryItemType">
@@ -3267,6 +3271,7 @@ under the License.
             title="Product Type Attribute Entity">
       <field name="productTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="productTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="PROD_TYPE_ATTR" rel-entity-name="ProductType">
@@ -4612,6 +4617,7 @@ under the License.
             title="Subscription Type Attribute Entity">
         <field name="subscriptionTypeId" type="id-ne"></field>
         <field name="attrName" type="id-long-ne"></field>
+        <field name="description" type="description"></field>
         <prim-key field="subscriptionTypeId"/>
         <prim-key field="attrName"/>
         <relation type="one" fk-name="SUBSC_TYPE_ATTR" rel-entity-name="SubscriptionType">

Modified: ofbiz/trunk/applications/datamodel/entitydef/shipment-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/datamodel/entitydef/shipment-entitymodel.xml?rev=1743422&r1=1743421&r2=1743422&view=diff
==============================================================================
--- ofbiz/trunk/applications/datamodel/entitydef/shipment-entitymodel.xml (original)
+++ ofbiz/trunk/applications/datamodel/entitydef/shipment-entitymodel.xml Wed May 11 20:22:09 2016
@@ -941,6 +941,7 @@ under the License.
       <field name="accessPassword" type="value" encrypt="true"><description>USPS Access Password</description></field>
       <field name="maxEstimateWeight" type="numeric"><description>Estimate split into packages</description></field>
       <field name="test" type="short-varchar"><description>Test/Production mode</description></field>
+      <field name="setup" type="short-varchar"><description>Test/Production mode</description></field>
       <prim-key field="shipmentGatewayConfigId"/>
       <relation type="one" fk-name="SGUSPS_SGC" rel-entity-name="ShipmentGatewayConfig">
         <key-map field-name="shipmentGatewayConfigId"/>
@@ -1426,6 +1427,7 @@ under the License.
             title="Shipment Type Attribute Entity">
       <field name="shipmentTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="shipmentTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="SHPMNT_TYPATR" rel-entity-name="ShipmentType">

Modified: ofbiz/trunk/applications/datamodel/entitydef/workeffort-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/datamodel/entitydef/workeffort-entitymodel.xml?rev=1743422&r1=1743421&r2=1743422&view=diff
==============================================================================
--- ofbiz/trunk/applications/datamodel/entitydef/workeffort-entitymodel.xml (original)
+++ ofbiz/trunk/applications/datamodel/entitydef/workeffort-entitymodel.xml Wed May 11 20:22:09 2016
@@ -354,6 +354,7 @@ under the License.
             title="Work Effort Association Type Attribute Entity">
       <field name="workEffortAssocTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="workEffortAssocTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="WK_EFFRTASSC_TATR" rel-entity-name="WorkEffortAssocType">
@@ -859,6 +860,7 @@ under the License.
             title="Work Effort Type Attribute Entity">
       <field name="workEffortTypeId" type="id-ne"></field>
       <field name="attrName" type="id-long-ne"></field>
+      <field name="description" type="description"></field>
       <prim-key field="workEffortTypeId"/>
       <prim-key field="attrName"/>
       <relation type="one" fk-name="WK_EFFRT_TYPE_ATR" rel-entity-name="WorkEffortType">