OFBiz › OFBiz - Commits

svn commit: r1832235 [6/6] - in /ofbiz/ofbiz-framework/trunk: applications/datamodel/entitydef/ framework/common/entitydef/ framework/entity/entitydef/ framework/entityext/entitydef/ framework/security/entitydef/ framework/service/entitydef/ framework/...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

rishi

svn commit: r1832235 [6/6] - in /ofbiz/ofbiz-framework/trunk: applications/datamodel/entitydef/ framework/common/entitydef/ framework/entity/entitydef/ framework/entityext/entitydef/ framework/security/entitydef/ framework/service/entitydef/ framework/...

Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/shipment-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/shipment-entitymodel.xml?rev=1832235&r1=1832234&r2=1832235&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/shipment-entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/shipment-entitymodel.xml Fri May 25 12:19:07 2018
@@ -43,7 +43,7 @@ under the License.

<entity entity-name="ItemIssuance"
package-name="org.apache.ofbiz.shipment.issuance"
- title="Item Issuance Entity">
+ title="Item Issuance">
<field name="itemIssuanceId" type="id"></field>
<field name="orderId" type="id"></field>
<field name="orderItemSeqId" type="id"></field>
@@ -127,7 +127,7 @@ under the License.
</view-entity>
<entity entity-name="ItemIssuanceRole"
package-name="org.apache.ofbiz.shipment.issuance"
- title="Item Issuance Role Entity">
+ title="Item Issuance Role">
<field name="itemIssuanceId" type="id"></field>
<field name="partyId" type="id"></field>
<field name="roleTypeId" type="id"></field>
@@ -152,7 +152,7 @@ under the License.

<entity entity-name="Picklist"
package-name="org.apache.ofbiz.shipment.picklist"
- title="Picklist Entity">
+ title="Picklist">
<field name="picklistId" type="id"></field>
<field name="description" type="description"></field>
<field name="facilityId" type="id"></field>
@@ -177,7 +177,7 @@ under the License.
</entity>
<view-entity entity-name="PicklistAndBinAndItem"
package-name="org.apache.ofbiz.shipment.picklist"
- title="Picklist and PicklistBin and PicklistItem View Entity">
+ title="Picklist and PicklistBin and PicklistItem View">
<member-entity entity-alias="PL" entity-name="Picklist"/>
<member-entity entity-alias="PLB" entity-name="PicklistBin"/>
<member-entity entity-alias="PLI" entity-name="PicklistItem"/>
@@ -193,7 +193,7 @@ under the License.
</view-entity>
<entity entity-name="PicklistBin"
package-name="org.apache.ofbiz.shipment.picklist"
- title="Picklist Entity">
+ title="Picklist">

<field name="picklistBinId" type="id"></field>
<field name="picklistId" type="id"></field>
@@ -214,7 +214,7 @@ under the License.
</entity>
<entity entity-name="PicklistItem"
package-name="org.apache.ofbiz.shipment.picklist"
- title="Picklist Entity">
+ title="Picklist">
<field name="picklistBinId" type="id"></field>
<field name="orderId" type="id"></field>
<field name="orderItemSeqId" type="id"></field>
@@ -266,7 +266,7 @@ under the License.
</entity>
<view-entity entity-name="PicklistItemAndBin"
package-name="org.apache.ofbiz.shipment.picklist"
- title="Picklist Item and Bin View Entity">
+ title="Picklist Item and Bin View">
<member-entity entity-alias="PB" entity-name="PicklistBin"/>
<member-entity entity-alias="PIM" entity-name="PicklistItem"/>
<alias-all entity-alias="PB"/>
@@ -277,7 +277,7 @@ under the License.
</view-entity>
<entity entity-name="PicklistRole"
package-name="org.apache.ofbiz.shipment.picklist"
- title="Picklist Role Entity">
+ title="Picklist Role">
<field name="picklistId" type="id"></field>
<field name="partyId" type="id"></field>
<field name="roleTypeId" type="id"></field>
@@ -311,7 +311,7 @@ under the License.
</entity>
<entity entity-name="PicklistStatusHistory"
package-name="org.apache.ofbiz.shipment.picklist"
- title="Picklist Status History Entity">
+ title="Picklist Status History">
<field name="picklistId" type="id"></field>
<field name="changeDate" type="date-time"></field>
<field name="changeUserLoginId" type="id-vlong"></field>
@@ -345,14 +345,14 @@ under the License.
<entity entity-name="RejectionReason"
package-name="org.apache.ofbiz.shipment.receipt"
default-resource-name="ProductEntityLabels"
- title="Rejection Reason Entity">
+ title="Rejection Reason">
<field name="rejectionId" type="id"></field>
<field name="description" type="description"></field>
<prim-key field="rejectionId"/>
</entity>
<entity entity-name="ShipmentReceipt"
package-name="org.apache.ofbiz.shipment.receipt"
- title="Shipment Receipt Entity">
+ title="Shipment Receipt">
<field name="receiptId" type="id"></field>
<field name="inventoryItemId" type="id"></field>
<field name="productId" type="id"></field>
@@ -407,7 +407,7 @@ under the License.
</entity>
<entity entity-name="ShipmentReceiptRole"
package-name="org.apache.ofbiz.shipment.receipt"
- title="Shipment Receipt Role Entity">
+ title="Shipment Receipt Role">
<field name="receiptId" type="id"></field>
<field name="partyId" type="id"></field>
<field name="roleTypeId" type="id"></field>
@@ -427,7 +427,7 @@ under the License.
</entity>
<view-entity entity-name="ShipmentReceiptAndItem"
package-name="org.apache.ofbiz.shipment.shipment"
- title="ShipmentReceipt And Inventory Item View Entity">
+ title="ShipmentReceipt And Inventory Item View">
<member-entity entity-alias="SR" entity-name="ShipmentReceipt"/>
<member-entity entity-alias="II" entity-name="InventoryItem"/>
<alias-all entity-alias="SR"/>
@@ -448,7 +448,7 @@ under the License.

