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=1796379&r1=1796378&r2=1796379&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/shipment-entitymodel.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/shipment-entitymodel.xml Sat May 27 11:28:36 2017 @@ -44,7 +44,7 @@ under the License. <entity entity-name="ItemIssuance" package-name="org.apache.ofbiz.shipment.issuance" title="Item Issuance Entity"> - <field name="itemIssuanceId" type="id-ne"></field> + <field name="itemIssuanceId" type="id"></field> <field name="orderId" type="id-ne"></field> <field name="orderItemSeqId" type="id-ne"></field> <field name="shipGroupSeqId" type="id-ne"></field> @@ -128,9 +128,9 @@ under the License. <entity entity-name="ItemIssuanceRole" package-name="org.apache.ofbiz.shipment.issuance" title="Item Issuance Role Entity"> - <field name="itemIssuanceId" type="id-ne"></field> - <field name="partyId" type="id-ne"></field> - <field name="roleTypeId" type="id-ne"></field> + <field name="itemIssuanceId" type="id"></field> + <field name="partyId" type="id"></field> + <field name="roleTypeId" type="id"></field> <prim-key field="itemIssuanceId"/> <prim-key field="partyId"/> <prim-key field="roleTypeId"/> @@ -153,7 +153,7 @@ under the License. <entity entity-name="Picklist" package-name="org.apache.ofbiz.shipment.picklist" title="Picklist Entity"> - <field name="picklistId" type="id-ne"></field> + <field name="picklistId" type="id"></field> <field name="description" type="description"></field> <field name="facilityId" type="id-ne"></field> <field name="shipmentMethodTypeId" type="id-ne"></field> @@ -195,7 +195,7 @@ under the License. package-name="org.apache.ofbiz.shipment.picklist" title="Picklist Entity"> <!-- The PicklistBin has its own ID to make it easy to put on the pack sheet of the picklist as a barcode, also so it can be moved to another picklist or bin location if necessary --> - <field name="picklistBinId" type="id-ne"></field> + <field name="picklistBinId" type="id"></field> <field name="picklistId" type="id-ne"></field> <field name="binLocationNumber" type="numeric"></field> <field name="primaryOrderId" type="id"></field> @@ -215,11 +215,11 @@ under the License. <entity entity-name="PicklistItem" package-name="org.apache.ofbiz.shipment.picklist" title="Picklist Entity"> - <field name="picklistBinId" type="id-ne"></field> - <field name="orderId" type="id-ne"></field> - <field name="orderItemSeqId" type="id-ne"></field> - <field name="shipGroupSeqId" type="id-ne"></field> - <field name="inventoryItemId" type="id-ne"></field> + <field name="picklistBinId" type="id"></field> + <field name="orderId" type="id"></field> + <field name="orderItemSeqId" type="id"></field> + <field name="shipGroupSeqId" type="id"></field> + <field name="inventoryItemId" type="id"></field> <field name="itemStatusId" type="id-ne"></field> <field name="quantity" type="fixed-point"></field> <prim-key field="picklistBinId"/> @@ -278,9 +278,9 @@ under the License. <entity entity-name="PicklistRole" package-name="org.apache.ofbiz.shipment.picklist" title="Picklist Role Entity"> - <field name="picklistId" type="id-ne"></field> - <field name="partyId" type="id-ne"></field> - <field name="roleTypeId" type="id-ne"></field> + <field name="picklistId" type="id"></field> + <field name="partyId" type="id"></field> + <field name="roleTypeId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="createdByUserLogin" type="id-vlong"></field> @@ -312,7 +312,7 @@ under the License. <entity entity-name="PicklistStatusHistory" package-name="org.apache.ofbiz.shipment.picklist" title="Picklist Status History Entity"> - <field name="picklistId" type="id-ne"></field> + <field name="picklistId" type="id"></field> <field name="changeDate" type="date-time"></field> <field name="changeUserLoginId" type="id-vlong"></field> <field name="statusId" type="id-ne"></field> @@ -346,14 +346,14 @@ under the License. package-name="org.apache.ofbiz.shipment.receipt" default-resource-name="ProductEntityLabels" title="Rejection Reason Entity"> - <field name="rejectionId" type="id-ne"></field> + <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"> - <field name="receiptId" type="id-ne"></field> + <field name="receiptId" type="id"></field> <field name="inventoryItemId" type="id"></field> <field name="productId" type="id"></field> <field name="shipmentId" type="id"></field> @@ -408,9 +408,9 @@ under the License. <entity entity-name="ShipmentReceiptRole" package-name="org.apache.ofbiz.shipment.receipt" title="Shipment Receipt Role Entity"> - <field name="receiptId" type="id-ne"></field> - <field name="partyId" type="id-ne"></field> - <field name="roleTypeId" type="id-ne"></field> + <field name="receiptId" type="id"></field> + <field name="partyId" type="id"></field> + <field name="roleTypeId" type="id"></field> <prim-key field="receiptId"/> <prim-key field="partyId"/> <prim-key field="roleTypeId"/> @@ -463,9 +463,9 @@ under the License. <entity entity-name="CarrierShipmentMethod" package-name="org.apache.ofbiz.shipment.shipment" title="Carrier Shipment Method Entity"> - <field name="shipmentMethodTypeId" type="id-ne"></field> - <field name="partyId" type="id-ne"></field> - <field name="roleTypeId" type="id-ne"></field> + <field name="shipmentMethodTypeId" type="id"></field> + <field name="partyId" type="id"></field> + <field name="roleTypeId" type="id"></field> <field name="sequenceNumber" type="numeric"></field> <field name="carrierServiceCode" type="short-varchar"></field> <prim-key field="shipmentMethodTypeId"/> @@ -485,8 +485,8 @@ under the License. <entity entity-name="CarrierShipmentBoxType" package-name="org.apache.ofbiz.shipment.shipment" title="Carrier Shipment Method Entity"> - <field name="shipmentBoxTypeId" type="id-ne"></field> - <field name="partyId" type="id-ne"></field> + <field name="shipmentBoxTypeId" type="id"></field> + <field name="partyId" type="id"></field> <field name="packagingTypeCode" type="id"></field> <field name="oversizeCode" type="very-short"></field> <prim-key field="shipmentBoxTypeId"/> @@ -501,7 +501,7 @@ under the License. <entity entity-name="Delivery" package-name="org.apache.ofbiz.shipment.shipment" title="Delivery Entity"> - <field name="deliveryId" type="id-ne"></field> + <field name="deliveryId" type="id"></field> <field name="originFacilityId" type="id"></field> <field name="destFacilityId" type="id"></field> <field name="actualStartDate" type="date-time"></field> @@ -555,7 +555,7 @@ under the License. <entity entity-name="Shipment" package-name="org.apache.ofbiz.shipment.shipment" title="Shipment Entity"> - <field name="shipmentId" type="id-ne"></field> + <field name="shipmentId" type="id"></field> <field name="shipmentTypeId" type="id"></field> <field name="statusId" type="id-ne"></field> <field name="primaryOrderId" type="id"></field> @@ -702,8 +702,8 @@ under the License. <entity entity-name="ShipmentAttribute" package-name="org.apache.ofbiz.shipment.shipment" title="Shipment Attribute Entity"> - <field name="shipmentId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="shipmentId" type="id"></field> + <field name="attrName" type="id-long"></field> <field name="attrValue" type="value"></field> <field name="attrDescription" type="description"></field> <prim-key field="shipmentId"/> @@ -718,7 +718,7 @@ under the License. <entity entity-name="ShipmentBoxType" package-name="org.apache.ofbiz.shipment.shipment" title="Shipment Contact Mechanism Type Entity"> - <field name="shipmentBoxTypeId" type="id-ne"></field> + <field name="shipmentBoxTypeId" type="id"></field> <field name="description" type="description"></field> <field name="dimensionUomId" type="id"></field> <field name="boxLength" type="fixed-point"></field> @@ -737,8 +737,8 @@ under the License. <entity entity-name="ShipmentContactMech" package-name="org.apache.ofbiz.shipment.shipment" title="Shipment Contact Mechanism Entity"> - <field name="shipmentId" type="id-ne"></field> - <field name="shipmentContactMechTypeId" type="id-ne"></field> + <field name="shipmentId" type="id"></field> + <field name="shipmentContactMechTypeId" type="id"></field> <field name="contactMechId" type="id-ne"></field> <prim-key field="shipmentId"/> <prim-key field="shipmentContactMechTypeId"/> @@ -755,14 +755,14 @@ under the License. <entity entity-name="ShipmentContactMechType" package-name="org.apache.ofbiz.shipment.shipment" title="Shipment Contact Mechanism Type Entity"> - <field name="shipmentContactMechTypeId" type="id-ne"></field> + <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"> - <field name="shipmentCostEstimateId" type="id-ne"></field> + <field name="shipmentCostEstimateId" type="id"></field> <field name="shipmentMethodTypeId" type="id"></field> <field name="carrierPartyId" type="id"></field> <field name="carrierRoleTypeId" type="id"></field> @@ -837,7 +837,7 @@ under the License. <entity entity-name="ShipmentGatewayConfigType" package-name="org.apache.ofbiz.shipment.shipment" title="Shipment Gateway Config Type"> - <field name="shipmentGatewayConfTypeId" type="id-ne"></field> + <field name="shipmentGatewayConfTypeId" type="id"></field> <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> @@ -852,7 +852,7 @@ under the License. <entity entity-name="ShipmentGatewayConfig" package-name="org.apache.ofbiz.shipment.shipment" title="Shipment Gateway Config"> - <field name="shipmentGatewayConfigId" type="id-ne"></field> + <field name="shipmentGatewayConfigId" type="id"></field> <field name="shipmentGatewayConfTypeId" type="id-ne"></field> <field name="description" type="description"></field> <prim-key field="shipmentGatewayConfigId"/> @@ -863,7 +863,7 @@ under the License. <entity entity-name="ShipmentGatewayDhl" package-name="org.apache.ofbiz.shipment.shipment" title="DHL Shipment Gateway Configuration"> - <field name="shipmentGatewayConfigId" type="id-ne"></field> + <field name="shipmentGatewayConfigId" type="id"></field> <field name="connectUrl" type="value"><description>DHL Connection URL</description></field> <field name="connectTimeout" type="numeric"><description>Timeout in seconds</description></field> <field name="headVersion" type="short-varchar"><description>Head version attribute</description></field> @@ -882,7 +882,7 @@ under the License. <entity entity-name="ShipmentGatewayFedex" package-name="org.apache.ofbiz.shipment.shipment" title="Fedex Shipment Gateway Configuration"> - <field name="shipmentGatewayConfigId" type="id-ne"></field> + <field name="shipmentGatewayConfigId" type="id"></field> <field name="connectUrl" type="value"><description>Fedex Connection URL</description></field> <field name="connectSoapUrl" type="value"><description>Fedex Soap Connection URL</description></field> <field name="connectTimeout" type="numeric"><description>Timeout in seconds</description></field> @@ -904,7 +904,7 @@ under the License. <entity entity-name="ShipmentGatewayUps" package-name="org.apache.ofbiz.shipment.shipment" title="UPS Shipment Gateway Configuration"> - <field name="shipmentGatewayConfigId" type="id-ne"></field> + <field name="shipmentGatewayConfigId" type="id"></field> <field name="connectUrl" type="value"><description>UPS Connection URL</description></field> <field name="connectTimeout" type="numeric"><description>Timeout in seconds</description></field> <field name="shipperNumber" type="value"><description>UPS Shipper Number</description></field> @@ -933,7 +933,7 @@ under the License. <entity entity-name="ShipmentGatewayUsps" package-name="org.apache.ofbiz.shipment.shipment" title="USPS Shipment Gateway Configuration"> - <field name="shipmentGatewayConfigId" type="id-ne"></field> + <field name="shipmentGatewayConfigId" type="id"></field> <field name="connectUrl" type="value"><description>USPS Connection URL</description></field> <field name="connectUrlLabels" type="value"><description>USPS Connection URL for Labels</description></field> <field name="connectTimeout" type="numeric"><description>Timeout in seconds</description></field> @@ -949,8 +949,8 @@ under the License. <entity entity-name="ShipmentItem" package-name="org.apache.ofbiz.shipment.shipment" title="Shipment Item Entity"> - <field name="shipmentId" type="id-ne"></field> - <field name="shipmentItemSeqId" type="id-ne"></field> + <field name="shipmentId" type="id"></field> + <field name="shipmentItemSeqId" type="id"></field> <field name="productId" type="id"></field> <field name="quantity" type="fixed-point"></field> <field name="shipmentContentDescription" type="description"></field> @@ -966,10 +966,10 @@ under the License. <entity entity-name="ShipmentItemBilling" package-name="org.apache.ofbiz.shipment.shipment" title="Shipment Item Billing Entity"> - <field name="shipmentId" type="id-ne"></field> - <field name="shipmentItemSeqId" type="id-ne"></field> - <field name="invoiceId" type="id-ne"></field> - <field name="invoiceItemSeqId" type="id-ne"></field> + <field name="shipmentId" type="id"></field> + <field name="shipmentItemSeqId" type="id"></field> + <field name="invoiceId" type="id"></field> + <field name="invoiceItemSeqId" type="id"></field> <prim-key field="shipmentId"/> <prim-key field="shipmentItemSeqId"/> <prim-key field="invoiceId"/> @@ -992,9 +992,9 @@ under the License. <entity entity-name="ShipmentItemFeature" package-name="org.apache.ofbiz.shipment.shipment" title="Shipment Item Feature Entity"> - <field name="shipmentId" type="id-ne"></field> - <field name="shipmentItemSeqId" type="id-ne"></field> - <field name="productFeatureId" type="id-ne"></field> + <field name="shipmentId" type="id"></field> + <field name="shipmentItemSeqId" type="id"></field> + <field name="productFeatureId" type="id"></field> <prim-key field="shipmentId"/> <prim-key field="shipmentItemSeqId"/> <prim-key field="productFeatureId"/> @@ -1154,7 +1154,7 @@ under the License. <entity entity-name="ShipmentMethodType" package-name="org.apache.ofbiz.shipment.shipment" title="Shipment Method Type Entity"> - <field name="shipmentMethodTypeId" type="id-ne"></field> + <field name="shipmentMethodTypeId" type="id"></field> <field name="description" type="description"></field> <field name="sequenceNum" type="numeric"></field> <prim-key field="shipmentMethodTypeId"/> @@ -1162,8 +1162,8 @@ under the License. <entity entity-name="ShipmentPackage" package-name="org.apache.ofbiz.shipment.shipment" title="Shipment Package Entity"> - <field name="shipmentId" type="id-ne"></field> - <field name="shipmentPackageSeqId" type="id-ne"></field> + <field name="shipmentId" type="id"></field> + <field name="shipmentPackageSeqId" type="id"></field> <field name="shipmentBoxTypeId" type="id"></field> <field name="dateCreated" type="date-time"></field> <field name="boxLength" type="fixed-point"><description>This field store the length of package; if a shipmentBoxTypeId is specified then this overrides the dimension specified there; this field is meant to be used when there is no applicable ShipmentBoxType</description></field> @@ -1194,9 +1194,9 @@ under the License. <entity entity-name="ShipmentPackageContent" package-name="org.apache.ofbiz.shipment.shipment" title="Shipment Package Content Entity"> - <field name="shipmentId" type="id-ne"></field> - <field name="shipmentPackageSeqId" type="id-ne"></field> - <field name="shipmentItemSeqId" type="id-ne"></field> + <field name="shipmentId" type="id"></field> + <field name="shipmentPackageSeqId" type="id"></field> + <field name="shipmentItemSeqId" type="id"></field> <field name="quantity" type="fixed-point"></field> <field name="subProductId" type="id"></field> <field name="subProductQuantity" type="fixed-point"></field> @@ -1221,9 +1221,9 @@ under the License. <entity entity-name="ShipmentPackageRouteSeg" package-name="org.apache.ofbiz.shipment.shipment" title="Shipment Package Route Segment Entity"> - <field name="shipmentId" type="id-ne"></field> - <field name="shipmentPackageSeqId" type="id-ne"></field> - <field name="shipmentRouteSegmentId" type="id-ne"></field> + <field name="shipmentId" type="id"></field> + <field name="shipmentPackageSeqId" type="id"></field> + <field name="shipmentRouteSegmentId" type="id"></field> <field name="trackingCode" type="short-varchar"></field> <field name="boxNumber" type="short-varchar"></field> <field name="labelImage" type="byte-array"></field> @@ -1258,8 +1258,8 @@ under the License. <entity entity-name="ShipmentRouteSegment" package-name="org.apache.ofbiz.shipment.shipment" title="Shipment Route Segment Entity"> - <field name="shipmentId" type="id-ne"></field> - <field name="shipmentRouteSegmentId" type="id-ne"></field> + <field name="shipmentId" type="id"></field> + <field name="shipmentRouteSegmentId" type="id"></field> <field name="deliveryId" type="id"></field> <field name="originFacilityId" type="id"></field> <field name="destFacilityId" type="id"></field> @@ -1396,8 +1396,8 @@ under the License. <entity entity-name="ShipmentStatus" package-name="org.apache.ofbiz.shipment.shipment" title="Shipment Status Entity"> - <field name="statusId" type="id-ne"></field> - <field name="shipmentId" type="id-ne"></field> + <field name="statusId" type="id"></field> + <field name="shipmentId" type="id"></field> <field name="statusDate" type="date-time"></field> <field name="changeByUserLoginId" type="id-vlong"/> <prim-key field="statusId"/> @@ -1416,8 +1416,8 @@ under the License. package-name="org.apache.ofbiz.shipment.shipment" default-resource-name="ProductEntityLabels" title="Shipment Type Entity"> - <field name="shipmentTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="shipmentTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="shipmentTypeId"/> @@ -1428,8 +1428,8 @@ under the License. <entity entity-name="ShipmentTypeAttr" package-name="org.apache.ofbiz.shipment.shipment" title="Shipment Type Attribute Entity"> - <field name="shipmentTypeId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="shipmentTypeId" type="id"></field> + <field name="attrName" type="id-long"></field> <field name="description" type="description"></field> <prim-key field="shipmentTypeId"/> <prim-key field="attrName"/> @@ -1446,7 +1446,7 @@ under the License. <entity entity-name="ShippingDocument" package-name="org.apache.ofbiz.shipment.shipment" title="Shipping Document Entity"> - <field name="documentId" type="id-ne"></field> + <field name="documentId" type="id"></field> <field name="shipmentId" type="id"></field> <field name="shipmentItemSeqId" type="id"></field> <field name="shipmentPackageSeqId" type="id"></field>
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=1796379&r1=1796378&r2=1796379&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/workeffort-entitymodel.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/workeffort-entitymodel.xml Sat May 27 11:28:36 2017 @@ -42,7 +42,7 @@ under the License. <entity entity-name="TimeEntry" package-name="org.apache.ofbiz.workeffort.timesheet" title="Time Entry Entity"> - <field name="timeEntryId" type="id-ne"></field> + <field name="timeEntryId" type="id"></field> <field name="partyId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> @@ -77,7 +77,7 @@ under the License. <entity entity-name="Timesheet" package-name="org.apache.ofbiz.workeffort.timesheet" title="Timesheet Entity"> - <field name="timesheetId" type="id-ne"></field> + <field name="timesheetId" type="id"></field> <field name="partyId" type="id"></field> <field name="clientPartyId" type="id"></field> <field name="fromDate" type="date-time"></field> @@ -102,9 +102,9 @@ under the License. <entity entity-name="TimesheetRole" package-name="org.apache.ofbiz.workeffort.timesheet" title="Timesheet Role Entity"> - <field name="timesheetId" type="id-ne"></field> - <field name="partyId" type="id-ne"></field> - <field name="roleTypeId" type="id-ne"></field> + <field name="timesheetId" type="id"></field> + <field name="partyId" type="id"></field> + <field name="roleTypeId" type="id"></field> <prim-key field="timesheetId"/> <prim-key field="partyId"/> <prim-key field="roleTypeId"/> @@ -130,7 +130,7 @@ under the License. <entity entity-name="ApplicationSandbox" package-name="org.apache.ofbiz.workeffort.workeffort" title="WorkEffort Application Sandbox Entity"> - <field name="applicationId" type="id-ne"></field> + <field name="applicationId" type="id"></field> <field name="workEffortId" type="id-ne"></field> <field name="partyId" type="id-ne"></field> <field name="roleTypeId" type="id-ne"></field> @@ -150,8 +150,8 @@ under the License. <entity entity-name="CommunicationEventWorkEff" package-name="org.apache.ofbiz.workeffort.workeffort" title="Communication Event Work Effort Entity"> - <field name="workEffortId" type="id-ne"></field> - <field name="communicationEventId" type="id-ne"></field> + <field name="workEffortId" type="id"></field> + <field name="communicationEventId" type="id"></field> <field name="description" type="description"></field> <prim-key field="workEffortId"/> <prim-key field="communicationEventId"/> @@ -165,7 +165,7 @@ under the License. <entity entity-name="Deliverable" package-name="org.apache.ofbiz.workeffort.workeffort" title="Deliverable Entity"> - <field name="deliverableId" type="id-ne"></field> + <field name="deliverableId" type="id"></field> <field name="deliverableTypeId" type="id"></field> <field name="deliverableName" type="name"></field> <field name="description" type="description"></field> @@ -177,14 +177,14 @@ under the License. <entity entity-name="DeliverableType" package-name="org.apache.ofbiz.workeffort.workeffort" title="Deliverable Type Entity"> - <field name="deliverableTypeId" type="id-ne"></field> + <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"> - <field name="workEffortId" type="id-ne"></field> + <field name="workEffortId" type="id"></field> <field name="workEffortTypeId" type="id"></field> <field name="currentStatusId" type="id"></field> <field name="lastStatusUpdate" type="date-time"></field> @@ -288,9 +288,9 @@ under the License. <entity entity-name="WorkEffortAssoc" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Association Entity"> - <field name="workEffortIdFrom" type="id-ne"></field> - <field name="workEffortIdTo" type="id-ne"></field> - <field name="workEffortAssocTypeId" type="id-ne"></field> + <field name="workEffortIdFrom" type="id"></field> + <field name="workEffortIdTo" type="id"></field> + <field name="workEffortAssocTypeId" type="id"></field> <field name="sequenceNum" type="numeric"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> @@ -314,11 +314,11 @@ under the License. <entity entity-name="WorkEffortAssocAttribute" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Association Attribute Entity"> - <field name="workEffortIdFrom" type="id-ne"></field> - <field name="workEffortIdTo" type="id-ne"></field> - <field name="workEffortAssocTypeId" type="id-ne"></field> + <field name="workEffortIdFrom" type="id"></field> + <field name="workEffortIdTo" type="id"></field> + <field name="workEffortAssocTypeId" type="id"></field> <field name="fromDate" type="date-time"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="attrName" type="id-long"></field> <field name="attrValue" type="value"></field> <field name="attrDescription" type="description"></field> <prim-key field="workEffortIdFrom"/> @@ -339,8 +339,8 @@ under the License. package-name="org.apache.ofbiz.workeffort.workeffort" default-resource-name="WorkEffortEntityLabels" title="Work Effort Association Type Entity"> - <field name="workEffortAssocTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="workEffortAssocTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="workEffortAssocTypeId"/> @@ -352,8 +352,8 @@ under the License. package-name="org.apache.ofbiz.workeffort.workeffort" default-resource-name="WorkEffortEntityLabels" title="Work Effort Association Type Attribute Entity"> - <field name="workEffortAssocTypeId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="workEffortAssocTypeId" type="id"></field> + <field name="attrName" type="id-long"></field> <field name="description" type="description"></field> <prim-key field="workEffortAssocTypeId"/> <prim-key field="attrName"/> @@ -370,8 +370,8 @@ under the License. <entity entity-name="WorkEffortAttribute" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Attribute Entity"> - <field name="workEffortId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="workEffortId" type="id"></field> + <field name="attrName" type="id-long"></field> <field name="attrValue" type="value"></field> <field name="attrDescription" type="description"></field> <prim-key field="workEffortId"/> @@ -386,9 +386,9 @@ under the License. <entity entity-name="WorkEffortBilling" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Billing Entity"> - <field name="workEffortId" type="id-ne"></field> - <field name="invoiceId" type="id-ne"></field> - <field name="invoiceItemSeqId" type="id-ne"></field> + <field name="workEffortId" type="id"></field> + <field name="invoiceId" type="id"></field> + <field name="invoiceItemSeqId" type="id"></field> <field name="percentage" type="floating-point"></field> <prim-key field="workEffortId"/> <prim-key field="invoiceId"/> @@ -407,8 +407,8 @@ under the License. <entity entity-name="WorkEffortContactMech" table-name="WORK_EFFORT_CONTACT_MECH_NEW" package-name="org.apache.ofbiz.workeffort.workeffort" title="WorkEffort Contact Mechanism Entity"> - <field name="workEffortId" type="id-ne"></field> - <field name="contactMechId" type="id-ne"></field> + <field name="workEffortId" type="id"></field> + <field name="contactMechId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="comments" type="comment"></field> @@ -426,9 +426,9 @@ under the License. </relation> </entity> <entity entity-name="WorkEffortContent" package-name="org.apache.ofbiz.workeffort.workeffort" title="WorkEffort Content Entity"> - <field name="workEffortId" type="id-ne"></field> - <field name="contentId" type="id-ne"></field> - <field name="workEffortContentTypeId" type="id-ne"></field> + <field name="workEffortId" type="id"></field> + <field name="contentId" type="id"></field> + <field name="workEffortContentTypeId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <prim-key field="workEffortId"/> @@ -446,7 +446,7 @@ under the License. </relation> </entity> <entity entity-name="WorkEffortContentType" package-name="org.apache.ofbiz.workeffort.workeffort" title="WorkEffort Content Type Entity"> - <field name="workEffortContentTypeId" type="id-ne"></field> + <field name="workEffortContentTypeId" type="id"></field> <field name="parentTypeId" type="id"></field> <field name="description" type="description"></field> <prim-key field="workEffortContentTypeId"/> @@ -457,8 +457,8 @@ under the License. <entity entity-name="WorkEffortDeliverableProd" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Deliverable Produced Entity"> - <field name="workEffortId" type="id-ne"></field> - <field name="deliverableId" type="id-ne"></field> + <field name="workEffortId" type="id"></field> + <field name="deliverableId" type="id"></field> <prim-key field="workEffortId"/> <prim-key field="deliverableId"/> <relation type="one" fk-name="WKEFF_DELPRD_WEFF" rel-entity-name="WorkEffort"> @@ -471,8 +471,8 @@ under the License. <entity entity-name="WorkEffortEventReminder" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Event Reminder Entity"> - <field name="workEffortId" type="id-ne"></field> - <field name="sequenceId" type="id-ne"></field> + <field name="workEffortId" type="id"></field> + <field name="sequenceId" type="id"></field> <field name="contactMechId" type="id"></field> <field name="partyId" type="id"> <description>The party this reminder is assigned to</description> @@ -503,8 +503,8 @@ under the License. <entity entity-name="WorkEffortFixedAssetAssign" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Fixed Asset Assignment Entity"> - <field name="workEffortId" type="id-ne"></field> - <field name="fixedAssetId" type="id-ne"></field> + <field name="workEffortId" type="id"></field> + <field name="fixedAssetId" type="id"></field> <field name="statusId" type="id-ne"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> @@ -530,8 +530,8 @@ under the License. <entity entity-name="WorkEffortFixedAssetStd" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Fixed Asset Standard Entity"> - <field name="workEffortId" type="id-ne"></field> - <field name="fixedAssetTypeId" type="id-ne"></field> + <field name="workEffortId" type="id"></field> + <field name="fixedAssetTypeId" type="id"></field> <field name="estimatedQuantity" type="floating-point"></field> <field name="estimatedDuration" type="floating-point"></field> <field name="estimatedCost" type="currency-amount"></field> @@ -545,9 +545,9 @@ under the License. </relation> </entity> <entity entity-name="WorkEffortGoodStandard" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Good Standard Entity"> - <field name="workEffortId" type="id-ne"></field> - <field name="productId" type="id-ne"></field> - <field name="workEffortGoodStdTypeId" type="id-ne"></field> + <field name="workEffortId" type="id"></field> + <field name="productId" type="id"></field> + <field name="workEffortGoodStdTypeId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="statusId" type="id-ne"></field> @@ -573,8 +573,8 @@ under the License. <entity entity-name="WorkEffortGoodStandardType" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Good Standard Type Entity"> - <field name="workEffortGoodStdTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="workEffortGoodStdTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="workEffortGoodStdTypeId"/> @@ -585,7 +585,7 @@ under the License. <entity entity-name="WorkEffortIcalData" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort iCalendar Data"> - <field name="workEffortId" type="id-ne"></field> + <field name="workEffortId" type="id"></field> <field name="icalData" type="very-long"> <description>iCalender Data</description> </field> @@ -597,8 +597,8 @@ under the License. <entity entity-name="WorkEffortInventoryAssign" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Inventory Assignment Entity"> - <field name="workEffortId" type="id-ne"></field> - <field name="inventoryItemId" type="id-ne"></field> + <field name="workEffortId" type="id"></field> + <field name="inventoryItemId" type="id"></field> <field name="statusId" type="id-ne"></field> <field name="quantity" type="floating-point"></field> <prim-key field="workEffortId"/> @@ -616,8 +616,8 @@ under the License. <entity entity-name="WorkEffortInventoryProduced" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Inventory Produced Entity"> - <field name="workEffortId" type="id-ne"></field> - <field name="inventoryItemId" type="id-ne"></field> + <field name="workEffortId" type="id"></field> + <field name="inventoryItemId" type="id"></field> <prim-key field="workEffortId"/> <prim-key field="inventoryItemId"/> <relation type="one" fk-name="WKEFF_INVPD_WEFF" rel-entity-name="WorkEffort"> @@ -631,8 +631,8 @@ under the License. <entity entity-name="WorkEffortCostCalc" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Cost Calculation Entity"> - <field name="workEffortId" type="id-ne"></field> - <field name="costComponentTypeId" type="id-ne"></field> + <field name="workEffortId" type="id"></field> + <field name="costComponentTypeId" type="id"></field> <field name="costComponentCalcId" type="id-ne"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> @@ -651,7 +651,7 @@ under the License. </entity> <entity entity-name="WorkEffortKeyword" package-name="org.apache.ofbiz.workeffort.workeffort" title="WorkEffort Keyword Entity" never-cache="true"> - <field name="workEffortId" type="id-ne"></field> + <field name="workEffortId" type="id"></field> <field name="keyword" type="short-varchar"></field> <field name="relevancyWeight" type="numeric"></field> <prim-key field="workEffortId"/> @@ -666,8 +666,8 @@ under the License. <entity entity-name="WorkEffortNote" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Note Entity"> - <field name="workEffortId" type="id-ne"></field> - <field name="noteId" type="id-ne"></field> + <field name="workEffortId" type="id"></field> + <field name="noteId" type="id"></field> <field name="internalNote" type="indicator"></field> <prim-key field="workEffortId"/> <prim-key field="noteId"/> @@ -679,9 +679,9 @@ under the License. </relation> </entity> <entity entity-name="WorkEffortPartyAssignment" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Party Assignment Entity"> - <field name="workEffortId" type="id-ne"></field> - <field name="partyId" type="id-ne"></field> - <field name="roleTypeId" type="id-ne"></field> + <field name="workEffortId" type="id"></field> + <field name="partyId" type="id"></field> + <field name="roleTypeId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="assignedByUserLoginId" type="id-vlong"></field> @@ -731,8 +731,8 @@ under the License. </entity> <entity entity-name="WorkEffortPurposeType" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Purpose Type Entity" default-resource-name="WorkEffortEntityLabels"> - <field name="workEffortPurposeTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="workEffortPurposeTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="description" type="description"></field> <prim-key field="workEffortPurposeTypeId"/> <relation type="one" fk-name="WK_EFFRT_PTYPE_PAR" title="Parent" rel-entity-name="WorkEffortPurposeType"> @@ -740,8 +740,8 @@ under the License. </relation> </entity> <entity entity-name="WorkEffortReview" package-name="org.apache.ofbiz.workeffort.workeffort" title="WorkEffort Review Entity"> - <field name="workEffortId" type="id-ne"></field> - <field name="userLoginId" type="id-vlong-ne"></field> + <field name="workEffortId" type="id"></field> + <field name="userLoginId" type="id-vlong"></field> <field name="reviewDate" type="date-time"></field> <field name="statusId" type="id"></field> <field name="postedAnonymous" type="indicator"></field> @@ -761,8 +761,8 @@ under the License. </relation> </entity> <entity entity-name="WorkEffortSearchConstraint" package-name="org.apache.ofbiz.workeffort.workeffort" never-cache="true" title="WorkEffort Search Result Constraint Entity"> - <field name="workEffortSearchResultId" type="id-ne"></field> - <field name="constraintSeqId" type="id-ne"></field> + <field name="workEffortSearchResultId" type="id"></field> + <field name="constraintSeqId" type="id"></field> <field name="constraintName" type="long-varchar"></field> <field name="infoString" type="long-varchar"></field> <field name="includeSubWorkEfforts" type="indicator"></field> @@ -779,7 +779,7 @@ under the License. </relation> </entity> <entity entity-name="WorkEffortSearchResult" package-name="org.apache.ofbiz.workeffort.workeffort" never-cache="true" title="WorkEffort Search Result Entity"> - <field name="workEffortSearchResultId" type="id-ne"></field> + <field name="workEffortSearchResultId" type="id"></field> <field name="visitId" type="id"></field> <field name="orderByName" type="long-varchar"></field> <field name="isAscending" type="indicator"></field> @@ -791,8 +791,8 @@ under the License. <entity entity-name="WorkEffortSkillStandard" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Skill Standard Entity"> - <field name="workEffortId" type="id-ne"></field> - <field name="skillTypeId" type="id-ne"></field> + <field name="workEffortId" type="id"></field> + <field name="skillTypeId" type="id"></field> <field name="estimatedNumPeople" type="floating-point"></field> <field name="estimatedDuration" type="floating-point"></field> <field name="estimatedCost" type="currency-amount"></field> @@ -808,8 +808,8 @@ under the License. <entity entity-name="WorkEffortStatus" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Status Entity"> - <field name="workEffortId" type="id-ne"></field> - <field name="statusId" type="id-ne"></field> + <field name="workEffortId" type="id"></field> + <field name="statusId" type="id"></field> <field name="statusDatetime" type="date-time"></field> <field name="setByUserLogin" type="id-vlong"></field> <field name="reason" type="description"></field> @@ -829,9 +829,9 @@ under the License. <entity entity-name="WorkEffortTransBox" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Transition Box Entity"> - <field name="processWorkEffortId" type="id-ne"></field> - <field name="toActivityId" type="id-long-ne"></field> - <field name="transitionId" type="id-long-ne"></field> + <field name="processWorkEffortId" type="id"></field> + <field name="toActivityId" type="id-long"></field> + <field name="transitionId" type="id-long"></field> <prim-key field="processWorkEffortId"/> <prim-key field="toActivityId"/> <prim-key field="transitionId"/> @@ -843,8 +843,8 @@ under the License. package-name="org.apache.ofbiz.workeffort.workeffort" default-resource-name="WorkEffortEntityLabels" title="Work Effort Type Entity"> - <field name="workEffortTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="workEffortTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="workEffortTypeId"/> @@ -855,8 +855,8 @@ under the License. <entity entity-name="WorkEffortTypeAttr" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Type Attribute Entity"> - <field name="workEffortTypeId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="workEffortTypeId" type="id"></field> + <field name="attrName" type="id-long"></field> <field name="description" type="description"></field> <prim-key field="workEffortTypeId"/> <prim-key field="attrName"/> @@ -873,8 +873,8 @@ under the License. <entity entity-name="WorkEffortSurveyAppl" package-name="org.apache.ofbiz.workeffort.workeffort" title="Work Effort Survey Appl Entity"> - <field name="workEffortId" type="id-ne"/> - <field name="surveyId" type="id-ne"/> + <field name="workEffortId" type="id"/> + <field name="surveyId" type="id"/> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <prim-key field="workEffortId"/> Modified: ofbiz/ofbiz-framework/trunk/framework/catalina/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/catalina/entitydef/entitymodel.xml?rev=1796379&r1=1796378&r2=1796379&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/catalina/entitydef/entitymodel.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/catalina/entitydef/entitymodel.xml Sat May 27 11:28:36 2017 @@ -41,7 +41,7 @@ under the License. <entity entity-name="CatalinaSession" package-name="org.apache.ofbiz.catalina.session" title="Catalina Session Store"> - <field name="sessionId" type="id-long-ne"></field> + <field name="sessionId" type="id-long"></field> <field name="sessionSize" type="numeric"></field> <field name="sessionInfo" type="blob"></field> <field name="isValid" type="indicator"></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=1796379&r1=1796378&r2=1796379&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/entitydef/entitymodel.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/entitydef/entitymodel.xml Sat May 27 11:28:36 2017 @@ -53,7 +53,7 @@ under the License. package-name="org.apache.ofbiz.common.datasource" default-resource-name="CommonEntityLabels" title="Data Source Entity"> - <field name="dataSourceId" type="id-ne"></field> + <field name="dataSourceId" type="id"></field> <field name="dataSourceTypeId" type="id"></field> <field name="description" type="description"></field> <prim-key field="dataSourceId"/> @@ -74,7 +74,7 @@ under the License. <!-- ========================================================= --> <entity entity-name="EmailTemplateSetting" package-name="org.apache.ofbiz.common.email" title="Email Template Setting Entity"> - <field name="emailTemplateSettingId" type="id-ne"></field> + <field name="emailTemplateSettingId" type="id"></field> <field name="emailType" type="id-ne"></field> <field name="description" type="description"></field> <field name="bodyScreenLocation" type="long-varchar"><description>if empty defaults to a screen based on the emailType</description></field> @@ -98,7 +98,7 @@ under the License. package-name="org.apache.ofbiz.common.enum" default-resource-name="CommonEntityLabels" title="Enumeration Entity"> - <field name="enumId" type="id-ne"></field> + <field name="enumId" type="id"></field> <field name="enumTypeId" type="id-ne"></field> <field name="enumCode" type="short-varchar"></field> <field name="sequenceId" type="id"></field> @@ -112,7 +112,7 @@ under the License. package-name="org.apache.ofbiz.common.enum" default-resource-name="CommonEntityLabels" title="Enumeration Type Entity"> - <field name="enumTypeId" type="id-ne"></field> + <field name="enumTypeId" type="id"></field> <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> @@ -148,7 +148,7 @@ under the License. package-name="org.apache.ofbiz.common.geo" dependent-on="CountryCode" title="Country Capital Entity"> - <field name="countryCode" type="id-ne"></field> + <field name="countryCode" type="id"></field> <field name="countryCapital" type="description"></field> <prim-key field="countryCode"/> <relation type="one" fk-name="CNTRY_CAP_TO_CODE" rel-entity-name="CountryCode"> @@ -158,7 +158,7 @@ under the License. <entity entity-name="CountryCode" package-name="org.apache.ofbiz.common.geo" title="ISO Country Code Entity"> - <field name="countryCode" type="id-ne"></field> + <field name="countryCode" type="id"></field> <field name="countryAbbr" type="short-varchar"></field> <field name="countryNumber" type="short-varchar"></field> <field name="countryName" type="description"></field> @@ -168,7 +168,7 @@ under the License. package-name="org.apache.ofbiz.common.geo" dependent-on="CountryCode" title="Telephone Country Code Entity"> - <field name="countryCode" type="id-ne"></field> + <field name="countryCode" type="id"></field> <field name="teleCode" type="short-varchar"></field> <prim-key field="countryCode"/> <relation type="one" fk-name="CNTRY_TELE_TO_CODE" rel-entity-name="CountryCode"> @@ -188,7 +188,7 @@ under the License. </view-entity> <entity entity-name="CountryAddressFormat" package-name="org.apache.ofbiz.common.geo" default-resource-name="CommonEntityLabels" title=""> - <field name="geoId" type="id-ne"></field> + <field name="geoId" type="id"></field> <field name="geoAssocTypeId" type="id"></field> <field name="requireStateProvinceId" type="id"></field> <field name="requirePostalCode" type="indicator"></field> @@ -207,7 +207,7 @@ under the License. <entity entity-name="Geo" package-name="org.apache.ofbiz.common.geo" default-resource-name="CommonEntityLabels" title="Geographic Boundary Entity"> - <field name="geoId" type="id-ne"></field> + <field name="geoId" type="id"></field> <field name="geoTypeId" type="id"></field> <field name="geoName" type="name"></field> <field name="geoCode" type="short-varchar"></field> @@ -221,10 +221,10 @@ under the License. </entity> <entity entity-name="GeoAssoc" package-name="org.apache.ofbiz.common.geo" title="Geographic Boundary Association Entity"> - <field name="geoId" type="id-ne"> + <field name="geoId" type="id"> <description>The enclosed geo</description> </field> - <field name="geoIdTo" type="id-ne"> + <field name="geoIdTo" type="id"> <description>The enclosing geo</description> </field> <field name="geoAssocTypeId" type="id"></field> @@ -276,13 +276,13 @@ under the License. </view-entity> <entity entity-name="GeoAssocType" package-name="org.apache.ofbiz.common.geo" title="Geographic Boundary Association Entity" default-resource-name="CommonEntityLabels"> - <field name="geoAssocTypeId" type="id-ne"></field> + <field name="geoAssocTypeId" type="id"></field> <field name="description" type="description"></field> <prim-key field="geoAssocTypeId"/> </entity> <entity entity-name="GeoPoint" package-name="org.apache.ofbiz.common.geo" default-resource-name="CommonEntityLabels" title="Geographic Location"> - <field name="geoPointId" type="id-ne"></field> + <field name="geoPointId" type="id"></field> <field name="geoPointTypeEnumId" type="id"/> <field name="description" type="description"></field> <field name="dataSourceId" type="id"></field> @@ -304,8 +304,8 @@ under the License. </entity> <entity entity-name="GeoType" package-name="org.apache.ofbiz.common.geo" default-resource-name="CommonEntityLabels" title="Geographic Boundary Type Entity"> - <field name="geoTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="geoTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="geoTypeId"/> @@ -340,7 +340,7 @@ under the License. <entity entity-name="StandardLanguage" package-name="org.apache.ofbiz.common.language"> - <field name="standardLanguageId" type="id-ne"></field> + <field name="standardLanguageId" type="id"></field> <field name="langCode3t" type="very-short"></field> <field name="langCode3b" type="very-short"></field> <field name="langCode2" type="very-short"></field> @@ -358,7 +358,7 @@ under the License. package-name="org.apache.ofbiz.common.method" default-resource-name="CommonEntityLabels" title="Custom Method Entity"> - <field name="customMethodId" type="id-ne"></field> + <field name="customMethodId" type="id"></field> <field name="customMethodTypeId" type="id"></field> <field name="customMethodName" type="long-varchar"></field> <field name="description" type="description"></field> @@ -370,8 +370,8 @@ under the License. <entity entity-name="CustomMethodType" package-name="org.apache.ofbiz.common.method" title="Custom Method Type Entity"> - <field name="customMethodTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="customMethodTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="customMethodTypeId"/> @@ -387,7 +387,7 @@ under the License. <entity entity-name="NoteData" package-name="org.apache.ofbiz.common.note" title="Note Data Entity"> - <field name="noteId" type="id-ne"></field> + <field name="noteId" type="id"></field> <field name="noteName" type="name"></field> <field name="noteInfo" type="very-long"></field> <field name="noteDateTime" type="date-time"></field> @@ -401,7 +401,7 @@ under the License. <entity entity-name="CustomTimePeriod" package-name="org.apache.ofbiz.common.period" title="Custom Time Period Entity"> - <field name="customTimePeriodId" type="id-ne"></field> + <field name="customTimePeriodId" type="id"></field> <field name="parentPeriodId" type="id"></field> <field name="periodTypeId" type="id"></field> <field name="periodNum" type="numeric"></field> @@ -420,7 +420,7 @@ under the License. <entity entity-name="PeriodType" package-name="org.apache.ofbiz.common.period" title="Period Type Entity"> - <field name="periodTypeId" type="id-ne"></field> + <field name="periodTypeId" type="id"></field> <field name="description" type="description"></field> <field name="periodLength" type="numeric"></field> <field name="uomId" type="id"></field> @@ -438,7 +438,7 @@ under the License. package-name="org.apache.ofbiz.common.status" default-resource-name="CommonEntityLabels" title="Status Entity"> - <field name="statusId" type="id-ne"></field> + <field name="statusId" type="id"></field> <field name="statusTypeId" type="id-ne"></field> <field name="statusCode" type="short-varchar"></field> <field name="sequenceId" type="id"></field> @@ -452,7 +452,7 @@ under the License. package-name="org.apache.ofbiz.common.status" default-resource-name="CommonEntityLabels" title="Status Type Entity"> - <field name="statusTypeId" type="id-ne"></field> + <field name="statusTypeId" type="id"></field> <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> @@ -465,8 +465,8 @@ under the License. package-name="org.apache.ofbiz.common.status" default-resource-name="CommonEntityLabels" title="Status Valid Change Entity"> - <field name="statusId" type="id-ne"></field> - <field name="statusIdTo" type="id-ne"></field> + <field name="statusId" type="id"></field> + <field name="statusIdTo" type="id"></field> <field name="conditionExpression" type="long-varchar"></field> <field name="transitionName" type="name"></field> <prim-key field="statusId"/> @@ -508,7 +508,7 @@ under the License. package-name="org.apache.ofbiz.common.uom" default-resource-name="CommonEntityLabels" title="Unit Of Measure Entity"> - <field name="uomId" type="id-ne"></field> + <field name="uomId" type="id"></field> <field name="uomTypeId" type="id"></field> <field name="abbreviation" type="short-varchar"></field> <field name="description" type="description"></field> @@ -547,8 +547,8 @@ under the License. <entity entity-name="UomConversion" package-name="org.apache.ofbiz.common.uom" title="Unit Of Measure Conversion Type Entity"> - <field name="uomId" type="id-ne"></field> - <field name="uomIdTo" type="id-ne"></field> + <field name="uomId" type="id"></field> + <field name="uomIdTo" type="id"></field> <field name="conversionFactor" type="floating-point"></field> <field name="customMethodId" type="id-ne"></field> <field name="decimalScale" type="numeric"></field> @@ -568,8 +568,8 @@ under the License. <entity entity-name="UomConversionDated" package-name="org.apache.ofbiz.common.uom" title="Unit Of Measure Conversion Entity for those Units of Measure whose conversion values change over time (ie, currencies)"> - <field name="uomId" type="id-ne"></field> - <field name="uomIdTo" type="id-ne"></field> + <field name="uomId" type="id"></field> + <field name="uomIdTo" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="conversionFactor" type="floating-point"></field> @@ -597,8 +597,8 @@ under the License. package-name="org.apache.ofbiz.common.uom" default-resource-name="CommonEntityLabels" title="Unit Of Measure Group Entity"> - <field name="uomGroupId" type="id-ne"></field> - <field name="uomId" type="id-ne"></field> + <field name="uomGroupId" type="id"></field> + <field name="uomId" type="id"></field> <prim-key field="uomGroupId"/> <prim-key field="uomId"/> <relation type="one" fk-name="UOM_GROUP_UOM" rel-entity-name="Uom"> @@ -609,8 +609,8 @@ under the License. package-name="org.apache.ofbiz.common.uom" default-resource-name="CommonEntityLabels" title="Unit Of Measure Type Entity"> - <field name="uomTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="uomTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="uomTypeId"/> @@ -631,8 +631,8 @@ under the License. All values are stored as strings. Value strings can be converted to other data types by specifying a java data type in the userPrefDataType field. </description> - <field name="userLoginId" type="id-vlong-ne"></field> - <field name="userPrefTypeId" type="id-long-ne"><description>A unique identifier for this preference</description></field> + <field name="userLoginId" type="id-vlong"></field> + <field name="userPrefTypeId" type="id-long"><description>A unique identifier for this preference</description></field> <field name="userPrefGroupTypeId" type="id-long"><description>Used to assemble groups of preferences</description></field> <field name="userPrefValue" type="value"><description>Contains the value of this preference</description></field> <field name="userPrefDataType" type="id-long"><description>The java data type of this preference (empty = java.lang.String)</description></field> @@ -646,7 +646,7 @@ under the License. <description>The UserPrefGroupType entity contains one entry per preference group type. </description> - <field name="userPrefGroupTypeId" type="id-long-ne"></field> + <field name="userPrefGroupTypeId" type="id-long"></field> <field name="description" type="description"></field> <prim-key field="userPrefGroupTypeId"/> </entity> @@ -659,7 +659,7 @@ under the License. package-name="org.apache.ofbiz.common.theme" title="Defines a set of Visual Themes"> <description>Groups toghether Visual Themes that can be used for one (or a set of) application.</description> - <field name="visualThemeSetId" type="id-ne"></field> + <field name="visualThemeSetId" type="id"></field> <field name="description" type="description"></field> <prim-key field="visualThemeSetId"/> </entity> @@ -669,7 +669,7 @@ under the License. default-resource-name="CommonEntityLabels" title="Defines a Visual Theme"> <description>The VisualTheme entity contains one entry per visual theme.</description> - <field name="visualThemeId" type="id-ne"></field> + <field name="visualThemeId" type="id"></field> <field name="visualThemeSetId" type="id"></field> <field name="description" type="description"></field> <prim-key field="visualThemeId"/> @@ -683,9 +683,9 @@ under the License. title="Contains All Visual Theme Resources"> <description>The VisualThemeResource entity contains visual theme resources. Each visual theme can have any number of resources.</description> - <field name="visualThemeId" type="id-ne"></field> - <field name="resourceTypeEnumId" type="id-ne"></field> - <field name="sequenceId" type="id-ne"><description>Controls the loading order of duplicate resource types</description></field> + <field name="visualThemeId" type="id"></field> + <field name="resourceTypeEnumId" type="id"></field> + <field name="sequenceId" type="id"><description>Controls the loading order of duplicate resource types</description></field> <field name="resourceValue" type="value"><description>Contains the resource value</description></field> <prim-key field="visualThemeId"/> <prim-key field="resourceTypeEnumId"/> @@ -703,7 +703,7 @@ under the License. <!-- ============================ --> <entity entity-name="PortalPortlet" package-name="org.apache.ofbiz.common.portal" title="Defines a Portlet to be used in Portals"> - <field name="portalPortletId" type="id-ne"></field> + <field name="portalPortletId" type="id"></field> <field name="portletName" type="name"></field> <field name="screenName" type="long-varchar"></field> <field name="screenLocation" type="long-varchar"></field> @@ -716,13 +716,13 @@ under the License. <prim-key field="portalPortletId"/> </entity> <entity entity-name="PortletCategory" package-name="org.apache.ofbiz.common.portal" title="Portlet Category Entity"> - <field name="portletCategoryId" type="id-ne"/> + <field name="portletCategoryId" type="id"/> <field name="description" type="description"/> <prim-key field="portletCategoryId"/> </entity> <entity entity-name="PortletPortletCategory" package-name="org.apache.ofbiz.common.portal" title="Defines Portlets included into Categories"> - <field name="portalPortletId" type="id-ne"/> - <field name="portletCategoryId" type="id-ne"/> + <field name="portalPortletId" type="id"/> + <field name="portletCategoryId" type="id"/> <prim-key field="portalPortletId"/> <prim-key field="portletCategoryId"/> <relation type="one" fk-name="PPTLTCAT_PTPL" rel-entity-name="PortalPortlet"> @@ -734,7 +734,7 @@ under the License. </entity> <entity entity-name="PortalPage" package-name="org.apache.ofbiz.common.portal" title="Defines a Portal Page" default-resource-name="CommonPortalEntityLabels"> - <field name="portalPageId" type="id-ne"></field> + <field name="portalPageId" type="id"></field> <field name="portalPageName" type="name"></field> <field name="description" type="description"></field> <!-- defined in an extend in content component to avoid dependencies between common and content @@ -773,8 +773,8 @@ under the License. </view-link> </view-entity> <entity entity-name="PortalPageColumn" package-name="org.apache.ofbiz.common.portal" title="Defines a Portal Page"> - <field name="portalPageId" type="id-ne"></field> - <field name="columnSeqId" type="id-ne"></field> + <field name="portalPageId" type="id"></field> + <field name="columnSeqId" type="id"></field> <field name="columnWidthPixels" type="numeric"></field> <field name="columnWidthPercentage" type="numeric"></field> <prim-key field="portalPageId"/> @@ -784,9 +784,9 @@ under the License. </relation> </entity> <entity entity-name="PortalPagePortlet" package-name="org.apache.ofbiz.common.portal" title="Defines Portlets included into Portal Pages"> - <field name="portalPageId" type="id-ne"></field> - <field name="portalPortletId" type="id-ne"></field> - <field name="portletSeqId" type="id-ne"><description>Identify the portalPortlet instance in case more copy of the same portalPortlet are present in the same portalPage</description></field> + <field name="portalPageId" type="id"></field> + <field name="portalPortletId" type="id"></field> + <field name="portletSeqId" type="id"><description>Identify the portalPortlet instance in case more copy of the same portalPortlet are present in the same portalPage</description></field> <field name="columnSeqId" type="id-ne"></field> <field name="sequenceNum" type="numeric"></field> <prim-key field="portalPageId"/> @@ -813,10 +813,10 @@ under the License. </view-link> </view-entity> <entity entity-name="PortletAttribute" package-name="org.apache.ofbiz.common.portal" title="Allows to set different attribute values for each instance of the same portlet"> - <field name="portalPageId" type="id-ne"></field> - <field name="portalPortletId" type="id-ne"></field> - <field name="portletSeqId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="portalPageId" type="id"></field> + <field name="portalPortletId" type="id"></field> + <field name="portletSeqId" type="id"></field> + <field name="attrName" type="id-long"></field> <field name="attrValue" type="value"></field> <field name="attrDescription" type="description"></field> <field name="attrType" type="value"></field> @@ -847,8 +847,8 @@ under the License. <!-- ============================ --> <entity entity-name="SystemProperty" package-name="org.apache.ofbiz.common.property" title="Defines a System Property"> - <field name="systemResourceId" type="id-long-ne"></field> - <field name="systemPropertyId" type="id-long-ne"></field> + <field name="systemResourceId" type="id-long"></field> + <field name="systemPropertyId" type="id-long"></field> <field name="systemPropertyValue" type="value"></field> <field name="description" type="description"></field> <prim-key field="systemResourceId"/> 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=1796379&r1=1796378&r2=1796379&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entityext/entitydef/entitymodel.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/entityext/entitydef/entitymodel.xml Sat May 27 11:28:36 2017 @@ -43,14 +43,14 @@ under the License. <entity entity-name="EntityGroup" package-name="org.apache.ofbiz.entity.group" title="Entity Grouping Entity"> - <field name="entityGroupId" type="id-ne"></field> + <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"> - <field name="entityGroupId" type="id-ne"></field> + <field name="entityGroupId" type="id"></field> <field name="entityOrPackage" type="long-varchar"></field> <field name="applEnumId" type="id-ne"></field> <prim-key field="entityGroupId"/> @@ -67,7 +67,7 @@ under the License. <entity entity-name="EntitySync" package-name="org.apache.ofbiz.entity.synchronization" title="Entity Synchronization Entity"> - <field name="entitySyncId" type="id-ne"></field> + <field name="entitySyncId" type="id"></field> <field name="runStatusId" type="id-ne"></field> <field name="lastSuccessfulSynchTime" type="date-time"></field> <field name="lastHistoryStartDate" type="date-time"></field> @@ -93,7 +93,7 @@ under the License. <entity entity-name="EntitySyncHistory" package-name="org.apache.ofbiz.entity.synchronization" title="Entity Synchronization History Entity"> - <field name="entitySyncId" type="id-ne"></field> + <field name="entitySyncId" type="id"></field> <field name="startDate" type="date-time"></field> <field name="runStatusId" type="id-ne"></field> <field name="beginningSynchTime" type="date-time"></field> @@ -128,7 +128,7 @@ under the License. <entity entity-name="EntitySyncInclude" package-name="org.apache.ofbiz.entity.synchronization" title="Entity Synchronization Include Entity"> - <field name="entitySyncId" type="id-ne"></field> + <field name="entitySyncId" type="id"></field> <field name="entityOrPackage" type="long-varchar"></field> <field name="applEnumId" type="id-ne"></field> <prim-key field="entitySyncId"/> @@ -140,8 +140,8 @@ under the License. <entity entity-name="EntitySyncIncludeGroup" package-name="org.apache.ofbiz.entity.synchronization" title="Entity Synchronization Include Entity Group Entity"> - <field name="entitySyncId" type="id-ne"></field> - <field name="entityGroupId" type="id-ne"></field> + <field name="entitySyncId" type="id"></field> + <field name="entityGroupId" type="id"></field> <prim-key field="entitySyncId"/> <prim-key field="entityGroupId"/> <relation type="one" fk-name="ENTSNCGU_GRP" rel-entity-name="EntityGroup"> @@ -165,7 +165,7 @@ under the License. <entity entity-name="EntitySyncRemove" package-name="org.apache.ofbiz.entity.synchronization" title="Entity Synchronization Remove Entity"> - <field name="entitySyncRemoveId" type="id-ne"></field> + <field name="entitySyncRemoveId" type="id"></field> <field name="primaryKeyRemoved" type="very-long"></field> <prim-key field="entitySyncRemoveId"/> </entity> 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=1796379&r1=1796378&r2=1796379&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/security/entitydef/entitymodel.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/security/entitydef/entitymodel.xml Sat May 27 11:28:36 2017 @@ -43,7 +43,7 @@ under the License. package-name="org.apache.ofbiz.security.cert" never-cache="true" title="Valid issuer data for authentication of x.509 certificates"> - <field name="certProvisionId" type="id-ne"></field> + <field name="certProvisionId" type="id"></field> <field name="commonName" type="value"></field> <field name="organizationalUnit" type="value"></field> <field name="organizationName" type="value"></field> @@ -61,7 +61,7 @@ under the License. <entity entity-name="UserLogin" package-name="org.apache.ofbiz.security.login" title="User Login Entity"> - <field name="userLoginId" type="id-vlong-ne"></field> + <field name="userLoginId" type="id-vlong"></field> <field name="currentPassword" type="long-varchar"></field> <field name="passwordHint" type="description"></field> <field name="isSystem" type="indicator"></field> @@ -86,7 +86,7 @@ under the License. package-name="org.apache.ofbiz.security.login" never-cache="true" title="User Login Password History Entity"> - <field name="userLoginId" type="id-vlong-ne"></field> + <field name="userLoginId" type="id-vlong"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="currentPassword" type="long-varchar"></field> @@ -100,7 +100,7 @@ under the License. package-name="org.apache.ofbiz.security.login" never-cache="true" title="User Login History Entity"> - <field name="userLoginId" type="id-vlong-ne"></field> + <field name="userLoginId" type="id-vlong"></field> <field name="visitId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> @@ -116,7 +116,7 @@ under the License. package-name="org.apache.ofbiz.security.login" never-cache="true" title="User Login History Entity"> - <field name="userLoginId" type="id-vlong-ne"></field> + <field name="userLoginId" type="id-vlong"></field> <field name="savedDate" type="date-time"></field> <field name="sessionData" type="very-long"></field> <prim-key field="userLoginId"/> @@ -133,7 +133,7 @@ under the License. package-name="org.apache.ofbiz.security.securitygroup" default-resource-name="SecurityEntityLabels" title="Security Component - Security Group Entity"> - <field name="groupId" type="id-ne"></field> + <field name="groupId" type="id"></field> <field name="description" type="description"></field> <prim-key field="groupId"/> </entity> @@ -141,8 +141,8 @@ under the License. package-name="org.apache.ofbiz.security.securitygroup" title="Security Component - Security Group Permission Entity"> <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-ne"></field> - <field name="permissionId" type="id-long-ne"></field> + <field name="groupId" type="id"></field> + <field name="permissionId" type="id-long"></field> <prim-key field="groupId"/> <prim-key field="permissionId"/> <relation type="one" fk-name="SEC_GRP_PERM_GRP" rel-entity-name="SecurityGroup"> @@ -156,7 +156,7 @@ under the License. package-name="org.apache.ofbiz.security.securitygroup" default-resource-name="SecurityEntityLabels" title="Security Component - Security Permission Entity"> - <field name="permissionId" type="id-long-ne"></field> + <field name="permissionId" type="id-long"></field> <field name="description" type="description"></field> <prim-key field="permissionId"/> </entity> @@ -176,8 +176,8 @@ under the License. package-name="org.apache.ofbiz.security.securitygroup" title="Security Component - User Login Security Group Entity"> <description>Maps a UserLogin to a security group</description> - <field name="userLoginId" type="id-vlong-ne"></field> - <field name="groupId" type="id-ne"></field> + <field name="userLoginId" type="id-vlong"></field> + <field name="groupId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <prim-key field="userLoginId"/> @@ -197,8 +197,8 @@ under the License. package-name="org.apache.ofbiz.security.securitygroup" title="Security Component - Protected View Entity"> <description>Defines views protected from data leakage</description> - <field name="groupId" type="id-ne"></field> - <field name="viewNameId" type="id-long-ne"><description>name of view to protect from data theft</description></field> + <field name="groupId" type="id"></field> + <field name="viewNameId" type="id-long"><description>name of view to protect from data theft</description></field> <field name="maxHits" type="numeric"><description>number of hits before tarpitting a login for a view</description></field> <field name="maxHitsDuration" type="numeric"><description>period of time associated with maxHits (in seconds)</description></field> <field name="tarpitDuration" type="numeric"><description>period of time a login will not be able to acces this view again (in seconds)</description></field> @@ -226,15 +226,15 @@ under the License. package-name="org.apache.ofbiz.security.securitygroup" title="Security Component - Protected View Entity"> <description>Login View couple currently tarpitted : any access to the view for the login is denied</description> - <field name="viewNameId" type="id-long-ne"><description>name of view protected from data theft</description></field> - <field name="userLoginId" type="id-vlong-ne"/> + <field name="viewNameId" type="id-long"><description>name of view protected from data theft</description></field> + <field name="userLoginId" type="id-vlong"/> <field name="tarpitReleaseDateTime" type="numeric"><description>Date/Time at which the login will gain anew access to the view (in milliseconds from midnight, January 1, 1970 UTC , 0 meaning no tarpit to allow the admin to free a view and to keep history</description></field> <prim-key field="viewNameId"/> <prim-key field="userLoginId"/> </entity> <entity entity-name="UserLoginSecurityQuestion" package-name="org.apache.ofbiz.security.login"> - <field name="questionEnumId" type="id-ne" /> - <field name="userLoginId" type="id-vlong-ne" /> + <field name="questionEnumId" type="id" /> + <field name="userLoginId" type="id-vlong" /> <field name="securityAnswer" type="description" /> <prim-key field="questionEnumId"/> <prim-key field="userLoginId"/> 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=1796379&r1=1796378&r2=1796379&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/entitydef/entitymodel.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/entitydef/entitymodel.xml Sat May 27 11:28:36 2017 @@ -41,7 +41,7 @@ under the License. <entity entity-name="JobSandbox" package-name="org.apache.ofbiz.service.schedule" title="Job Scheduler Sandbox Entity" sequence-bank-size="100" never-cache="true"> - <field name="jobId" type="id-ne"></field> + <field name="jobId" type="id"></field> <field name="jobName" type="name"></field> <field name="runTime" type="date-time"></field> <field name="poolId" type="name"></field> @@ -91,7 +91,7 @@ under the License. <entity entity-name="RecurrenceInfo" package-name="org.apache.ofbiz.service.schedule" title="Recurrence Info Entity"> - <field name="recurrenceInfoId" type="id-ne"></field> + <field name="recurrenceInfoId" type="id"></field> <field name="startDateTime" type="date-time"></field> <field name="exceptionDateTimes" type="very-long"></field> <field name="recurrenceDateTimes" type="very-long"></field> @@ -109,7 +109,7 @@ under the License. <entity entity-name="RecurrenceRule" package-name="org.apache.ofbiz.service.schedule" title="Recurrence Rule Entity"> - <field name="recurrenceRuleId" type="id-ne"></field> + <field name="recurrenceRuleId" type="id"></field> <field name="frequency" type="short-varchar"></field> <field name="untilDateTime" type="date-time"></field> <field name="countNumber" type="numeric"></field> @@ -129,7 +129,7 @@ under the License. </entity> <entity entity-name="RuntimeData" package-name="org.apache.ofbiz.service.schedule" title="Runtime Data Entity" sequence-bank-size="100"> - <field name="runtimeDataId" type="id-ne"></field> + <field name="runtimeDataId" type="id"></field> <field name="runtimeInfo" type="very-long"></field> <prim-key field="runtimeDataId"/> </entity> @@ -140,7 +140,7 @@ under the License. <entity entity-name="TemporalExpression" package-name="org.apache.ofbiz.service.schedule" title="Temporal Expression"> - <field name="tempExprId" type="id-ne"></field> + <field name="tempExprId" type="id"></field> <field name="tempExprTypeId" type="id-ne"></field> <field name="description" type="description"></field> <field name="date1" type="date-time"></field> @@ -155,8 +155,8 @@ under the License. <entity entity-name="TemporalExpressionAssoc" package-name="org.apache.ofbiz.service.schedule" title="Temporal Expression Association"> - <field name="fromTempExprId" type="id-ne"><description>The "parent" expression</description></field> - <field name="toTempExprId" type="id-ne"><description>The "child" expression</description></field> + <field name="fromTempExprId" type="id"><description>The "parent" expression</description></field> + <field name="toTempExprId" type="id"><description>The "child" expression</description></field> <field name="exprAssocType" type="id"><description>Expression association type. When applied to DIFFERENCE expression types, valid values are INCLUDE or EXCLUDE. When applied to SUBSTITUTION expression types, valid values are INCLUDE, EXCLUDE, or SUBSTITUTE.
