svn commit: r1796379 [4/8] - in /ofbiz: ofbiz-framework/trunk/applications/datamodel/entitydef/ ofbiz-framework/trunk/framework/catalina/entitydef/ ofbiz-framework/trunk/framework/common/entitydef/ ofbiz-framework/trunk/framework/entityext/entitydef/ o...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1796379 [4/8] - in /ofbiz: ofbiz-framework/trunk/applications/datamodel/entitydef/ ofbiz-framework/trunk/framework/catalina/entitydef/ ofbiz-framework/trunk/framework/common/entitydef/ ofbiz-framework/trunk/framework/entityext/entitydef/ o...

Deepak Dixit-5
Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/order-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/order-entitymodel.xml?rev=1796379&r1=1796378&r2=1796379&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/order-entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/order-entitymodel.xml Sat May 27 11:28:36 2017
@@ -50,7 +50,7 @@ under the License.
             never-cache="true"
             title="Order Adjustment Entity">
       <description>Note that both includeInTax and includeInShipping should default to true, except in the case where this adjustment is a tax or shipping adjustment then should be ignored.</description>
-      <field name="orderAdjustmentId" type="id-ne"></field>
+      <field name="orderAdjustmentId" type="id"></field>
       <field name="orderAdjustmentTypeId" type="id"></field>
       <field name="orderId" type="id"></field>
       <field name="orderItemSeqId" type="id"></field>
@@ -163,8 +163,8 @@ under the License.
     <entity entity-name="OrderAdjustmentAttribute"
             package-name="org.apache.ofbiz.order.order"
             title="Order Adjustment Attribute Entity">
-      <field name="orderAdjustmentId" type="id-ne"></field>
-      <field name="attrName" type="id-long-ne"></field>
+      <field name="orderAdjustmentId" 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="orderAdjustmentId"/>
@@ -180,8 +180,8 @@ under the License.
             package-name="org.apache.ofbiz.order.order"
             default-resource-name="OrderEntityLabels"
             title="Order Adjustment Type Entity">
-      <field name="orderAdjustmentTypeId" type="id-ne"></field>
-      <field name="parentTypeId" type="id-ne"></field>
+      <field name="orderAdjustmentTypeId" type="id"></field>
+      <field name="parentTypeId" type="id"></field>
       <field name="hasTable" type="indicator"></field>
       <field name="description" type="description"></field>
       <prim-key field="orderAdjustmentTypeId"/>
@@ -193,9 +193,9 @@ under the License.
             package-name="org.apache.ofbiz.order.order"
             never-cache="true"
             title="Order Adjustment Billing Entity">
-      <field name="orderAdjustmentId" type="id-ne"></field>
-      <field name="invoiceId" type="id-ne"></field>
-      <field name="invoiceItemSeqId" type="id-ne"></field>
+      <field name="orderAdjustmentId" type="id"></field>
+      <field name="invoiceId" type="id"></field>
+      <field name="invoiceItemSeqId" type="id"></field>
       <field name="amount" type="currency-amount"></field>
       <prim-key field="orderAdjustmentId"/>
       <prim-key field="invoiceId"/>
@@ -214,8 +214,8 @@ under the License.
     <entity entity-name="OrderAdjustmentTypeAttr"
             package-name="org.apache.ofbiz.order.order"
             title="Order Adjustment Type Attribute Entity">
-      <field name="orderAdjustmentTypeId" type="id-ne"></field>
-      <field name="attrName" type="id-long-ne"></field>
+      <field name="orderAdjustmentTypeId" type="id"></field>
+      <field name="attrName" type="id-long"></field>
       <field name="description" type="description"></field>
       <prim-key field="orderAdjustmentTypeId"/>
       <prim-key field="attrName"/>
@@ -232,8 +232,8 @@ under the License.
     <entity entity-name="OrderAttribute"
             package-name="org.apache.ofbiz.order.order"
             title="Order Attribute Entity">
-      <field name="orderId" type="id-ne"></field>
-      <field name="attrName" type="id-long-ne"></field>
+      <field name="orderId" 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="orderId"/>
@@ -249,7 +249,7 @@ under the License.
             package-name="org.apache.ofbiz.order.order"
             title="Order Blacklist Entity">
       <field name="blacklistString" type="long-varchar"></field>
-      <field name="orderBlacklistTypeId" type="id-ne"></field>
+      <field name="orderBlacklistTypeId" type="id"></field>
       <prim-key field="blacklistString"/>
       <prim-key field="orderBlacklistTypeId"/>
       <relation type="one" fk-name="ORDER_BKL_TYPE" rel-entity-name="OrderBlacklistType">
@@ -260,15 +260,15 @@ under the License.
             package-name="org.apache.ofbiz.order.order"
             default-resource-name="OrderEntityLabels"
             title="Order Blacklist Type Entity">
-      <field name="orderBlacklistTypeId" type="id-ne"></field>
+      <field name="orderBlacklistTypeId" type="id"></field>
       <field name="description" type="description"></field>
       <prim-key field="orderBlacklistTypeId"/>
     </entity>
      <entity entity-name="CommunicationEventOrder"
             package-name="org.apache.ofbiz.order.order"
             title="Communication Event Order Entity">
-      <field name="orderId" type="id-ne"></field>
-      <field name="communicationEventId" type="id-ne"></field>
+      <field name="orderId" type="id"></field>
+      <field name="communicationEventId" type="id"></field>
       <prim-key field="orderId"/>
       <prim-key field="communicationEventId"/>
       <relation type="one" fk-name="COMEV_ORDER_ORDER" rel-entity-name="OrderHeader">
@@ -282,9 +282,9 @@ under the License.
             package-name="org.apache.ofbiz.order.order"
             never-cache="true"
             title="Order Contact Mechanism Entity">
-      <field name="orderId" type="id-ne"></field>
-      <field name="contactMechPurposeTypeId" type="id-ne"></field>
-      <field name="contactMechId" type="id-ne"></field>
+      <field name="orderId" type="id"></field>
+      <field name="contactMechPurposeTypeId" type="id"></field>
+      <field name="contactMechId" type="id"></field>
       <prim-key field="orderId"/>
       <prim-key field="contactMechPurposeTypeId"/>
       <prim-key field="contactMechId"/>
@@ -299,10 +299,10 @@ under the License.
       </relation>
     </entity>
     <entity entity-name="OrderContent" package-name="org.apache.ofbiz.order.order" title="Order Data Object Entity">
-        <field name="orderId" type="id-ne"></field>
-        <field name="orderItemSeqId" type="id-ne"></field>
-        <field name="contentId" type="id-ne"></field>
-        <field name="orderContentTypeId" type="id-ne"></field>
+        <field name="orderId" type="id"></field>
+        <field name="orderItemSeqId" type="id"></field>
+        <field name="contentId" type="id"></field>
+        <field name="orderContentTypeId" type="id"></field>
         <field name="fromDate" type="date-time"></field>
         <field name="thruDate" type="date-time"></field>
         <prim-key field="contentId"/>
@@ -322,7 +322,7 @@ under the License.
     </entity>
     <entity entity-name="OrderContentType" package-name="org.apache.ofbiz.order.order" default-resource-name="OrderEntityLabels"
         title="Order Content Type Entity">
-        <field name="orderContentTypeId" type="id-ne"></field>
+        <field name="orderContentTypeId" type="id"></field>
         <field name="parentTypeId" type="id"></field>
         <field name="hasTable" type="indicator"></field>
         <field name="description" type="description"></field>
@@ -335,8 +335,8 @@ under the License.
             package-name="org.apache.ofbiz.order.order"
             never-cache="true"
             title="The Order Delivery Schedule Entity">