<view-entity entity-name="CarrierAndShipmentMethod"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Carrier And Shipment Method Type View Entity">
+ title="Carrier And Shipment Method Type View">
<member-entity entity-alias="CS" entity-name="CarrierShipmentMethod"/>
<member-entity entity-alias="SM" entity-name="ShipmentMethodType"/>
<alias entity-alias="CS" name="shipmentMethodTypeId"/>
@@ -462,7 +462,7 @@ under the License.
</view-entity>
<entity entity-name="CarrierShipmentMethod"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Carrier Shipment Method Entity">
+ title="Carrier Shipment Method">
<field name="shipmentMethodTypeId" type="id"></field>
<field name="partyId" type="id"></field>
<field name="roleTypeId" type="id"></field>
@@ -484,7 +484,7 @@ under the License.
</entity>
<entity entity-name="CarrierShipmentBoxType"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Carrier Shipment Method Entity">
+ title="Carrier Shipment Method">
<field name="shipmentBoxTypeId" type="id"></field>
<field name="partyId" type="id"></field>
<field name="packagingTypeCode" type="id"></field>
@@ -500,7 +500,7 @@ under the License.
</entity>
<entity entity-name="Delivery"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Delivery Entity">
+ title="Delivery">
<field name="deliveryId" type="id"></field>
<field name="originFacilityId" type="id"></field>
<field name="destFacilityId" type="id"></field>
@@ -525,7 +525,7 @@ under the License.
</entity>
<view-entity entity-name="OrderShipmentInfoSummary"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Order Shipment Information View Entity">
+ title="Order Shipment Information View">
<description>This view is meant for getting all tracking information for all shipments associated with an order, it does not include information to determine which packages in a given shipment correspond to that order, or to determine what information applies to each line item of the order.</description>
<member-entity entity-alias="II" entity-name="ItemIssuance"/>
<member-entity entity-alias="SRS" entity-name="ShipmentRouteSegment"/>
@@ -554,7 +554,7 @@ under the License.
</view-entity>
<entity entity-name="Shipment"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Shipment Entity">
+ title="Shipment">
<field name="shipmentId" type="id"></field>
<field name="shipmentTypeId" type="id"></field>
<field name="statusId" type="id"></field>
@@ -665,7 +665,7 @@ under the License.
</entity>
<view-entity entity-name="ShipmentAndItem"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Shipment and Item View Entity">
+ title="Shipment and Item View">
<member-entity entity-alias="SH" entity-name="Shipment"/>
<member-entity entity-alias="SITM" entity-name="ShipmentItem"/>
<alias entity-alias="SH" name="shipmentId"/>
@@ -701,7 +701,7 @@ under the License.
</view-entity>
<entity entity-name="ShipmentAttribute"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Shipment Attribute Entity">
+ title="Shipment Attribute">
<field name="shipmentId" type="id"></field>
<field name="attrName" type="id-long"></field>
<field name="attrValue" type="value"></field>
@@ -717,7 +717,7 @@ under the License.
</entity>
<entity entity-name="ShipmentBoxType"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Shipment Contact Mechanism Type Entity">
+ title="Shipment Contact Mechanism Type">
<field name="shipmentBoxTypeId" type="id"></field>
<field name="description" type="description"></field>
<field name="dimensionUomId" type="id"></field>
@@ -736,7 +736,7 @@ under the License.
</entity>
<entity entity-name="ShipmentContactMech"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Shipment Contact Mechanism Entity">
+ title="Shipment Contact Mechanism">
<field name="shipmentId" type="id"></field>
<field name="shipmentContactMechTypeId" type="id"></field>
<field name="contactMechId" type="id"></field>
@@ -754,14 +754,14 @@ under the License.
</entity>
<entity entity-name="ShipmentContactMechType"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Shipment Contact Mechanism Type Entity">
+ title="Shipment Contact Mechanism Type">
<field name="shipmentContactMechTypeId" type="id"></field>
<field name="description" type="description"></field>
<prim-key field="shipmentContactMechTypeId"/>
</entity>
<entity entity-name="ShipmentCostEstimate"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Shipment Cost Estimate Entity">
+ title="Shipment Cost Estimate">
<field name="shipmentCostEstimateId" type="id"></field>
<field name="shipmentMethodTypeId" type="id"></field>
<field name="carrierPartyId" type="id"></field>
@@ -948,7 +948,7 @@ under the License.
</entity>
<entity entity-name="ShipmentItem"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Shipment Item Entity">
+ title="Shipment Item">
<field name="shipmentId" type="id"></field>
<field name="shipmentItemSeqId" type="id"></field>
<field name="productId" type="id"></field>
@@ -965,7 +965,7 @@ under the License.
</entity>
<entity entity-name="ShipmentItemBilling"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Shipment Item Billing Entity">
+ title="Shipment Item Billing">
<field name="shipmentId" type="id"></field>
<field name="shipmentItemSeqId" type="id"></field>
<field name="invoiceId" type="id"></field>
@@ -991,7 +991,7 @@ under the License.
</entity>
<entity entity-name="ShipmentItemFeature"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Shipment Item Feature Entity">
+ title="Shipment Item Feature">
<field name="shipmentId" type="id"></field>
<field name="shipmentItemSeqId" type="id"></field>
<field name="productFeatureId" type="id"></field>
@@ -1011,7 +1011,7 @@ under the License.
</entity>
<view-entity entity-name="ShipmentManifestView"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Shipment Manifest View Entity">
+ title="Shipment Manifest View">
<member-entity entity-alias="SITM" entity-name="ShipmentItem"/>
<member-entity entity-alias="PROD" entity-name="Product"/>
<member-entity entity-alias="ITMI" entity-name="ItemIssuance"/>
@@ -1153,7 +1153,7 @@ under the License.
</view-entity>
<entity entity-name="ShipmentMethodType"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Shipment Method Type Entity">
+ title="Shipment Method Type">
<field name="shipmentMethodTypeId" type="id"></field>
<field name="description" type="description"></field>
<field name="sequenceNum" type="numeric"></field>
@@ -1161,7 +1161,7 @@ under the License.
</entity>
<entity entity-name="ShipmentPackage"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Shipment Package Entity">
+ title="Shipment Package">
<field name="shipmentId" type="id"></field>
<field name="shipmentPackageSeqId" type="id"></field>
<field name="shipmentBoxTypeId" type="id"></field>
@@ -1193,7 +1193,7 @@ under the License.
</entity>
<entity entity-name="ShipmentPackageContent"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Shipment Package Content Entity">
+ title="Shipment Package Content">
<field name="shipmentId" type="id"></field>
<field name="shipmentPackageSeqId" type="id"></field>
<field name="shipmentItemSeqId" type="id"></field>
@@ -1220,7 +1220,7 @@ under the License.
</entity>
<entity entity-name="ShipmentPackageRouteSeg"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Shipment Package Route Segment Entity">
+ title="Shipment Package Route Segment">
<field name="shipmentId" type="id"></field>
<field name="shipmentPackageSeqId" type="id"></field>
<field name="shipmentRouteSegmentId" type="id"></field>
@@ -1257,7 +1257,7 @@ under the License.
</entity>
<entity entity-name="ShipmentRouteSegment"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Shipment Route Segment Entity">
+ title="Shipment Route Segment">
<field name="shipmentId" type="id"></field>
<field name="shipmentRouteSegmentId" type="id"></field>
<field name="deliveryId" type="id"></field>
@@ -1350,7 +1350,7 @@ under the License.
</entity>
<view-entity entity-name="ShipmentPackageRouteDetail"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Shipment Package Route Detail View Entity">
+ title="Shipment Package Route Detail View">
<description>View to list information about individual packages with route information, for getting the carrier labels for a package.</description>
<member-entity entity-alias="SPRS" entity-name="ShipmentPackageRouteSeg"/>
<member-entity entity-alias="SRS" entity-name="ShipmentRouteSegment"/>
@@ -1375,7 +1375,7 @@ under the License.
</view-entity>
<view-entity entity-name="ShipmentRouteSegmentDetail"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Shipment Route Segment Detail View Entity">
+ title="Shipment Route Segment Detail View">
<description>View to list a shipment route segment with extra shipment information, for scheduling shipment route segments</description>
<member-entity entity-alias="SRS" entity-name="ShipmentRouteSegment"/>
<member-entity entity-alias="S" entity-name="Shipment"/>
@@ -1395,7 +1395,7 @@ under the License.
</view-entity>
<entity entity-name="ShipmentStatus"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Shipment Status Entity">
+ title="Shipment Status">
<field name="statusId" type="id"></field>
<field name="shipmentId" type="id"></field>
<field name="statusDate" type="date-time"></field>
@@ -1415,7 +1415,7 @@ under the License.
<entity entity-name="ShipmentType"
package-name="org.apache.ofbiz.shipment.shipment"
default-resource-name="ProductEntityLabels"
- title="Shipment Type Entity">
+ title="Shipment Type">
<field name="shipmentTypeId" type="id"></field>
<field name="parentTypeId" type="id"></field>
<field name="hasTable" type="indicator"></field>
@@ -1427,7 +1427,7 @@ under the License.
</entity>
<entity entity-name="ShipmentTypeAttr"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Shipment Type Attribute Entity">
+ title="Shipment Type Attribute">
<field name="shipmentTypeId" type="id"></field>
<field name="attrName" type="id-long"></field>
<field name="description" type="description"></field>
@@ -1445,7 +1445,7 @@ under the License.
</entity>
<entity entity-name="ShippingDocument"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Shipping Document Entity">
+ title="Shipping Document">
<field name="documentId" type="id"></field>
<field name="shipmentId" type="id"></field>
<field name="shipmentItemSeqId" type="id"></field>
@@ -1467,7 +1467,7 @@ under the License.

<view-entity entity-name="PackedQtyVsOrderItemQuantity"
package-name="org.apache.ofbiz.shipment.shipment"
- title="Shipment Route Segment Detail View Entity">
+ title="Shipment Route Segment Detail View">
<description>View to report ShipmentPackageContent quantity vs. OrderItem quantity via
ItemIssuance</description>
<member-entity entity-alias="SPC" entity-name="ShipmentPackageContent"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/workeffort-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/workeffort-entitymodel.xml?rev=1832235&r1=1832234&r2=1832235&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/workeffort-entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/workeffort-entitymodel.xml Fri May 25 12:19:07 2018
@@ -41,7 +41,7 @@ under the License.