-      <field name="orderId" type="id-ne"></field>
-      <field name="orderItemSeqId" type="id-ne"></field>
+      <field name="orderId" type="id"></field>
+      <field name="orderItemSeqId" type="id"></field>
       <field name="estimatedReadyDate" type="date-time"></field>
       <field name="cartons" type="numeric"></field>
       <field name="skidsPallets" type="numeric"></field>
@@ -369,7 +369,7 @@ under the License.
             package-name="org.apache.ofbiz.order.order"
             never-cache="true"
             title="Order Header Entity">
-      <field name="orderId" type="id-ne"></field>
+      <field name="orderId" type="id"></field>
       <field name="orderTypeId" type="id"></field>
       <field name="orderName" type="name"></field>
       <field name="externalId" type="id"></field>
@@ -446,8 +446,8 @@ under the License.
             package-name="org.apache.ofbiz.order.order"
             never-cache="true"
             title="Order Header Note Entity">
-      <field name="orderId" type="id-ne"></field>
-      <field name="noteId" type="id-ne"></field>
+      <field name="orderId" type="id"></field>
+      <field name="noteId" type="id"></field>
       <field name="internalNote" type="indicator"></field>
       <prim-key field="orderId"/>
       <prim-key field="noteId"/>
@@ -461,8 +461,8 @@ under the License.
     <entity entity-name="OrderHeaderWorkEffort"
             package-name="org.apache.ofbiz.order.order"
             title="OrderHeader WorkEffort Entity">
-        <field name="orderId" type="id-ne"></field>
-        <field name="workEffortId" type="id-ne"></field>
+        <field name="orderId" type="id"></field>
+        <field name="workEffortId" type="id"></field>
         <prim-key field="orderId"/>
         <prim-key field="workEffortId"/>
         <relation type="one" fk-name="ORDERHDWE_OH" rel-entity-name="OrderHeader">
@@ -476,8 +476,8 @@ under the License.
             package-name="org.apache.ofbiz.order.order"
             never-cache="true"
             title="Order Item Entity">
-      <field name="orderId" type="id-ne"></field>
-      <field name="orderItemSeqId" type="id-ne"></field>
+      <field name="orderId" type="id"></field>
+      <field name="orderItemSeqId" type="id"></field>
       <field name="externalId" type="id"></field>
       <field name="orderItemTypeId" type="id-ne"></field>
       <field name="orderItemGroupSeqId" type="id-ne"></field>
@@ -582,13 +582,13 @@ under the License.
             package-name="org.apache.ofbiz.order.order"
             never-cache="true"
             title="Order Item Assoc Entity">
-      <field name="orderId" type="id-ne"></field>
-      <field name="orderItemSeqId" type="id-ne"></field>
-      <field name="shipGroupSeqId" type="id-ne"></field>
-      <field name="toOrderId" type="id-ne"></field>
-      <field name="toOrderItemSeqId" type="id-ne"></field>
-      <field name="toShipGroupSeqId" type="id-ne"></field>
-      <field name="orderItemAssocTypeId" type="id-ne"></field>
+      <field name="orderId" type="id"></field>
+      <field name="orderItemSeqId" type="id"></field>
+      <field name="shipGroupSeqId" type="id"></field>
+      <field name="toOrderId" type="id"></field>
+      <field name="toOrderItemSeqId" type="id"></field>
+      <field name="toShipGroupSeqId" type="id"></field>
+      <field name="orderItemAssocTypeId" type="id"></field>
       <field name="quantity" type="fixed-point"></field>
       <prim-key field="orderId"/>
       <prim-key field="orderItemSeqId"/>
@@ -636,8 +636,8 @@ under the License.
     <entity entity-name="OrderItemAssocType"
             package-name="org.apache.ofbiz.order.order"
             title="Order Item Assoc Type Entity">
-      <field name="orderItemAssocTypeId" type="id-ne"></field>
-      <field name="parentTypeId" type="id-ne"></field>
+      <field name="orderItemAssocTypeId" type="id"></field>
+      <field name="parentTypeId" type="id"></field>
       <field name="hasTable" type="indicator"></field>
       <field name="description" type="description"></field>
       <prim-key field="orderItemAssocTypeId"/>
@@ -649,9 +649,9 @@ under the License.
     <entity entity-name="OrderItemAttribute"
             package-name="org.apache.ofbiz.order.order"
             title="Order Item Attribute Entity">
-      <field name="orderId" type="id-ne"></field>
-      <field name="orderItemSeqId" type="id-ne"></field>
-      <field name="attrName" type="id-long-ne"></field>
+      <field name="orderId" type="id"></field>
+      <field name="orderItemSeqId" 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="orderId"/>
@@ -669,10 +669,10 @@ under the License.
             package-name="org.apache.ofbiz.order.order"
             never-cache="true"
             title="Order Item Billing Entity">
-      <field name="orderId" type="id-ne"></field>
-      <field name="orderItemSeqId" type="id-ne"></field>
-      <field name="invoiceId" type="id-ne"></field>
-      <field name="invoiceItemSeqId" type="id-ne"></field>
+      <field name="orderId" type="id"></field>
+      <field name="orderItemSeqId" type="id"></field>
+      <field name="invoiceId" type="id"></field>
+      <field name="invoiceItemSeqId" type="id"></field>
       <field name="itemIssuanceId" type="id"></field>
       <field name="shipmentReceiptId" type="id"></field>
       <field name="quantity" type="fixed-point"></field>
@@ -706,7 +706,7 @@ under the License.
             package-name="org.apache.ofbiz.order.order"
             never-cache="true"
             title="Order Item Change Entity">
-      <field name="orderItemChangeId" type="id-ne"></field>
+      <field name="orderItemChangeId" type="id"></field>
       <field name="orderId" type="id-ne"></field>
       <field name="orderItemSeqId" type="id-ne"></field>
       <field name="changeTypeEnumId" type="id"></field>
@@ -740,9 +740,9 @@ under the License.
             package-name="org.apache.ofbiz.order.order"
             never-cache="true"
             title="Order Item Contact Mechanism Entity">
-      <field name="orderId" type="id-ne"></field>
-      <field name="orderItemSeqId" type="id-ne"></field>
-      <field name="contactMechPurposeTypeId" type="id-ne"></field>
+      <field name="orderId" type="id"></field>
+      <field name="orderItemSeqId" type="id"></field>
+      <field name="contactMechPurposeTypeId" type="id"></field>
       <field name="contactMechId" type="id-ne"></field>
       <prim-key field="orderId"/>
       <prim-key field="orderItemSeqId"/>
@@ -762,8 +762,8 @@ under the License.
       </relation>
     </entity>
     <entity entity-name="OrderItemGroup" package-name="org.apache.ofbiz.order.order" title="Order Item Group Entity">
-        <field name="orderId" type="id-ne"></field>
-        <field name="orderItemGroupSeqId" type="id-ne"></field>
+        <field name="orderId" type="id"></field>
+        <field name="orderItemGroupSeqId" type="id"></field>
         <field name="parentGroupSeqId" type="id"></field>
         <field name="groupName" type="name"></field>
         <prim-key field="orderId"/>
@@ -779,9 +779,9 @@ under the License.
     <entity entity-name="OrderItemGroupOrder"
             package-name="org.apache.ofbiz.order.order"
             title="Order Item Group Order Entity">
-      <field name="orderId" type="id-ne"></field>
-      <field name="orderItemSeqId" type="id-ne"></field>
-      <field name="groupOrderId" type="id-ne"></field>
+      <field name="orderId" type="id"></field>
+      <field name="orderItemSeqId" type="id"></field>
+      <field name="groupOrderId" type="id"></field>
       <prim-key field="orderId"/>
       <prim-key field="orderItemSeqId"/>
       <prim-key field="groupOrderId"/>
@@ -797,7 +797,7 @@ under the License.
             package-name="org.apache.ofbiz.order.order"
             never-cache="true"
             title="Order Item Price Info Entity">
-      <field name="orderItemPriceInfoId" type="id-ne"></field>
+      <field name="orderItemPriceInfoId" type="id"></field>
       <field name="orderId" type="id-ne"></field>
       <field name="orderItemSeqId" type="id-ne"></field>
       <field name="productPriceRuleId" type="id"></field>
@@ -825,10 +825,10 @@ under the License.
             package-name="org.apache.ofbiz.order.order"
             never-cache="true"
             title="Order Item Role Entity">
-      <field name="orderId" type="id-ne"></field>
-      <field name="orderItemSeqId" type="id-ne"></field>
-      <field name="partyId" type="id-ne"></field>
-      <field name="roleTypeId" type="id-ne"></field>
+      <field name="orderId" type="id"></field>
+      <field name="orderItemSeqId" type="id"></field>
+      <field name="partyId" type="id"></field>
+      <field name="roleTypeId" type="id"></field>
       <prim-key field="orderId"/>
       <prim-key field="orderItemSeqId"/>
       <prim-key field="partyId"/>
@@ -854,8 +854,8 @@ under the License.
     <entity entity-name="OrderItemShipGroup"
             package-name="org.apache.ofbiz.order.order"
             title="Order Item Ship Group">
-      <field name="orderId" type="id-ne"></field>
-      <field name="shipGroupSeqId" type="id-ne"></field>
+      <field name="orderId" type="id"></field>
+      <field name="shipGroupSeqId" type="id"></field>
       <field name="shipmentMethodTypeId" type="id" enable-audit-log="true"></field>
       <field name="supplierPartyId" type="id"></field>
       <field name="vendorPartyId" type="id"><description>For use with multi-vendor stores, order will be split so that each ship group is associated with only one vendor (only if applicable)</description></field>
@@ -918,9 +918,9 @@ under the License.
     <entity entity-name="OrderItemShipGroupAssoc"
             package-name="org.apache.ofbiz.order.order"
             title="Order Item Package Association">
-      <field name="orderId" type="id-ne"></field>
-      <field name="orderItemSeqId" type="id-ne"></field>
-      <field name="shipGroupSeqId" type="id-ne"></field>
+      <field name="orderId" type="id"></field>
+      <field name="orderItemSeqId" type="id"></field>
+      <field name="shipGroupSeqId" type="id"></field>
       <field name="quantity" type="fixed-point"></field>
       <field name="cancelQuantity" type="fixed-point"></field>
       <prim-key field="orderId"/>
@@ -942,10 +942,10 @@ under the License.
             package-name="org.apache.ofbiz.order.order"
             never-cache="true"
             title="Order Item Inventory Reservation Entity">
-      <field name="orderId" type="id-ne"></field>
-      <field name="shipGroupSeqId" type="id-ne"></field>
-      <field name="orderItemSeqId" type="id-ne"></field>
-      <field name="inventoryItemId" type="id-ne"></field>
+      <field name="orderId" type="id"></field>
+      <field name="shipGroupSeqId" type="id"></field>
+      <field name="orderItemSeqId" type="id"></field>
+      <field name="inventoryItemId" type="id"></field>
       <field name="reserveOrderEnumId" type="id-ne"></field>
       <field name="quantity" type="fixed-point"></field>
       <field name="quantityNotAvailable" type="fixed-point"></field>
@@ -984,8 +984,8 @@ under the License.
             package-name="org.apache.ofbiz.order.order"
             default-resource-name="OrderEntityLabels"
             title="Order Item Type Entity">
-      <field name="orderItemTypeId" type="id-ne"></field>
-      <field name="parentTypeId" type="id-ne"></field>
+      <field name="orderItemTypeId" type="id"></field>
+      <field name="parentTypeId" type="id"></field>
       <field name="hasTable" type="indicator"></field>
       <field name="description" type="description"></field>
       <prim-key field="orderItemTypeId"/>
@@ -996,8 +996,8 @@ under the License.
     <entity entity-name="OrderItemTypeAttr"
             package-name="org.apache.ofbiz.order.order"
             title="Order Item Type Attribute Entity">
-      <field name="orderItemTypeId" type="id-ne"></field>
-      <field name="attrName" type="id-long-ne"></field>
+      <field name="orderItemTypeId" type="id"></field>
+      <field name="attrName" type="id-long"></field>
       <field name="description" type="description"></field>
       <prim-key field="orderItemTypeId"/>
       <prim-key field="attrName"/>
@@ -1015,7 +1015,7 @@ under the License.
             package-name="org.apache.ofbiz.order.order"
             never-cache="true"
             title="Order Notification Entity">
-      <field name="orderNotificationId" type="id-ne"></field>
+      <field name="orderNotificationId" type="id"></field>
       <field name="orderId" type="id-ne"></field>
       <field name="emailType" type="id-ne"></field>
       <field name="comments" type="comment"></field>
@@ -1035,7 +1035,7 @@ under the License.
             package-name="org.apache.ofbiz.order.order"
             never-cache="true"
             title="The Order Payment Preference Entity">
-      <field name="orderPaymentPreferenceId" type="id-ne"></field>
+      <field name="orderPaymentPreferenceId" type="id"></field>
       <field name="orderId" type="id"></field>
       <field name="orderItemSeqId" type="id"></field>
       <field name="shipGroupSeqId" type="id"></field>
@@ -1115,8 +1115,8 @@ under the License.
       </index>
     </entity>
     <entity entity-name="OrderProductPromoCode" package-name="org.apache.ofbiz.order.order" title="Order Product Promo Code Entity">
-        <field name="orderId" type="id-ne"></field>
-        <field name="productPromoCodeId" type="id-ne"></field>
+        <field name="orderId" type="id"></field>
+        <field name="productPromoCodeId" type="id"></field>
         <prim-key field="orderId"/>
         <prim-key field="productPromoCodeId"/>
         <relation type="one" fk-name="ORDER_PPCD_ORD" rel-entity-name="OrderHeader">
@@ -1130,9 +1130,9 @@ under the License.
             package-name="org.apache.ofbiz.order.order"
             never-cache="true"
             title="Order Role Entity">
-      <field name="orderId" type="id-ne"></field>
-      <field name="partyId" type="id-ne"></field>
-      <field name="roleTypeId" type="id-ne"></field>
+      <field name="orderId" type="id"></field>
+      <field name="partyId" type="id"></field>
+      <field name="roleTypeId" type="id"></field>
       <prim-key field="orderId"/>
       <prim-key field="partyId"/>
       <prim-key field="roleTypeId"/>
@@ -1157,11 +1157,11 @@ under the License.
             package-name="org.apache.ofbiz.order.order"
             never-cache="true"
             title="Order Shipment Entity">
-      <field name="orderId" type="id-ne"></field>
-      <field name="orderItemSeqId" type="id-ne"></field>
-      <field name="shipGroupSeqId" type="id-ne"></field>
-      <field name="shipmentId" type="id-ne"></field>
-      <field name="shipmentItemSeqId" type="id-ne"></field>
+      <field name="orderId" type="id"></field>
+      <field name="orderItemSeqId" type="id"></field>
+      <field name="shipGroupSeqId" type="id"></field>
+      <field name="shipmentId" type="id"></field>
+      <field name="shipmentItemSeqId" type="id"></field>
       <field name="quantity" type="fixed-point"></field>
       <prim-key field="orderId"/>
       <prim-key field="orderItemSeqId"/>