<entity entity-name="TimeEntry"
package-name="org.apache.ofbiz.workeffort.timesheet"
- title="Time Entry Entity">
+ title="Time Entry">
<field name="timeEntryId" type="id"></field>
<field name="partyId" type="id"></field>
<field name="fromDate" type="date-time"></field>
@@ -76,7 +76,7 @@ under the License.
</entity>
<entity entity-name="Timesheet"
package-name="org.apache.ofbiz.workeffort.timesheet"
- title="Timesheet Entity">
+ title="Timesheet">
<field name="timesheetId" type="id"></field>
<field name="partyId" type="id"></field>
<field name="clientPartyId" type="id"></field>
@@ -101,7 +101,7 @@ under the License.
</entity>
<entity entity-name="TimesheetRole"
package-name="org.apache.ofbiz.workeffort.timesheet"
- title="Timesheet Role Entity">
+ title="Timesheet Role">
<field name="timesheetId" type="id"></field>
<field name="partyId" type="id"></field>
<field name="roleTypeId" type="id"></field>
@@ -129,7 +129,7 @@ under the License.

<entity entity-name="ApplicationSandbox"
package-name="org.apache.ofbiz.workeffort.workeffort"
- title="WorkEffort Application Sandbox Entity">
+ title="WorkEffort Application Sandbox">
<field name="applicationId" type="id"></field>
<field name="workEffortId" type="id"></field>
<field name="partyId" type="id"></field>
@@ -149,7 +149,7 @@ under the License.
</entity>
<entity entity-name="CommunicationEventWorkEff"
package-name="org.apache.ofbiz.workeffort.workeffort"
- title="Communication Event Work Effort Entity">
+ title="Communication Event Work Effort">
<field name="workEffortId" type="id"></field>
<field name="communicationEventId" type="id"></field>
<field name="description" type="description"></field>
@@ -164,7 +164,7 @@ under the License.
</entity>
<entity entity-name="Deliverable"
package-name="org.apache.ofbiz.workeffort.workeffort"
- title="Deliverable Entity">
+ title="Deliverable">
<field name="deliverableId" type="id"></field>
<field name="deliverableTypeId" type="id"></field>
<field name="deliverableName" type="name"></field>
@@ -176,14 +176,14 @@ under the License.
</entity>
<entity entity-name="DeliverableType"
package-name="org.apache.ofbiz.workeffort.workeffort"
- title="Deliverable Type Entity">
+ title="Deliverable Type">
<field name="deliverableTypeId" type="id"></field>
<field name="description" type="description"></field>
<prim-key field="deliverableTypeId"/>
</entity>
<entity entity-name="WorkEffort"
package-name="org.apache.ofbiz.workeffort.workeffort"
- title="Work Effort Entity">
+ title="Work Effort">
<field name="workEffortId" type="id"></field>
<field name="workEffortTypeId" type="id"></field>
<field name="currentStatusId" type="id"></field>
@@ -287,7 +287,7 @@ under the License.
</entity>
<entity entity-name="WorkEffortAssoc"
package-name="org.apache.ofbiz.workeffort.workeffort"
- title="Work Effort Association Entity">
+ title="Work Effort Association">
<field name="workEffortIdFrom" type="id"></field>
<field name="workEffortIdTo" type="id"></field>
<field name="workEffortAssocTypeId" type="id"></field>
@@ -313,7 +313,7 @@ under the License.
</entity>
<entity entity-name="WorkEffortAssocAttribute"
package-name="org.apache.ofbiz.workeffort.workeffort"
- title="Work Effort Association Attribute Entity">
+ title="Work Effort Association Attribute">
<field name="workEffortIdFrom" type="id"></field>
<field name="workEffortIdTo" type="id"></field>
<field name="workEffortAssocTypeId" type="id"></field>
@@ -338,7 +338,7 @@ under the License.
<entity entity-name="WorkEffortAssocType"
package-name="org.apache.ofbiz.workeffort.workeffort"
default-resource-name="WorkEffortEntityLabels"
- title="Work Effort Association Type Entity">
+ title="Work Effort Association Type">
<field name="workEffortAssocTypeId" type="id"></field>
<field name="parentTypeId" type="id"></field>
<field name="hasTable" type="indicator"></field>
@@ -351,7 +351,7 @@ under the License.
<entity entity-name="WorkEffortAssocTypeAttr"
package-name="org.apache.ofbiz.workeffort.workeffort"
default-resource-name="WorkEffortEntityLabels"
- title="Work Effort Association Type Attribute Entity">
+ title="Work Effort Association Type Attribute">
<field name="workEffortAssocTypeId" type="id"></field>
<field name="attrName" type="id-long"></field>
<field name="description" type="description"></field>
@@ -369,7 +369,7 @@ under the License.
</entity>
<entity entity-name="WorkEffortAttribute"
package-name="org.apache.ofbiz.workeffort.workeffort"
- title="Work Effort Attribute Entity">
+ title="Work Effort Attribute">
<field name="workEffortId" type="id"></field>
<field name="attrName" type="id-long"></field>
<field name="attrValue" type="value"></field>
@@ -385,7 +385,7 @@ under the License.
</entity>
<entity entity-name="WorkEffortBilling"
package-name="org.apache.ofbiz.workeffort.workeffort"
- title="Work Effort Billing Entity">
+ title="Work Effort Billing">
<field name="workEffortId" type="id"></field>
<field name="invoiceId" type="id"></field>
<field name="invoiceItemSeqId" type="id"></field>
@@ -406,7 +406,7 @@ under the License.
</entity>
<entity entity-name="WorkEffortContactMech" table-name="WORK_EFFORT_CONTACT_MECH_NEW"
package-name="org.apache.ofbiz.workeffort.workeffort"
- title="WorkEffort Contact Mechanism Entity">
+ title="WorkEffort Contact Mechanism">
<field name="workEffortId" type="id"></field>
<field name="contactMechId" type="id"></field>
<field name="fromDate" type="date-time"></field>
@@ -425,7 +425,7 @@ under the License.
<key-map field-name="contactMechId"/>
</relation>
</entity>
- <entity entity-name="WorkEffortContent" package-name="org.apache.ofbiz.workeffort.workeffort" title="WorkEffort Content Entity">
+ <entity entity-name="WorkEffortContent" package-name="org.apache.ofbiz.workeffort.workeffort" title="WorkEffort Content">
<field name="workEffortId" type="id"></field>
<field name="contentId" type="id"></field>
<field name="workEffortContentTypeId" type="id"></field>
@@ -445,7 +445,7 @@ under the License.
<key-map field-name="workEffortContentTypeId"/>
</relation>
</entity>
- <entity entity-name="WorkEffortContentType" package-name="org.apache.ofbiz.workeffort.workeffort" title="WorkEffort Content Type Entity">
+ <entity entity-name="WorkEffortContentType" package-name="org.apache.ofbiz.workeffort.workeffort" title="WorkEffort Content Type">
<field name="workEffortContentTypeId" type="id"></field>
<field name="parentTypeId" type="id"></field>
<field name="description" type="description"></field>
@@ -456,7 +456,7 @@ under the License.
</entity>
<entity entity-name="WorkEffortDeliverableProd"
package-name="org.apache.ofbiz.workeffort.workeffort"
- title="Work Effort Deliverable Produced Entity">
+ title="Work Effort Deliverable Produced">
<field name="workEffortId" type="id"></field>
<field name="deliverableId" type="id"></field>
<prim-key field="workEffortId"/>
@@ -470,7 +470,7 @@ under the License.
</entity>
<entity entity-name="WorkEffortEventReminder"
package-name="org.apache.ofbiz.workeffort.workeffort"
- title="Work Effort Event Reminder Entity">
+ title="Work Effort Event Reminder">
<field name="workEffortId" type="id"></field>
<field name="sequenceId" type="id"></field>
<field name="contactMechId" type="id"></field>
@@ -502,7 +502,7 @@ under the License.
</entity>
<entity entity-name="WorkEffortFixedAssetAssign"
package-name="org.apache.ofbiz.workeffort.workeffort"
- title="Work Effort Fixed Asset Assignment Entity">
+ title="Work Effort Fixed Asset Assignment">
<field name="workEffortId" type="id"></field>
<field name="fixedAssetId" type="id"></field>
<field name="statusId" type="id"></field>
@@ -529,7 +529,7 @@ under the License.
</entity>
<entity entity-name="WorkEffortFixedAssetStd"
package-name="org.apache.ofbiz.workeffort.workeffort"
- title="Work Effort Fixed Asset Standard Entity">
+ title="Work Effort Fixed Asset Standard">
<field name="workEffortId" type="id"></field>
<field name="fixedAssetTypeId" type="id"></field>
<field name="estimatedQuantity" type="floating-point"></field>
@@ -544,7 +544,7 @@ under the License.
<key-map field-name="fixedAssetTypeId"/>
</relation>
</entity>
- <entity entity-name="WorkEffortGoodStandard" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Good Standard Entity">
+ <entity entity-name="WorkEffortGoodStandard" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Good Standard">
<field name="workEffortId" type="id"></field>
<field name="productId" type="id"></field>
<field name="workEffortGoodStdTypeId" type="id"></field>
@@ -572,7 +572,7 @@ under the License.
</entity>
<entity entity-name="WorkEffortGoodStandardType"
package-name="org.apache.ofbiz.workeffort.workeffort"
- title="Work Effort Good Standard Type Entity">
+ title="Work Effort Good Standard Type">
<field name="workEffortGoodStdTypeId" type="id"></field>
<field name="parentTypeId" type="id"></field>
<field name="hasTable" type="indicator"></field>
@@ -596,7 +596,7 @@ under the License.
</entity>
<entity entity-name="WorkEffortInventoryAssign"
package-name="org.apache.ofbiz.workeffort.workeffort"
- title="Work Effort Inventory Assignment Entity">
+ title="Work Effort Inventory Assignment">
<field name="workEffortId" type="id"></field>
<field name="inventoryItemId" type="id"></field>
<field name="statusId" type="id"></field>
@@ -615,7 +615,7 @@ under the License.
</entity>
<entity entity-name="WorkEffortInventoryProduced"
package-name="org.apache.ofbiz.workeffort.workeffort"
- title="Work Effort Inventory Produced Entity">
+ title="Work Effort Inventory Produced">
<field name="workEffortId" type="id"></field>
<field name="inventoryItemId" type="id"></field>
<prim-key field="workEffortId"/>
@@ -630,7 +630,7 @@ under the License.