@@ -1192,7 +1192,7 @@ under the License.
             package-name="org.apache.ofbiz.order.order"
             never-cache="true"
             title="Order Status Entity">
-      <field name="orderStatusId" type="id-ne"></field>
+      <field name="orderStatusId" type="id"></field>
       <field name="statusId" type="id"></field>
       <field name="orderId" type="id"></field>
       <field name="orderItemSeqId" type="id"></field>
@@ -1222,8 +1222,8 @@ under the License.
             package-name="org.apache.ofbiz.order.order"
             title="Order Summary Entry Entity">
       <field name="entryDate" type="date"></field>
-      <field name="productId" type="id-ne"></field>
-      <field name="facilityId" type="id-ne"></field>
+      <field name="productId" type="id"></field>
+      <field name="facilityId" type="id"></field>
       <field name="totalQuantity" type="fixed-point"></field>
       <field name="grossSales" type="currency-amount"></field>
       <field name="productCost" type="currency-amount"></field>
@@ -1240,9 +1240,9 @@ under the License.
     <entity entity-name="OrderTerm"
             package-name="org.apache.ofbiz.order.order"
             title="Order Term Entity">
-      <field name="termTypeId" type="id-ne"></field>
-      <field name="orderId" type="id-ne"></field>
-      <field name="orderItemSeqId" type="id-ne"></field>
+      <field name="termTypeId" type="id"></field>
+      <field name="orderId" type="id"></field>
+      <field name="orderItemSeqId" type="id"></field>
       <field name="termValue" type="currency-amount"></field>
       <field name="termDays" type="numeric"></field>
       <field name="textValue" type="description"></field>
@@ -1268,10 +1268,10 @@ under the License.
     <entity entity-name="OrderTermAttribute"
             package-name="org.apache.ofbiz.order.order"
             title="Order Term Attribute Entity">
-      <field name="termTypeId" type="id-ne"></field>
-      <field name="orderId" type="id-ne"></field>
-      <field name="orderItemSeqId" type="id-ne"></field>
-      <field name="attrName" type="id-long-ne"></field>
+      <field name="termTypeId" type="id"></field>
+      <field name="orderId" type="id"></field>
+      <field name="orderItemSeqId" 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="termTypeId"/>
@@ -1288,8 +1288,8 @@ under the License.
             package-name="org.apache.ofbiz.order.order"
             default-resource-name="OrderEntityLabels"
             title="Order Type Entity">
-      <field name="orderTypeId" type="id-ne"></field>
-      <field name="parentTypeId" type="id-ne"></field>
+      <field name="orderTypeId" type="id"></field>
+      <field name="parentTypeId" type="id"></field>
       <field name="hasTable" type="indicator"></field>
       <field name="description" type="description"></field>
       <prim-key field="orderTypeId"/>
@@ -1300,8 +1300,8 @@ under the License.
     <entity entity-name="OrderTypeAttr"
             package-name="org.apache.ofbiz.order.order"
             title="Order Type Attribute Entity">
-      <field name="orderTypeId" type="id-ne"></field>
-      <field name="attrName" type="id-long-ne"></field>
+      <field name="orderTypeId" type="id"></field>
+      <field name="attrName" type="id-long"></field>
       <field name="description" type="description"></field>
       <prim-key field="orderTypeId"/>
       <prim-key field="attrName"/>
@@ -1318,10 +1318,10 @@ under the License.
     <entity entity-name="ProductOrderItem"
             package-name="org.apache.ofbiz.order.order"
             title="Product Order Item Entity">
-      <field name="orderId" type="id-ne"></field>
-      <field name="orderItemSeqId" type="id-ne"></field>
-      <field name="engagementId" type="id-ne"></field>
-      <field name="engagementItemSeqId" type="id-ne"></field>
+      <field name="orderId" type="id"></field>
+      <field name="orderItemSeqId" type="id"></field>
+      <field name="engagementId" type="id"></field>
+      <field name="engagementItemSeqId" type="id"></field>
       <field name="productId" type="id"></field>
       <prim-key field="orderId"/>
       <prim-key field="orderItemSeqId"/>
@@ -1348,9 +1348,9 @@ under the License.
     <entity entity-name="WorkOrderItemFulfillment"
             package-name="org.apache.ofbiz.order.order"
             title="Work Order Item Fulfillment Entity">
-      <field name="workEffortId" type="id-ne"></field>
-      <field name="orderId" type="id-ne"></field>
-      <field name="orderItemSeqId" type="id-ne"></field>
+      <field name="workEffortId" type="id"></field>
+      <field name="orderId" type="id"></field>
+      <field name="orderItemSeqId" type="id"></field>
       <field name="shipGroupSeqId" type="id"></field>
       <prim-key field="workEffortId"/>
       <prim-key field="orderId"/>
@@ -1379,7 +1379,7 @@ under the License.
     <entity entity-name="Quote"
             package-name="org.apache.ofbiz.order.quote"
             title="Quote Entity">
-      <field name="quoteId" type="id-ne"></field>
+      <field name="quoteId" type="id"></field>
       <field name="quoteTypeId" type="id-ne"></field>
       <field name="partyId" type="id"></field>
       <field name="issueDate" type="date-time"></field>
@@ -1420,8 +1420,8 @@ under the License.
     <entity entity-name="QuoteAttribute"
             package-name="org.apache.ofbiz.order.quote"
             title="Quote Attribute Entity">
-      <field name="quoteId" type="id-ne"></field>
-      <field name="attrName" type="id-long-ne"></field>
+      <field name="quoteId" 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="quoteId"/>
@@ -1436,8 +1436,8 @@ under the License.
     <entity entity-name="QuoteCoefficient"
         package-name="org.apache.ofbiz.order.quote"
         title="Quote Coefficient Entity">
-        <field name="quoteId" type="id-ne"></field>
-        <field name="coeffName" type="id-long-ne"></field>
+        <field name="quoteId" type="id"></field>
+        <field name="coeffName" type="id-long"></field>
         <field name="coeffValue" type="fixed-point"></field>
         <prim-key field="quoteId"/>
         <prim-key field="coeffName"/>
@@ -1448,8 +1448,8 @@ under the License.
     <entity entity-name="QuoteItem"
             package-name="org.apache.ofbiz.order.quote"
             title="Quote Item Entity">
-      <field name="quoteId" type="id-ne"></field>
-      <field name="quoteItemSeqId" type="id-ne"></field>
+      <field name="quoteId" type="id"></field>
+      <field name="quoteItemSeqId" type="id"></field>
       <field name="productId" type="id"></field>
       <field name="productFeatureId" type="id"></field>
       <field name="deliverableTypeId" type="id"></field>
@@ -1504,8 +1504,8 @@ under the License.
             package-name="org.apache.ofbiz.order.quote"
             never-cache="true"
             title="Quote Note Entity">
-      <field name="quoteId" type="id-ne"></field>
-      <field name="noteId" type="id-ne"></field>
+      <field name="quoteId" type="id"></field>
+      <field name="noteId" type="id"></field>
       <prim-key field="quoteId"/>
       <prim-key field="noteId"/>
       <relation type="one" fk-name="QUOTE_NT_QTE" rel-entity-name="Quote">
@@ -1518,9 +1518,9 @@ under the License.
     <entity entity-name="QuoteRole"
             package-name="org.apache.ofbiz.order.quote"
             title="Quote Role Entity">
-      <field name="quoteId" type="id-ne"/>
-      <field name="partyId" type="id-ne"/>
-      <field name="roleTypeId" type="id-ne"/>
+      <field name="quoteId" type="id"/>
+      <field name="partyId" type="id"/>
+      <field name="roleTypeId" type="id"/>
       <field name="fromDate" type="date-time"/>
       <field name="thruDate" type="date-time"/>
       <prim-key field="quoteId"/>
@@ -1543,9 +1543,9 @@ under the License.
     <entity entity-name="QuoteTerm"
             package-name="org.apache.ofbiz.order.quote"
             title="Quote Term Entity">
-      <field name="termTypeId" type="id-ne"></field>
-      <field name="quoteId" type="id-ne"></field>
-      <field name="quoteItemSeqId" type="id-ne"></field>
+      <field name="termTypeId" type="id"></field>
+      <field name="quoteId" type="id"></field>
+      <field name="quoteItemSeqId" type="id"></field>
       <field name="termValue" type="numeric"></field>
       <field name="uomId" type="id"></field>
       <field name="termDays" type="numeric"></field>
@@ -1568,10 +1568,10 @@ under the License.
     <entity entity-name="QuoteTermAttribute"
             package-name="org.apache.ofbiz.order.quote"
             title="Quote Term Attribute Entity">
-      <field name="termTypeId" type="id-ne"></field>
-      <field name="quoteId" type="id-ne"></field>
-      <field name="quoteItemSeqId" type="id-ne"></field>
-      <field name="attrName" type="id-long-ne"></field>
+      <field name="termTypeId" type="id"></field>
+      <field name="quoteId" type="id"></field>
+      <field name="quoteItemSeqId" 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="termTypeId"/>
@@ -1588,8 +1588,8 @@ under the License.
             package-name="org.apache.ofbiz.order.quote"
             default-resource-name="OrderEntityLabels"
             title="Quote Type Entity">
-      <field name="quoteTypeId" type="id-ne"></field>
-      <field name="parentTypeId" type="id-ne"></field>
+      <field name="quoteTypeId" type="id"></field>
+      <field name="parentTypeId" type="id"></field>
       <field name="hasTable" type="indicator"></field>
       <field name="description" type="description"></field>
       <prim-key field="quoteTypeId"/>
@@ -1600,8 +1600,8 @@ under the License.
     <entity entity-name="QuoteTypeAttr"
             package-name="org.apache.ofbiz.order.quote"
             title="Quote Type Attribute Entity">
-      <field name="quoteTypeId" type="id-ne"></field>
-      <field name="attrName" type="id-long-ne"></field>
+      <field name="quoteTypeId" type="id"></field>
+      <field name="attrName" type="id-long"></field>
       <field name="description" type="description"></field>
       <prim-key field="quoteTypeId"/>
       <prim-key field="attrName"/>
@@ -1618,8 +1618,8 @@ under the License.
     <entity entity-name="QuoteWorkEffort"
         package-name="org.apache.ofbiz.order.quote"
         title="Quote Work Effort Entity">
-        <field name="quoteId" type="id-ne"></field>
-        <field name="workEffortId" type="id-ne"></field>
+        <field name="quoteId" type="id"></field>
+        <field name="workEffortId" type="id"></field>
         <prim-key field="quoteId"/>
         <prim-key field="workEffortId"/>
         <relation type="one" fk-name="QUOTE_WE_QUOTE" rel-entity-name="Quote">
@@ -1634,7 +1634,7 @@ under the License.
             never-cache="true"
             title="Quote Adjustment Entity">
       <description>Note that both includeInTax and includeInShipping should default to true, except in the case where this adjustment is a tax or shipping adjustment then should be ignored.</description>
-      <field name="quoteAdjustmentId" type="id-ne"></field>
+      <field name="quoteAdjustmentId" type="id"></field>
       <field name="quoteAdjustmentTypeId" type="id"></field>
       <field name="quoteId" type="id"></field>
       <field name="quoteItemSeqId" type="id"></field>
@@ -1709,7 +1709,7 @@ under the License.
     <entity entity-name="CustRequest"
             package-name="org.apache.ofbiz.order.request"
             title="Customer Request Entity">
-      <field name="custRequestId" type="id-ne"></field>
+      <field name="custRequestId" type="id"></field>
       <field name="custRequestTypeId" type="id"></field>
       <field name="custRequestCategoryId" type="id"></field>
       <field name="statusId" type="id"></field>
@@ -1798,8 +1798,8 @@ under the License.
     <entity entity-name="CustRequestAttribute"
             package-name="org.apache.ofbiz.order.request"
             title="Customer Request Attribute Entity">
-      <field name="custRequestId" type="id-ne"></field>
-      <field name="attrName" type="id-long-ne"></field>
+      <field name="custRequestId" 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="custRequestId"/>
@@ -1814,7 +1814,7 @@ under the License.
     <entity entity-name="CustRequestCategory"
             package-name="org.apache.ofbiz.order.request"
             title="Customer Category Type Entity">
-      <field name="custRequestCategoryId" type="id-ne"></field>
+      <field name="custRequestCategoryId" type="id"></field>
       <field name="custRequestTypeId" type="id"></field>
       <field name="description" type="description"></field>
       <prim-key field="custRequestCategoryId"/>
@@ -1825,8 +1825,8 @@ under the License.
     <entity entity-name="CustRequestCommEvent"
         package-name="org.apache.ofbiz.order.request"
         title="Customer Request Communication Event Entity">
-        <field name="custRequestId" type="id-ne"></field>
-        <field name="communicationEventId" type="id-ne"></field>
+        <field name="custRequestId" type="id"></field>
+        <field name="communicationEventId" type="id"></field>
         <prim-key field="custRequestId"/>
         <prim-key field="communicationEventId"/>
         <relation type="one" fk-name="CUSTREQ_CEV_CRQ" rel-entity-name="CustRequest">
@@ -1837,8 +1837,8 @@ under the License.
         </relation>
     </entity>
     <entity entity-name="CustRequestContent" package-name="org.apache.ofbiz.order.request" title="Customer Request Content Entity">
-      <field name="custRequestId" type="id-ne"></field>
-      <field name="contentId" type="id-ne"></field>
+      <field name="custRequestId" type="id"></field>
+      <field name="contentId" type="id"></field>
       <field name="fromDate" type="date-time"></field>
       <field name="thruDate" type="date-time"></field>
       <prim-key field="custRequestId"/>
@@ -1854,8 +1854,8 @@ under the License.
     <entity entity-name="CustRequestItem"
             package-name="org.apache.ofbiz.order.request"
             title="Customer Request Item Entity">
-      <field name="custRequestId" type="id-ne"></field>
-      <field name="custRequestItemSeqId" type="id-ne"></field>
+      <field name="custRequestId" type="id"></field>
+      <field name="custRequestItemSeqId" type="id"></field>
       <field name="custRequestResolutionId" type="id"></field>
       <field name="statusId" type="id"></field>
       <field name="priority" type="numeric"></field>
@@ -1889,8 +1889,8 @@ under the License.
     <entity entity-name="CustRequestNote"
             package-name="org.apache.ofbiz.order.request"
             title="Customer Request Note Entity">
-      <field name="custRequestId" type="id-ne"></field>
-      <field name="noteId" type="id-ne"></field>
+      <field name="custRequestId" type="id"></field>
+      <field name="noteId" type="id"></field>
       <prim-key field="custRequestId"/>
       <prim-key field="noteId"/>
       <relation type="one" fk-name="CRQ_CR" rel-entity-name="CustRequest">
@@ -1903,9 +1903,9 @@ under the License.
     <entity entity-name="CustRequestItemNote"
             package-name="org.apache.ofbiz.order.request"
             title="Customer Request Item Note Entity">