<entity entity-name="WorkEffortCostCalc"
package-name="org.apache.ofbiz.workeffort.workeffort"
- title="Work Effort Cost Calculation Entity">
+ title="Work Effort Cost Calculation">
<field name="workEffortId" type="id"></field>
<field name="costComponentTypeId" type="id"></field>
<field name="costComponentCalcId" type="id"></field>
@@ -650,7 +650,7 @@ under the License.
</relation>
</entity>

- <entity entity-name="WorkEffortKeyword" package-name="org.apache.ofbiz.workeffort.workeffort" title="WorkEffort Keyword Entity" never-cache="true">
+ <entity entity-name="WorkEffortKeyword" package-name="org.apache.ofbiz.workeffort.workeffort" title="WorkEffort Keyword" never-cache="true">
<field name="workEffortId" type="id"></field>
<field name="keyword" type="short-varchar"></field>
<field name="relevancyWeight" type="numeric"></field>
@@ -665,7 +665,7 @@ under the License.
</entity>
<entity entity-name="WorkEffortNote"
package-name="org.apache.ofbiz.workeffort.workeffort"
- title="Work Effort Note Entity">
+ title="Work Effort Note">
<field name="workEffortId" type="id"></field>
<field name="noteId" type="id"></field>
<field name="internalNote" type="indicator"></field>
@@ -678,7 +678,7 @@ under the License.
<key-map field-name="noteId"/>
</relation>
</entity>
- <entity entity-name="WorkEffortPartyAssignment" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Party Assignment Entity">
+ <entity entity-name="WorkEffortPartyAssignment" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Party Assignment">
<field name="workEffortId" type="id"></field>
<field name="partyId" type="id"></field>
<field name="roleTypeId" type="id"></field>
@@ -729,7 +729,7 @@ under the License.
<key-map field-name="availabilityStatusId" rel-field-name="statusId"/>
</relation>
</entity>
- <entity entity-name="WorkEffortPurposeType" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Purpose Type Entity"
+ <entity entity-name="WorkEffortPurposeType" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Purpose Type"
default-resource-name="WorkEffortEntityLabels">
<field name="workEffortPurposeTypeId" type="id"></field>
<field name="parentTypeId" type="id"></field>
@@ -739,7 +739,7 @@ under the License.
<key-map field-name="parentTypeId" rel-field-name="workEffortPurposeTypeId"/>
</relation>
</entity>
- <entity entity-name="WorkEffortReview" package-name="org.apache.ofbiz.workeffort.workeffort" title="WorkEffort Review Entity">
+ <entity entity-name="WorkEffortReview" package-name="org.apache.ofbiz.workeffort.workeffort" title="WorkEffort Review">
<field name="workEffortId" type="id"></field>
<field name="userLoginId" type="id-vlong"></field>
<field name="reviewDate" type="date-time"></field>
@@ -760,7 +760,7 @@ under the License.
<key-map field-name="statusId"/>
</relation>
</entity>
- <entity entity-name="WorkEffortSearchConstraint" package-name="org.apache.ofbiz.workeffort.workeffort" never-cache="true" title="WorkEffort Search Result Constraint Entity">
+ <entity entity-name="WorkEffortSearchConstraint" package-name="org.apache.ofbiz.workeffort.workeffort" never-cache="true" title="WorkEffort Search Result Constraint">
<field name="workEffortSearchResultId" type="id"></field>
<field name="constraintSeqId" type="id"></field>
<field name="constraintName" type="long-varchar"></field>
@@ -778,7 +778,7 @@ under the License.
<key-map field-name="workEffortSearchResultId"/>
</relation>
</entity>
- <entity entity-name="WorkEffortSearchResult" package-name="org.apache.ofbiz.workeffort.workeffort" never-cache="true" title="WorkEffort Search Result Entity">
+ <entity entity-name="WorkEffortSearchResult" package-name="org.apache.ofbiz.workeffort.workeffort" never-cache="true" title="WorkEffort Search Result">
<field name="workEffortSearchResultId" type="id"></field>
<field name="visitId" type="id"></field>
<field name="orderByName" type="long-varchar"></field>
@@ -790,7 +790,7 @@ under the License.
</entity>
<entity entity-name="WorkEffortSkillStandard"
package-name="org.apache.ofbiz.workeffort.workeffort"
- title="Work Effort Skill Standard Entity">
+ title="Work Effort Skill Standard">
<field name="workEffortId" type="id"></field>
<field name="skillTypeId" type="id"></field>
<field name="estimatedNumPeople" type="floating-point"></field>
@@ -807,7 +807,7 @@ under the License.
</entity>
<entity entity-name="WorkEffortStatus"
package-name="org.apache.ofbiz.workeffort.workeffort"
- title="Work Effort Status Entity">
+ title="Work Effort Status">
<field name="workEffortId" type="id"></field>
<field name="statusId" type="id"></field>
<field name="statusDatetime" type="date-time"></field>
@@ -828,7 +828,7 @@ under the License.
</entity>
<entity entity-name="WorkEffortTransBox"
package-name="org.apache.ofbiz.workeffort.workeffort"
- title="Work Effort Transition Box Entity">
+ title="Work Effort Transition Box">
<field name="processWorkEffortId" type="id"></field>
<field name="toActivityId" type="id-long"></field>
<field name="transitionId" type="id-long"></field>
@@ -842,7 +842,7 @@ under the License.
<entity entity-name="WorkEffortType"
package-name="org.apache.ofbiz.workeffort.workeffort"
default-resource-name="WorkEffortEntityLabels"
- title="Work Effort Type Entity">
+ title="Work Effort Type">
<field name="workEffortTypeId" type="id"></field>
<field name="parentTypeId" type="id"></field>
<field name="hasTable" type="indicator"></field>
@@ -854,7 +854,7 @@ under the License.
</entity>
<entity entity-name="WorkEffortTypeAttr"
package-name="org.apache.ofbiz.workeffort.workeffort"
- title="Work Effort Type Attribute Entity">
+ title="Work Effort Type Attribute">
<field name="workEffortTypeId" type="id"></field>
<field name="attrName" type="id-long"></field>
<field name="description" type="description"></field>
@@ -872,7 +872,7 @@ under the License.
</entity>
<entity entity-name="WorkEffortSurveyAppl"
package-name="org.apache.ofbiz.workeffort.workeffort"
- title="Work Effort Survey Appl Entity">
+ title="Work Effort Survey Appl">
<field name="workEffortId" type="id"/>
<field name="surveyId" type="id"/>
<field name="fromDate" type="date-time"></field>