-      <field name="custRequestId" type="id-ne"></field>
-      <field name="custRequestItemSeqId" type="id-ne"></field>
-      <field name="noteId" type="id-ne"></field>
+      <field name="custRequestId" type="id"></field>
+      <field name="custRequestItemSeqId" type="id"></field>
+      <field name="noteId" type="id"></field>
       <prim-key field="custRequestId"/>
       <prim-key field="custRequestItemSeqId"/>
       <prim-key field="noteId"/>
@@ -1920,9 +1920,9 @@ under the License.
     <entity entity-name="CustRequestItemWorkEffort"
             package-name="org.apache.ofbiz.order.request"
             title="Cust Request Item Work Effort Entity">
-      <field name="custRequestId" type="id-ne"></field>
-      <field name="custRequestItemSeqId" type="id-ne"></field>
-      <field name="workEffortId" type="id-ne"></field>
+      <field name="custRequestId" type="id"></field>
+      <field name="custRequestItemSeqId" type="id"></field>
+      <field name="workEffortId" type="id"></field>
       <prim-key field="custRequestId"/>
       <prim-key field="custRequestItemSeqId"/>
       <prim-key field="workEffortId"/>
@@ -1941,7 +1941,7 @@ under the License.
             package-name="org.apache.ofbiz.order.request"
             default-resource-name="OrderEntityLabels"
             title="Customer Request Resolution Entity">
-      <field name="custRequestResolutionId" type="id-ne"></field>
+      <field name="custRequestResolutionId" type="id"></field>
       <field name="custRequestTypeId" type="id"></field>
       <field name="description" type="description"></field>
       <prim-key field="custRequestResolutionId"/>
@@ -1952,9 +1952,9 @@ under the License.
     <entity entity-name="CustRequestParty"
             package-name="org.apache.ofbiz.order.request"
             title="Customer Request Role Entity">
-      <field name="custRequestId" type="id-ne"></field>
-      <field name="partyId" type="id-ne"></field>
-      <field name="roleTypeId" type="id-ne"></field>
+      <field name="custRequestId" 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>
       <prim-key field="custRequestId"/>
@@ -1978,7 +1978,7 @@ under the License.
     <entity entity-name="CustRequestStatus"
             package-name="org.apache.ofbiz.order.request"
             title="Customer Request Status Entity">
-      <field name="custRequestStatusId" type="id-ne"></field>
+      <field name="custRequestStatusId" type="id"></field>
       <field name="statusId" type="id"></field>
       <field name="custRequestId" type="id"></field>
       <field name="custRequestItemSeqId" type="id"></field>
@@ -2003,8 +2003,8 @@ under the License.
             package-name="org.apache.ofbiz.order.request"
             default-resource-name="OrderEntityLabels"
             title="Customer Request Type Entity">
-      <field name="custRequestTypeId" type="id-ne"></field>
-      <field name="parentTypeId" type="id-ne"></field>
+      <field name="custRequestTypeId" type="id"></field>
+      <field name="parentTypeId" type="id"></field>
       <field name="hasTable" type="indicator"></field>
       <field name="description" type="description"></field>
       <field name="partyId" type="id-ne"><description>party or party group(via partyRelationShip entity) responsible for responding to the communication request of this particular type</description></field>
@@ -2022,8 +2022,8 @@ under the License.
     <entity entity-name="CustRequestTypeAttr"
             package-name="org.apache.ofbiz.order.request"
             title="Customer Request Type Attribute Entity">
-      <field name="custRequestTypeId" type="id-ne"></field>
-      <field name="attrName" type="id-long-ne"></field>
+      <field name="custRequestTypeId" type="id"></field>
+      <field name="attrName" type="id-long"></field>
       <field name="description" type="description"></field>
       <prim-key field="custRequestTypeId"/>
       <prim-key field="attrName"/>
@@ -2040,8 +2040,8 @@ under the License.
     <entity entity-name="CustRequestWorkEffort"
         package-name="org.apache.ofbiz.order.request"
         title="Cust Request Work Effort Entity">
-        <field name="custRequestId" type="id-ne"></field>
-        <field name="workEffortId" type="id-ne"></field>
+        <field name="custRequestId" type="id"></field>
+        <field name="workEffortId" type="id"></field>
         <prim-key field="custRequestId"/>
         <prim-key field="workEffortId"/>
         <relation type="one" fk-name="CSTREQ_WF_CREQ" rel-entity-name="CustRequest">
@@ -2054,9 +2054,9 @@ under the License.
     <entity entity-name="RespondingParty"
             package-name="org.apache.ofbiz.order.request"
             title="Responding Party Entity">
-      <field name="respondingPartySeqId" type="id-ne"></field>
-      <field name="custRequestId" type="id-ne"></field>
-      <field name="partyId" type="id-ne"></field>
+      <field name="respondingPartySeqId" type="id"></field>
+      <field name="custRequestId" type="id"></field>
+      <field name="partyId" type="id"></field>
       <field name="contactMechId" type="id"></field>
       <field name="dateSent" type="date-time"></field>
       <prim-key field="respondingPartySeqId"/>
@@ -2080,8 +2080,8 @@ under the License.
     <entity entity-name="DesiredFeature"
             package-name="org.apache.ofbiz.order.requirement"
             title="Desired Feature Entity">
-      <field name="desiredFeatureId" type="id-ne"></field>
-      <field name="requirementId" type="id-ne"></field>
+      <field name="desiredFeatureId" type="id"></field>
+      <field name="requirementId" type="id"></field>
       <field name="productFeatureId" type="id"></field>
       <field name="optionalInd" type="indicator"></field>
       <prim-key field="desiredFeatureId"/>
@@ -2096,9 +2096,9 @@ under the License.
     <entity entity-name="OrderRequirementCommitment"
             package-name="org.apache.ofbiz.order.requirement"
             title="Order Requirement Commitment Entity">
-      <field name="orderId" type="id-ne"></field>
-      <field name="orderItemSeqId" type="id-ne"></field>
-      <field name="requirementId" type="id-ne"></field>
+      <field name="orderId" type="id"></field>
+      <field name="orderItemSeqId" type="id"></field>
+      <field name="requirementId" type="id"></field>
       <field name="quantity" type="fixed-point"></field>
       <prim-key field="orderId"/>
       <prim-key field="orderItemSeqId"/>
@@ -2117,7 +2117,7 @@ under the License.
     <entity entity-name="Requirement"
             package-name="org.apache.ofbiz.order.requirement"
             title="Requirement Entity">
-      <field name="requirementId" type="id-ne"></field>
+      <field name="requirementId" type="id"></field>
       <field name="requirementTypeId" type="id"></field>
       <field name="facilityId" type="id"></field>
       <field name="deliverableId" type="id"></field>
@@ -2161,8 +2161,8 @@ under the License.
     <entity entity-name="RequirementAttribute"
             package-name="org.apache.ofbiz.order.requirement"
             title="Requirement Attribute Entity">
-      <field name="requirementId" type="id-ne"></field>
-      <field name="attrName" type="id-long-ne"></field>
+      <field name="requirementId" 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="requirementId"/>
@@ -2177,9 +2177,9 @@ under the License.
     <entity entity-name="RequirementBudgetAllocation"
             package-name="org.apache.ofbiz.order.requirement"
             title="Requirement Budget Allocation Entity">
-      <field name="budgetId" type="id-ne"></field>
-      <field name="budgetItemSeqId" type="id-ne"></field>
-      <field name="requirementId" type="id-ne"></field>
+      <field name="budgetId" type="id"></field>
+      <field name="budgetItemSeqId" type="id"></field>
+      <field name="requirementId" type="id"></field>
       <field name="amount" type="currency-amount"></field>
       <prim-key field="budgetId"/>
       <prim-key field="budgetItemSeqId"/>
@@ -2198,9 +2198,9 @@ under the License.
     <entity entity-name="RequirementCustRequest"
             package-name="org.apache.ofbiz.order.requirement"
             title="Requirement Customer Request Entity">
-      <field name="custRequestId" type="id-ne"></field>
-      <field name="custRequestItemSeqId" type="id-ne"></field>
-      <field name="requirementId" type="id-ne"></field>
+      <field name="custRequestId" type="id"></field>
+      <field name="custRequestItemSeqId" type="id"></field>
+      <field name="requirementId" type="id"></field>
       <prim-key field="custRequestId"/>
       <prim-key field="custRequestItemSeqId"/>
       <prim-key field="requirementId"/>
@@ -2218,9 +2218,9 @@ under the License.
     <entity entity-name="RequirementRole"
             package-name="org.apache.ofbiz.order.requirement"
             title="Requirement Role Entity">
-      <field name="requirementId" type="id-ne"></field>
-      <field name="partyId" type="id-ne"></field>
-      <field name="roleTypeId" type="id-ne"></field>
+      <field name="requirementId" 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>
       <prim-key field="requirementId"/>
@@ -2241,8 +2241,8 @@ under the License.
     <entity entity-name="RequirementStatus"
             package-name="org.apache.ofbiz.order.requirement"
             title="Requirement Status Entity">
-      <field name="requirementId" type="id-ne"></field>
-      <field name="statusId" type="id-ne"></field>
+      <field name="requirementId" type="id"></field>
+      <field name="statusId" type="id"></field>
       <field name="statusDate" type="date-time"></field>
       <field name="changeByUserLoginId" type="id-vlong"></field>
       <prim-key field="requirementId"/>
@@ -2261,8 +2261,8 @@ under the License.
             package-name="org.apache.ofbiz.order.requirement"
             default-resource-name="OrderEntityLabels"
             title="Requirement Type Entity">
-      <field name="requirementTypeId" type="id-ne"></field>
-      <field name="parentTypeId" type="id-ne"></field>
+      <field name="requirementTypeId" type="id"></field>
+      <field name="parentTypeId" type="id"></field>
       <field name="hasTable" type="indicator"></field>
       <field name="description" type="description"></field>
       <prim-key field="requirementTypeId"/>
@@ -2273,8 +2273,8 @@ under the License.
     <entity entity-name="RequirementTypeAttr"
             package-name="org.apache.ofbiz.order.requirement"
             title="Requirement Type Attribute Entity">
-      <field name="requirementTypeId" type="id-ne"></field>
-      <field name="attrName" type="id-long-ne"></field>
+      <field name="requirementTypeId" type="id"></field>
+      <field name="attrName" type="id-long"></field>
       <field name="description" type="description"></field>
       <prim-key field="requirementTypeId"/>
       <prim-key field="attrName"/>
@@ -2292,15 +2292,15 @@ under the License.
             package-name="org.apache.ofbiz.order.requirement"
             default-resource-name="OrderEntityLabels"
             title="Work Requirement Fulfillment Type Entity">
-      <field name="workReqFulfTypeId" type="id-ne"></field>
+      <field name="workReqFulfTypeId" type="id"></field>
       <field name="description" type="description"></field>
       <prim-key field="workReqFulfTypeId"/>
     </entity>
     <entity entity-name="WorkRequirementFulfillment"
             package-name="org.apache.ofbiz.order.requirement"
             title="Work Requirement Fulfillment Entity">
-      <field name="requirementId" type="id-ne"></field>
-      <field name="workEffortId" type="id-ne"></field>
+      <field name="requirementId" type="id"></field>
+      <field name="workEffortId" type="id"></field>
       <field name="workReqFulfTypeId" type="id-ne"></field>
       <prim-key field="requirementId"/>
       <prim-key field="workEffortId"/>
@@ -2325,7 +2325,7 @@ under the License.
       <description>Tax, shipping, and promotional adjustments which are carried over from the order to the return.
         Note that both includeInTax and includeInShipping should default to true, except in the case where this adjustment is a tax or shipping adjustment
         then should be ignored.</description>
-      <field name="returnAdjustmentId" type="id-ne"></field>
+      <field name="returnAdjustmentId" type="id"></field>
       <field name="returnAdjustmentTypeId" type="id"></field>
       <field name="returnId" type="id"></field>
       <field name="returnItemSeqId" type="id"></field>
@@ -2425,8 +2425,8 @@ under the License.
             package-name="org.apache.ofbiz.order.return"
             default-resource-name="OrderEntityLabels"
             title="Return Adjustment Type Entity">
-      <field name="returnAdjustmentTypeId" type="id-ne"></field>
-      <field name="parentTypeId" type="id-ne"></field>
+      <field name="returnAdjustmentTypeId" type="id"></field>
+      <field name="parentTypeId" type="id"></field>
       <field name="hasTable" type="indicator"></field>
       <field name="description" type="description"></field>
       <prim-key field="returnAdjustmentTypeId"/>
@@ -2437,7 +2437,7 @@ under the License.
     <entity entity-name="ReturnHeader"
             package-name="org.apache.ofbiz.order.return"
             title="Return Entity">
-        <field name="returnId" type="id-ne"></field>
+        <field name="returnId" type="id"></field>
         <field name="returnHeaderTypeId" type="id-ne"></field>
         <field name="statusId" type="id"></field>
         <field name="createdBy" type="id-vlong"></field>
@@ -2493,7 +2493,7 @@ under the License.
     <entity entity-name="ReturnHeaderType"
             package-name="org.apache.ofbiz.order.return"
             title="Return Header Type Entity">
-        <field name="returnHeaderTypeId" type="id-ne"></field>
+        <field name="returnHeaderTypeId" type="id"></field>
         <field name="parentTypeId" type="id"></field>
         <field name="description" type="description"></field>
         <prim-key field="returnHeaderTypeId"/>
@@ -2504,8 +2504,8 @@ under the License.
     <entity entity-name="ReturnItem"
             package-name="org.apache.ofbiz.order.return"
             title="Return Item Entity">
-        <field name="returnId" type="id-ne"></field>
-        <field name="returnItemSeqId" type="id-ne"></field>
+        <field name="returnId" type="id"></field>
+        <field name="returnItemSeqId" type="id"></field>
         <field name="returnReasonId" type="id" enable-audit-log="true">
             <description>why item is returned: did not like, wrong item, damaged, etc. etc.</description>
         </field>
@@ -2574,7 +2574,7 @@ under the License.
             never-cache="true"
             title="The Return Item Response Entity">
         <description>Records what was done with a return: whether a replacement order, a payment, or a billing account credit was issued</description>
-        <field name="returnItemResponseId" type="id-ne"></field>
+        <field name="returnItemResponseId" type="id"></field>
         <field name="orderPaymentPreferenceId" type="id"></field>
         <field name="replacementOrderId" type="id"></field>
         <field name="paymentId" type="id"></field>
@@ -2603,7 +2603,7 @@ under the License.
             package-name="org.apache.ofbiz.order.return"
             title="Return Item Type Entity">
         <description>ReturnItemType records the type of a ReturnItem</description>
-        <field name="returnItemTypeId" type="id-ne"></field>
+        <field name="returnItemTypeId" type="id"></field>
         <field name="parentTypeId" type="id"></field>
         <field name="description" type="description"></field>
         <prim-key field="returnItemTypeId"/>