Modified: ofbiz/ofbiz-framework/trunk/framework/common/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/entitydef/entitymodel.xml?rev=1832235&r1=1832234&r2=1832235&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/entitydef/entitymodel.xml Fri May 25 12:19:07 2018
@@ -52,7 +52,7 @@ under the License.
<entity entity-name="DataSource"
package-name="org.apache.ofbiz.common.datasource"
default-resource-name="CommonEntityLabels"
- title="Data Source Entity">
+ title="Data Source">
<field name="dataSourceId" type="id"></field>
<field name="dataSourceTypeId" type="id"></field>
<field name="description" type="description"></field>
@@ -63,7 +63,7 @@ under the License.
</entity>
<entity entity-name="DataSourceType"
package-name="org.apache.ofbiz.common.datasource"
- title="Data Source Type Entity">
+ title="Data Source Type">
<field name="dataSourceTypeId" type="id"></field>
<field name="description" type="description"></field>
<prim-key field="dataSourceTypeId"/>
@@ -73,7 +73,7 @@ under the License.



- <entity entity-name="EmailTemplateSetting" package-name="org.apache.ofbiz.common.email" title="Email Template Setting Entity">
+ <entity entity-name="EmailTemplateSetting" package-name="org.apache.ofbiz.common.email" title="Email Template Setting">
<field name="emailTemplateSettingId" type="id"></field>
<field name="emailType" type="id"></field>
<field name="description" type="description"></field>
@@ -97,7 +97,7 @@ under the License.
<entity entity-name="Enumeration"
package-name="org.apache.ofbiz.common.enum"
default-resource-name="CommonEntityLabels"
- title="Enumeration Entity">
+ title="Enumeration">
<field name="enumId" type="id"></field>
<field name="enumTypeId" type="id"></field>
<field name="enumCode" type="short-varchar"></field>
@@ -111,7 +111,7 @@ under the License.
<entity entity-name="EnumerationType"
package-name="org.apache.ofbiz.common.enum"
default-resource-name="CommonEntityLabels"
- title="Enumeration Type Entity">
+ title="Enumeration Type">
<field name="enumTypeId" type="id"></field>
<field name="parentTypeId" type="id"></field>
<field name="hasTable" type="indicator"></field>
@@ -147,7 +147,7 @@ under the License.
<entity entity-name="CountryCapital"
package-name="org.apache.ofbiz.common.geo"
dependent-on="CountryCode"
- title="Country Capital Entity">
+ title="Country Capital">
<field name="countryCode" type="id"></field>
<field name="countryCapital" type="description"></field>
<prim-key field="countryCode"/>
@@ -157,7 +157,7 @@ under the License.
</entity>
<entity entity-name="CountryCode"
package-name="org.apache.ofbiz.common.geo"
- title="ISO Country Code Entity">
+ title="ISO Country Code">
<field name="countryCode" type="id"></field>
<field name="countryAbbr" type="short-varchar"></field>
<field name="countryNumber" type="short-varchar"></field>
@@ -167,7 +167,7 @@ under the License.
<entity entity-name="CountryTeleCode"
package-name="org.apache.ofbiz.common.geo"
dependent-on="CountryCode"
- title="Telephone Country Code Entity">
+ title="Telephone Country Code">
<field name="countryCode" type="id"></field>
<field name="teleCode" type="short-varchar"></field>
<prim-key field="countryCode"/>
@@ -206,7 +206,7 @@ under the License.
</entity>
<entity entity-name="Geo" package-name="org.apache.ofbiz.common.geo"
default-resource-name="CommonEntityLabels"
- title="Geographic Boundary Entity">
+ title="Geographic Boundary">
<field name="geoId" type="id"></field>
<field name="geoTypeId" type="id"></field>
<field name="geoName" type="name"></field>
@@ -220,7 +220,7 @@ under the License.
</relation>
</entity>
<entity entity-name="GeoAssoc" package-name="org.apache.ofbiz.common.geo"
- title="Geographic Boundary Association Entity">
+ title="Geographic Boundary Association">
<field name="geoId" type="id">
<description>The enclosed geo</description>
</field>
@@ -275,7 +275,7 @@ under the License.
</view-link>
</view-entity>
<entity entity-name="GeoAssocType" package-name="org.apache.ofbiz.common.geo"
- title="Geographic Boundary Association Entity" default-resource-name="CommonEntityLabels">
+ title="Geographic Boundary Association" default-resource-name="CommonEntityLabels">
<field name="geoAssocTypeId" type="id"></field>
<field name="description" type="description"></field>
<prim-key field="geoAssocTypeId"/>
@@ -303,7 +303,7 @@ under the License.
</relation>
</entity>
<entity entity-name="GeoType" package-name="org.apache.ofbiz.common.geo" default-resource-name="CommonEntityLabels"
- title="Geographic Boundary Type Entity">
+ title="Geographic Boundary Type">
<field name="geoTypeId" type="id"></field>
<field name="parentTypeId" type="id"></field>
<field name="hasTable" type="indicator"></field>
@@ -357,7 +357,7 @@ under the License.
<entity entity-name="CustomMethod"
package-name="org.apache.ofbiz.common.method"
default-resource-name="CommonEntityLabels"
- title="Custom Method Entity">
+ title="Custom Method">
<field name="customMethodId" type="id"></field>
<field name="customMethodTypeId" type="id"></field>
<field name="customMethodName" type="long-varchar"></field>
@@ -369,7 +369,7 @@ under the License.
</entity>
<entity entity-name="CustomMethodType"
package-name="org.apache.ofbiz.common.method"
- title="Custom Method Type Entity">
+ title="Custom Method Type">
<field name="customMethodTypeId" type="id"></field>
<field name="parentTypeId" type="id"></field>
<field name="hasTable" type="indicator"></field>
@@ -386,7 +386,7 @@ under the License.

<entity entity-name="NoteData"
package-name="org.apache.ofbiz.common.note"
- title="Note Data Entity">
+ title="Note Data">
<field name="noteId" type="id"></field>
<field name="noteName" type="name"></field>
<field name="noteInfo" type="very-long"></field>
@@ -400,7 +400,7 @@ under the License.