@@ -2616,8 +2616,8 @@ under the License.
             title="Return Item Type Map Entity">
         <description>Mapping between productTypeId and returnItemTypeId for product order items, orderItemTypeId and returnItemTypeId for other
           order items, or orderAdjustmentTypeId and returnAdjustmentTypeId.  Separate mappings for different types of returns (customer vs. vendor)</description>
-      <field name="returnItemMapKey" type="id-ne"></field>
-      <field name="returnHeaderTypeId" type="id-ne"></field>
+      <field name="returnItemMapKey" type="id"></field>
+      <field name="returnHeaderTypeId" type="id"></field>
       <field name="returnItemTypeId" type="id-ne"></field>
       <prim-key field="returnItemMapKey"/>
       <prim-key field="returnHeaderTypeId"/>
@@ -2635,7 +2635,7 @@ under the License.
             package-name="org.apache.ofbiz.order.return"
             default-resource-name="OrderEntityLabels"
             title="Return Reason Entity">
-        <field name="returnReasonId" type="id-ne"></field>
+        <field name="returnReasonId" type="id"></field>
         <field name="description" type="description"></field>
         <field name="sequenceId" type="id"></field>
         <prim-key field="returnReasonId"/>
@@ -2643,7 +2643,7 @@ under the License.
     <entity entity-name="ReturnStatus"
             package-name="org.apache.ofbiz.order.return"
             title="Return Status History Entity">
-        <field name="returnStatusId" type="id-ne"></field>
+        <field name="returnStatusId" type="id"></field>
         <field name="statusId" type="id"></field>
         <field name="returnId" type="id"></field>
         <field name="returnItemSeqId" type="id"></field>
@@ -2668,7 +2668,7 @@ under the License.
             package-name="org.apache.ofbiz.order.return"
             default-resource-name="OrderEntityLabels"
             title="Return Type Entity">
-        <field name="returnTypeId" type="id-ne"></field>
+        <field name="returnTypeId" type="id"></field>
         <field name="description" type="description"></field>
         <field name="sequenceId" type="id"></field>
         <prim-key field="returnTypeId"/>
@@ -2677,10 +2677,10 @@ under the License.
             package-name="org.apache.ofbiz.order.return"
             never-cache="true"
             title="Records the quantity and amount returned to an inventory item from a return item.">
-      <field name="returnId" type="id-ne"></field>
-      <field name="returnItemSeqId" type="id-ne"></field>
-      <field name="invoiceId" type="id-ne"></field>
-      <field name="invoiceItemSeqId" type="id-ne"></field>
+      <field name="returnId" type="id"></field>
+      <field name="returnItemSeqId" type="id"></field>
+      <field name="invoiceId" type="id"></field>
+      <field name="invoiceItemSeqId" type="id"></field>
       <field name="shipmentReceiptId" type="id"></field>
       <field name="quantity" type="fixed-point"></field>
       <field name="amount" type="currency-amount"></field>
@@ -2709,10 +2709,10 @@ under the License.
     <entity entity-name="ReturnItemShipment"
             package-name="org.apache.ofbiz.order.return"
             title="Return Item And Shipment Association Entity">
-      <field name="returnId" type="id-ne"></field>
-      <field name="returnItemSeqId" type="id-ne"></field>
-      <field name="shipmentId" type="id-ne"></field>
-      <field name="shipmentItemSeqId" type="id-ne"></field>
+      <field name="returnId" type="id"></field>
+      <field name="returnItemSeqId" type="id"></field>
+      <field name="shipmentId" type="id"></field>
+      <field name="shipmentItemSeqId" type="id"></field>
       <field name="quantity" type="fixed-point"></field>
       <prim-key field="returnId"/>
       <prim-key field="returnItemSeqId"/>
@@ -2738,9 +2738,9 @@ under the License.
             package-name="org.apache.ofbiz.order.return"
             never-cache="true"
             title="Retrun Contact Mechanism Entity">
-        <field name="returnId" type="id-ne"></field>
-        <field name="contactMechPurposeTypeId" type="id-ne"></field>
-        <field name="contactMechId" type="id-ne"></field>
+        <field name="returnId" type="id"></field>
+        <field name="contactMechPurposeTypeId" type="id"></field>
+        <field name="contactMechId" type="id"></field>
         <prim-key field="returnId"/>
         <prim-key field="contactMechPurposeTypeId"/>
         <prim-key field="contactMechId"/>
@@ -2763,8 +2763,8 @@ under the License.
             package-name="org.apache.ofbiz.order.shoppingcart"
             never-cache="true"
             title="Order Abandoned Line Entity">
-      <field name="visitId" type="id-ne"></field>
-      <field name="cartAbandonedLineSeqId" type="id-ne"></field>
+      <field name="visitId" type="id"></field>
+      <field name="cartAbandonedLineSeqId" type="id"></field>
       <field name="productId" type="id-ne"></field>
       <field name="prodCatalogId" type="id-ne"></field>
       <field name="quantity" type="fixed-point"></field>
@@ -2794,7 +2794,7 @@ under the License.
     <entity entity-name="ShoppingList"
             package-name="org.apache.ofbiz.order.shoppinglist"
             title="Shopping List Entity">
-      <field name="shoppingListId" type="id-ne"></field>
+      <field name="shoppingListId" type="id"></field>
       <field name="shoppingListTypeId" type="id"></field>
       <field name="parentShoppingListId" type="id"></field>
       <field name="productStoreId" type="id"></field>
@@ -2860,8 +2860,8 @@ under the License.
     <entity entity-name="ShoppingListItem"
             package-name="org.apache.ofbiz.order.shoppinglist"
             title="Shopping List Item Entity">
-      <field name="shoppingListId" type="id-ne"></field>
-      <field name="shoppingListItemSeqId" type="id-ne"></field>
+      <field name="shoppingListId" type="id"></field>
+      <field name="shoppingListItemSeqId" type="id"></field>
       <field name="productId" type="id"></field>
       <field name="quantity" type="fixed-point"></field>
       <field name="modifiedPrice" type="currency-precise"/>
@@ -2882,9 +2882,9 @@ under the License.
     <entity entity-name="ShoppingListItemSurvey"
             package-name="org.apache.ofbiz.order.shoppinglist"
             title="Shopping List Item Entity">
-      <field name="shoppingListId" type="id-ne"></field>
-      <field name="shoppingListItemSeqId" type="id-ne"></field>
-      <field name="surveyResponseId" type="id-ne"></field>
+      <field name="shoppingListId" type="id"></field>
+      <field name="shoppingListItemSeqId" type="id"></field>
+      <field name="surveyResponseId" type="id"></field>
       <prim-key field="shoppingListId"/>
       <prim-key field="shoppingListItemSeqId"/>
       <prim-key field="surveyResponseId"/>
@@ -2903,15 +2903,15 @@ under the License.
             package-name="org.apache.ofbiz.order.shoppinglist"
             default-resource-name="OrderEntityLabels"
             title="Shopping List Type Entity">
-      <field name="shoppingListTypeId" type="id-ne"></field>
+      <field name="shoppingListTypeId" type="id"></field>
       <field name="description" type="description"></field>
       <prim-key field="shoppingListTypeId"/>
     </entity>
     <entity entity-name="ShoppingListWorkEffort"
         package-name="org.apache.ofbiz.order.shoppinglist"
         title="ShoppingList WorkEffort Entity">
-        <field name="shoppingListId" type="id-ne"></field>
-        <field name="workEffortId" type="id-ne"></field>
+        <field name="shoppingListId" type="id"></field>
+        <field name="workEffortId" type="id"></field>
         <prim-key field="shoppingListId"/>
         <prim-key field="workEffortId"/>
         <relation type="one" fk-name="SHLISTWE_SHLST" rel-entity-name="ShoppingList">