<entity entity-name="CustomTimePeriod"
package-name="org.apache.ofbiz.common.period"
- title="Custom Time Period Entity">
+ title="Custom Time Period">
<field name="customTimePeriodId" type="id"></field>
<field name="parentPeriodId" type="id"></field>
<field name="periodTypeId" type="id"></field>
@@ -419,7 +419,7 @@ under the License.
</entity>
<entity entity-name="PeriodType"
package-name="org.apache.ofbiz.common.period"
- title="Period Type Entity">
+ title="Period Type">
<field name="periodTypeId" type="id"></field>
<field name="description" type="description"></field>
<field name="periodLength" type="numeric"></field>
@@ -437,7 +437,7 @@ under the License.
<entity entity-name="StatusItem"
package-name="org.apache.ofbiz.common.status"
default-resource-name="CommonEntityLabels"
- title="Status Entity">
+ title="Status">
<field name="statusId" type="id"></field>
<field name="statusTypeId" type="id"></field>
<field name="statusCode" type="short-varchar"></field>
@@ -451,7 +451,7 @@ under the License.
<entity entity-name="StatusType"
package-name="org.apache.ofbiz.common.status"
default-resource-name="CommonEntityLabels"
- title="Status Type Entity">
+ title="Status Type">
<field name="statusTypeId" type="id"></field>
<field name="parentTypeId" type="id"></field>
<field name="hasTable" type="indicator"></field>
@@ -464,7 +464,7 @@ under the License.
<entity entity-name="StatusValidChange"
package-name="org.apache.ofbiz.common.status"
default-resource-name="CommonEntityLabels"
- title="Status Valid Change Entity">
+ title="Status Valid Change">
<field name="statusId" type="id"></field>
<field name="statusIdTo" type="id"></field>
<field name="conditionExpression" type="long-varchar"></field>
@@ -480,7 +480,7 @@ under the License.
</entity>
<view-entity entity-name="StatusValidChangeToDetail"
package-name="org.apache.ofbiz.common.status"
- title="Status Valid Change To Detail View Entity">
+ title="Status Valid Change To Detail View">
<member-entity entity-alias="SVC" entity-name="StatusValidChange"/>
<member-entity entity-alias="SI" entity-name="StatusItem"/>
<alias-all entity-alias="SVC"/>
@@ -507,7 +507,7 @@ under the License.
<entity entity-name="Uom"
package-name="org.apache.ofbiz.common.uom"
default-resource-name="CommonEntityLabels"
- title="Unit Of Measure Entity">
+ title="Unit Of Measure">
<field name="uomId" type="id"></field>
<field name="uomTypeId" type="id"></field>
<field name="abbreviation" type="short-varchar"></field>
@@ -520,7 +520,7 @@ under the License.
</entity>
<view-entity entity-name="UomAndGroup"
package-name="org.apache.ofbiz.common.uom"
- title="Unit Of Measure and Group/Type View Entity">
+ title="Unit Of Measure and Group/Type View">
<member-entity entity-alias="UOMGP" entity-name="UomGroup"/>
<member-entity entity-alias="UOM" entity-name="Uom"/>
<member-entity entity-alias="UOMTP" entity-name="UomType"/>
@@ -536,7 +536,7 @@ under the License.
</view-entity>
<view-entity entity-name="UomAndType"
package-name="org.apache.ofbiz.common.uom"
- title="Unit Of Measure and Type View Entity">
+ title="Unit Of Measure and Type View">
<member-entity entity-alias="UOM" entity-name="Uom"/>
<member-entity entity-alias="UOMTP" entity-name="UomType"/>
<alias-all entity-alias="UOM"/>
@@ -547,7 +547,7 @@ under the License.
</view-entity>
<entity entity-name="UomConversion"
package-name="org.apache.ofbiz.common.uom"
- title="Unit Of Measure Conversion Type Entity">
+ title="Unit Of Measure Conversion Type">
<field name="uomId" type="id"></field>
<field name="uomIdTo" type="id"></field>
<field name="conversionFactor" type="floating-point"></field>
@@ -597,7 +597,7 @@ under the License.
<entity entity-name="UomGroup"
package-name="org.apache.ofbiz.common.uom"
default-resource-name="CommonEntityLabels"
- title="Unit Of Measure Group Entity">
+ title="Unit Of Measure Group">
<field name="uomGroupId" type="id"></field>
<field name="uomId" type="id"></field>
<prim-key field="uomGroupId"/>
@@ -609,7 +609,7 @@ under the License.
<entity entity-name="UomType"
package-name="org.apache.ofbiz.common.uom"
default-resource-name="CommonEntityLabels"
- title="Unit Of Measure Type Entity">
+ title="Unit Of Measure Type">
<field name="uomTypeId" type="id"></field>
<field name="parentTypeId" type="id"></field>
<field name="hasTable" type="indicator"></field>
@@ -665,7 +665,7 @@ under the License.
<entity entity-name="CustomScreen"
package-name="org.apache.ofbiz.common.screen"
default-resource-name="CommonEntityLabels"
- title="Custom Screen Entity">
+ title="Custom Screen">
<field name="customScreenId" type="id"/>
<field name="customScreenTypeId" type="id"/>
<field name="customScreenName" type="long-varchar"/>
@@ -678,7 +678,7 @@ under the License.
</entity>
<entity entity-name="CustomScreenType"
package-name="org.apache.ofbiz.common.screen"
- title="Custom Screen Type Entity">
+ title="Custom Screen Type">
<field name="customScreenTypeId" type="id"/>
<field name="parentTypeId" type="id"/>
<field name="hasTable" type="indicator"/>
@@ -753,7 +753,7 @@ under the License.
<field name="securityMainAction" type="short-varchar"><description>The main action which can be done with this portlet, possible values: CREATE UPDATE VIEW DELETE</description></field>
<prim-key field="portalPortletId"/>
</entity>
- <entity entity-name="PortletCategory" package-name="org.apache.ofbiz.common.portal" title="Portlet Category Entity">
+ <entity entity-name="PortletCategory" package-name="org.apache.ofbiz.common.portal" title="Portlet Category">
<field name="portletCategoryId" type="id"/>
<field name="description" type="description"/>
<prim-key field="portletCategoryId"/>

Modified: ofbiz/ofbiz-framework/trunk/framework/entity/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/entitydef/entitymodel.xml?rev=1832235&r1=1832234&r2=1832235&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/entitydef/entitymodel.xml Fri May 25 12:19:07 2018
@@ -48,12 +48,12 @@ under the License.
<field name="changedSessionInfo" type="long-varchar"><description>This should contain whatever information is available about the session during which the value was changed. This could be a visitId, but could be something else too, so there is no foreign key.</description></field>
<prim-key field="auditHistorySeqId"/>
</entity>
- <entity entity-name="EntityKeyStore" package-name="org.apache.ofbiz.entity.crypto" title="Entity Key Store Entity">
+ <entity entity-name="EntityKeyStore" package-name="org.apache.ofbiz.entity.crypto" title="Entity Key Store">
<field name="keyName" type="id-vlong"></field>
<field name="keyText" type="long-varchar"></field>
<prim-key field="keyName"/>
</entity>
- <entity entity-name="SequenceValueItem" package-name="org.apache.ofbiz.entity.sequence" title="Sequence Value Item Entity">
+ <entity entity-name="SequenceValueItem" package-name="org.apache.ofbiz.entity.sequence" title="Sequence Value Item">
<field name="seqName" type="id-long"></field>
<field name="seqId" type="numeric"></field>
<prim-key field="seqName"/>

Modified: ofbiz/ofbiz-framework/trunk/framework/entity/entitydef/entitymodel_test.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/entitydef/entitymodel_test.xml?rev=1832235&r1=1832234&r2=1832235&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/entitydef/entitymodel_test.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/entitydef/entitymodel_test.xml Fri May 25 12:19:07 2018
@@ -47,7 +47,7 @@ under the License.
========================================================= -->
<entity entity-name="Testing"
package-name="org.apache.ofbiz.entity.test"
- title="Testing Entity">
+ title="Testing">
<field name="testingId" type="id"/>
<field name="testingTypeId" type="id"/>
<field name="testingName" type="name" enable-audit-log="true"/>
@@ -74,7 +74,7 @@ under the License.
Used for testing views with pks.
This simulates the Party->PartyGroup and Party->Person entity relationships.
========================================================= -->
- <entity entity-name="TestingSubtype" package-name="org.apache.ofbiz.entity.test" title="Testing Subtype Entity">
+ <entity entity-name="TestingSubtype" package-name="org.apache.ofbiz.entity.test" title="Testing Subtype">
<field name="testingTypeId" type="id" />
<field name="subtypeDescription" type="description" />
<prim-key field="testingTypeId" />
@@ -218,7 +218,7 @@ under the License.
========================================================= -->
<entity entity-name="TestingCrypto"
package-name="org.apache.ofbiz.entity.test"
- title="Testing Crypto Entity">
+ title="Testing Crypto">
<field name="testingCryptoId" type="id"/>
<field name="testingCryptoTypeId" type="id"/>
<field name="unencryptedValue" type="description"/>
@@ -244,7 +244,7 @@ under the License.
</view-entity>
<entity entity-name="TestingRemoveAll"
package-name="org.apache.ofbiz.entity.test"
- title="Testing Entity">
+ title="Testing">
<field name="testingRemoveAllId" type="id"/>
<field name="description" type="description"/>
<prim-key field="testingRemoveAllId"/>

Modified: ofbiz/ofbiz-framework/trunk/framework/entityext/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entityext/entitydef/entitymodel.xml?rev=1832235&r1=1832234&r2=1832235&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entityext/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entityext/entitydef/entitymodel.xml Fri May 25 12:19:07 2018
@@ -42,14 +42,14 @@ under the License.

<entity entity-name="EntityGroup"
package-name="org.apache.ofbiz.entity.group"
- title="Entity Grouping Entity">
+ title="Entity Grouping">
<field name="entityGroupId" type="id"></field>
<field name="entityGroupName" type="name"></field>
<prim-key field="entityGroupId"/>
</entity>
<entity entity-name="EntityGroupEntry"
package-name="org.apache.ofbiz.entity.group"
- title="Entity Grouping Entity">
+ title="Entity Grouping">
<field name="entityGroupId" type="id"></field>
<field name="entityOrPackage" type="long-varchar"></field>
<field name="applEnumId" type="id"></field>
@@ -66,7 +66,7 @@ under the License.

<entity entity-name="EntitySync"
package-name="org.apache.ofbiz.entity.synchronization"
- title="Entity Synchronization Entity">
+ title="Entity Synchronization">
<field name="entitySyncId" type="id"></field>
<field name="runStatusId" type="id"></field>
<field name="lastSuccessfulSynchTime" type="date-time"></field>
@@ -92,7 +92,7 @@ under the License.
</entity>
<entity entity-name="EntitySyncHistory"
package-name="org.apache.ofbiz.entity.synchronization"
- title="Entity Synchronization History Entity">
+ title="Entity Synchronization History">
<field name="entitySyncId" type="id"></field>
<field name="startDate" type="date-time"></field>
<field name="runStatusId" type="id"></field>
@@ -127,7 +127,7 @@ under the License.
</entity>
<entity entity-name="EntitySyncInclude"
package-name="org.apache.ofbiz.entity.synchronization"
- title="Entity Synchronization Include Entity">
+ title="Entity Synchronization Include">
<field name="entitySyncId" type="id"></field>
<field name="entityOrPackage" type="long-varchar"></field>
<field name="applEnumId" type="id"></field>
@@ -139,7 +139,7 @@ under the License.
</entity>
<entity entity-name="EntitySyncIncludeGroup"
package-name="org.apache.ofbiz.entity.synchronization"
- title="Entity Synchronization Include Entity Group Entity">
+ title="Entity Synchronization Include Entity Group">
<field name="entitySyncId" type="id"></field>
<field name="entityGroupId" type="id"></field>
<prim-key field="entitySyncId"/>
@@ -153,7 +153,7 @@ under the License.
</entity>
<view-entity entity-name="EntitySyncInclGrpDetailView"
package-name="org.apache.ofbiz.entity.synchronization"
- title="Entity Synchronization Include Entity Group Detail View Entity">
+ title="Entity Synchronization Include Entity Group Detail View">
<member-entity entity-alias="ESIG" entity-name="EntitySyncIncludeGroup"/>
<member-entity entity-alias="EGE" entity-name="EntityGroupEntry"/>
<alias-all entity-alias="ESIG"/>
@@ -164,7 +164,7 @@ under the License.
</view-entity>
<entity entity-name="EntitySyncRemove"
package-name="org.apache.ofbiz.entity.synchronization"
- title="Entity Synchronization Remove Entity">
+ title="Entity Synchronization Remove">
<field name="entitySyncRemoveId" type="id"></field>
<field name="primaryKeyRemoved" type="very-long"></field>
<prim-key field="entitySyncRemoveId"/>

Modified: ofbiz/ofbiz-framework/trunk/framework/security/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/security/entitydef/entitymodel.xml?rev=1832235&r1=1832234&r2=1832235&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/security/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/security/entitydef/entitymodel.xml Fri May 25 12:19:07 2018
@@ -60,7 +60,7 @@ under the License.

<entity entity-name="UserLogin"
package-name="org.apache.ofbiz.security.login"
- title="User Login Entity">
+ title="User Login">
<field name="userLoginId" type="id-vlong"></field>
<field name="currentPassword" type="long-varchar"></field>
<field name="passwordHint" type="description"></field>
@@ -85,7 +85,7 @@ under the License.
<entity entity-name="UserLoginPasswordHistory"
package-name="org.apache.ofbiz.security.login"
never-cache="true"
- title="User Login Password History Entity">
+ title="User Login Password History">
<field name="userLoginId" type="id-vlong"></field>
<field name="fromDate" type="date-time"></field>
<field name="thruDate" type="date-time"></field>
@@ -99,7 +99,7 @@ under the License.
<entity entity-name="UserLoginHistory"
package-name="org.apache.ofbiz.security.login"
never-cache="true"
- title="User Login History Entity">
+ title="User Login History">
<field name="userLoginId" type="id-vlong"></field>
<field name="visitId" type="id"></field>
<field name="fromDate" type="date-time"></field>
@@ -115,7 +115,7 @@ under the License.
<entity entity-name="UserLoginSession"
package-name="org.apache.ofbiz.security.login"
never-cache="true"
- title="User Login History Entity">
+ title="User Login History">
<field name="userLoginId" type="id-vlong"></field>
<field name="savedDate" type="date-time"></field>
<field name="sessionData" type="very-long"></field>
@@ -132,7 +132,7 @@ under the License.
<entity entity-name="SecurityGroup"
package-name="org.apache.ofbiz.security.securitygroup"
default-resource-name="SecurityEntityLabels"
- title="Security Component - Security Group Entity">
+ title="Security Component - Security Group">
<field name="groupId" type="id"></field>
<field name="groupName" type="value"></field>
<field name="description" type="description"></field>
@@ -140,7 +140,7 @@ under the License.
</entity>
<entity entity-name="SecurityGroupPermission"
package-name="org.apache.ofbiz.security.securitygroup"
- title="Security Component - Security Group Permission Entity">
+ title="Security Component - Security Group Permission">
<description>Defines a permission available to a security group; there is no FK to SecurityPermission because we want to leave open the possibility of ad-hoc permissions, especially for the Entity Data Maintenance pages which have TONS of permissions</description>
<field name="groupId" type="id"></field>
<field name="permissionId" type="id-long"></field>
@@ -159,7 +159,7 @@ under the License.
<entity entity-name="SecurityPermission"
package-name="org.apache.ofbiz.security.securitygroup"
default-resource-name="SecurityEntityLabels"
- title="Security Component - Security Permission Entity">
+ title="Security Component - Security Permission">
<field name="permissionId" type="id-long"></field>
<field name="description" type="description"></field>
<prim-key field="permissionId"/>
@@ -167,7 +167,7 @@ under the License.
<view-entity entity-name="UserLoginAndSecurityGroup"
package-name="org.apache.ofbiz.security.securitygroup"
never-cache="true"
- title="UserLogin And SecurityGroup View Entity">
+ title="UserLogin And SecurityGroup View">
<member-entity entity-alias="ULSG" entity-name="UserLoginSecurityGroup"/>
<member-entity entity-alias="UL" entity-name="UserLogin"/>
<alias-all entity-alias="ULSG"/>
@@ -178,7 +178,7 @@ under the License.
</view-entity>
<entity entity-name="UserLoginSecurityGroup"
package-name="org.apache.ofbiz.security.securitygroup"
- title="Security Component - User Login Security Group Entity">
+ title="Security Component - User Login Security Group">
<description>Maps a UserLogin to a security group</description>
<field name="userLoginId" type="id-vlong"></field>
<field name="groupId" type="id"></field>
@@ -199,7 +199,7 @@ under the License.
</entity>
<entity entity-name="ProtectedView"
package-name="org.apache.ofbiz.security.securitygroup"
- title="Security Component - Protected View Entity">
+ title="Security Component - Protected View">
<description>Defines views protected from data leakage</description>
<field name="groupId" type="id"></field>
<field name="viewNameId" type="id-long"><description>name of view to protect from data theft</description></field>
@@ -217,7 +217,7 @@ under the License.
</entity>
<view-entity entity-name="UserLoginAndProtectedView"
package-name="org.apache.ofbiz.security.securitygroup"
- title="UserLogin And ProtectedView View Entity">
+ title="UserLogin And ProtectedView View">
<member-entity entity-alias="ULSGPV" entity-name="UserLoginSecurityGroup"/>
<member-entity entity-alias="PV" entity-name="ProtectedView"/>
<alias-all entity-alias="ULSGPV"/>
@@ -228,7 +228,7 @@ under the License.
</view-entity>
<entity entity-name="TarpittedLoginView"
package-name="org.apache.ofbiz.security.securitygroup"
- title="Security Component - Protected View Entity">
+ title="Security Component - Protected View">
<description>Login View couple currently tarpitted : any access to the view for the login is denied</description>
<field name="viewNameId" type="id-long"><description>name of view protected from data theft</description></field>
<field name="userLoginId" type="id-vlong"/>

Modified: ofbiz/ofbiz-framework/trunk/framework/service/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/entitydef/entitymodel.xml?rev=1832235&r1=1832234&r2=1832235&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/entitydef/entitymodel.xml Fri May 25 12:19:07 2018
@@ -39,7 +39,7 @@ under the License.



- <entity entity-name="JobSandbox" package-name="org.apache.ofbiz.service.schedule" title="Job Scheduler Sandbox Entity"
+ <entity entity-name="JobSandbox" package-name="org.apache.ofbiz.service.schedule" title="Job Scheduler Sandbox"
sequence-bank-size="100" never-cache="true">
<field name="jobId" type="id"></field>
<field name="jobName" type="name"></field>
@@ -90,7 +90,7 @@ under the License.
</entity>
<entity entity-name="RecurrenceInfo"
package-name="org.apache.ofbiz.service.schedule"
- title="Recurrence Info Entity">
+ title="Recurrence Info">
<field name="recurrenceInfoId" type="id"></field>
<field name="startDateTime" type="date-time"></field>
<field name="exceptionDateTimes" type="very-long"></field>
@@ -108,7 +108,7 @@ under the License.
</entity>
<entity entity-name="RecurrenceRule"
package-name="org.apache.ofbiz.service.schedule"
- title="Recurrence Rule Entity">
+ title="Recurrence Rule">
<field name="recurrenceRuleId" type="id"></field>
<field name="frequency" type="short-varchar"></field>
<field name="untilDateTime" type="date-time"></field>
@@ -127,7 +127,7 @@ under the License.
<field name="xName" type="very-long"></field>
<prim-key field="recurrenceRuleId"/>
</entity>
- <entity entity-name="RuntimeData" package-name="org.apache.ofbiz.service.schedule" title="Runtime Data Entity"
+ <entity entity-name="RuntimeData" package-name="org.apache.ofbiz.service.schedule" title="Runtime Data"
sequence-bank-size="100">
<field name="runtimeDataId" type="id"></field>
<field name="runtimeInfo" type="very-long"></field>
@@ -174,7 +174,7 @@ under the License.

<view-entity entity-name="TemporalExpressionChild"
package-name="org.apache.ofbiz.service.schedule"
- title="Temporal Expression Children View Entity">
+ title="Temporal Expression Children View">
<member-entity entity-alias="TEA" entity-name="TemporalExpressionAssoc"/>
<member-entity entity-alias="TE" entity-name="TemporalExpression"/>
<alias-all entity-alias="TEA">
@@ -206,7 +206,7 @@ under the License.



- <entity entity-name="ServiceSemaphore" package-name="org.apache.ofbiz.service.semaphore" title="Semaphore Lock Entity"
+ <entity entity-name="ServiceSemaphore" package-name="org.apache.ofbiz.service.semaphore" title="Semaphore Lock"
sequence-bank-size="100">
<field name="serviceName" type="name"></field>
<field name="lockedByInstanceId" type="id"></field>

Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/entitydef/entitymodel.xml?rev=1832235&r1=1832234&r2=1832235&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/entitydef/entitymodel.xml Fri May 25 12:19:07 2018
@@ -41,7 +41,7 @@ under the License.

<entity entity-name="BrowserType"
package-name="org.apache.ofbiz.webapp.visit"
- title="Browser Type Entity">
+ title="Browser Type">
<field name="browserTypeId" type="id"></field>
<field name="browserName" type="name"></field>
<field name="browserVersion" type="very-short"></field>
@@ -49,7 +49,7 @@ under the License.
</entity>
<entity entity-name="PlatformType"
package-name="org.apache.ofbiz.webapp.visit"
- title="Platform Type Entity">
+ title="Platform Type">
<field name="platformTypeId" type="id"></field>
<field name="platformName" type="name"></field>
<field name="platformVersion" type="very-short"></field>
@@ -57,7 +57,7 @@ under the License.
</entity>
<entity entity-name="ProtocolType"
package-name="org.apache.ofbiz.webapp.visit"
- title="Protocol Type Entity">
+ title="Protocol Type">
<field name="protocolTypeId" type="id"></field>
<field name="protocolName" type="name"></field>
<prim-key field="protocolTypeId"/>
@@ -65,7 +65,7 @@ under the License.
<entity entity-name="ServerHit"
package-name="org.apache.ofbiz.webapp.visit"
never-cache="true"
- title="Server Hit Entity" no-auto-stamp="true">
+ title="Server Hit" no-auto-stamp="true">
<field name="visitId" type="id"></field>
<field name="contentId" type="id-vlong"></field>
<field name="hitStartDateTime" type="date-time"></field>
@@ -89,7 +89,7 @@ under the License.
<key-map field-name="visitId"/>
</relation>
</entity>
- <entity entity-name="ServerHitBin" package-name="org.apache.ofbiz.webapp.visit" never-cache="true" title="Server Hit Bin Entity" no-auto-stamp="true">
+ <entity entity-name="ServerHitBin" package-name="org.apache.ofbiz.webapp.visit" never-cache="true" title="Server Hit Bin" no-auto-stamp="true">
<field name="serverHitBinId" type="id"></field>
<field name="contentId" type="id-vlong"></field>
<field name="hitTypeId" type="id"></field>
@@ -109,14 +109,14 @@ under the License.
<entity entity-name="ServerHitType"
package-name="org.apache.ofbiz.webapp.visit"
default-resource-name="WebappEntityLabels"
- title="Server Hit Bin Entity">
+ title="Server Hit Bin">
<field name="hitTypeId" type="id"></field>
<field name="description" type="description"></field>
<prim-key field="hitTypeId"/>
</entity>
<entity entity-name="UserAgent"
package-name="org.apache.ofbiz.webapp.visit"
- title="User Agent Entity">
+ title="User Agent">
<field name="userAgentId" type="id"></field>
<field name="browserTypeId" type="id"></field>
<field name="platformTypeId" type="id"></field>
@@ -142,19 +142,19 @@ under the License.
</entity>
<entity entity-name="UserAgentMethodType"
package-name="org.apache.ofbiz.webapp.visit"
- title="User Agent Method Type Entity">
+ title="User Agent Method Type">
<field name="userAgentMethodTypeId" type="id"></field>
<field name="description" type="description"></field>
<prim-key field="userAgentMethodTypeId"/>
</entity>
<entity entity-name="UserAgentType"
package-name="org.apache.ofbiz.webapp.visit"
- title="User Agent Type Entity">
+ title="User Agent Type">
<field name="userAgentTypeId" type="id"></field>
<field name="description" type="description"></field>
<prim-key field="userAgentTypeId"/>
</entity>
- <entity entity-name="Visit" package-name="org.apache.ofbiz.webapp.visit" never-cache="true" title="Visit Entity"
+ <entity entity-name="Visit" package-name="org.apache.ofbiz.webapp.visit" never-cache="true" title="Visit"
sequence-bank-size="100" no-auto-stamp="true">
<field name="visitId" type="id"></field>
<field name="visitorId" type="id"></field>
@@ -188,7 +188,7 @@ under the License.
<index-field name="thruDate"/>
</index>
</entity>
- <entity entity-name="Visitor" package-name="org.apache.ofbiz.webapp.visit" title="Visitor Entity"
+ <entity entity-name="Visitor" package-name="org.apache.ofbiz.webapp.visit" title="Visitor"
sequence-bank-size="100">
<field name="visitorId" type="id"></field>
<field name="userLoginId" type="id-vlong"></field>
@@ -204,7 +204,7 @@ under the License.

<entity entity-name="WebPage"
package-name="org.apache.ofbiz.webapp.website"
- title="Web Page Entity">
+ title="Web Page">
<field name="webPageId" type="id"></field>
<field name="pageName" type="name"></field>
<field name="webSiteId" type="id"></field>
@@ -215,7 +215,7 @@ under the License.
</entity>
<entity entity-name="WebSite"
package-name="org.apache.ofbiz.webapp.website"
- title="Web Site Entity">
+ title="Web Site">
<field name="webSiteId" type="id"></field>
<field name="siteName" type="name"></field>
<field name="httpHost" type="long-varchar"></field>