svn commit: r1804026 [1/2] - in /ofbiz/ofbiz-framework/trunk: applications/datamodel/entityd
Locked
svn commit: r1804026 [1/2] - in /ofbiz/ofbiz-framework/trunk: applications/datamodel/entityd
 
|
Author: deepak
Date: Thu Aug 3 17:51:07 2017 New Revision: 1804026 URL: http://svn.apache.org/viewvc?rev=1804026&view=rev Log: Improved: Replace fields with id-ne, id-long-ne and id-vlong-ne by id, id-long and id-vlong respectively which are not primary keys (OFBIZ-9355) Thanks Aditya Sharma for your contribution. Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/content-entitymodel.xml ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/humanres-entitymodel.xml ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/manufacturing-entitymodel.xml ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/marketing-entitymodel.xml ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/order-entitymodel.xml ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/party-entitymodel.xml ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/shipment-entitymodel.xml ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/workeffort-entitymodel.xml ofbiz/ofbiz-framework/trunk/framework/common/entitydef/entitymodel.xml ofbiz/ofbiz-framework/trunk/framework/entity/entitydef/entitymodel_test.xml ofbiz/ofbiz-framework/trunk/framework/entityext/entitydef/entitymodel.xml ofbiz/ofbiz-framework/trunk/framework/security/entitydef/entitymodel.xml ofbiz/ofbiz-framework/trunk/framework/service/entitydef/entitymodel.xml ofbiz/ofbiz-framework/trunk/framework/webapp/entitydef/entitymodel.xml Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml?rev=1804026&r1=1804025&r2=1804026&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml Thu Aug 3 17:51:07 2017 @@ -343,7 +343,7 @@ under the License. <field name="finAccountName" type="name"></field> <field name="finAccountCode" type="long-varchar" encrypt="true"></field> <field name="finAccountPin" type="long-varchar" encrypt="true"></field> - <field name="currencyUomId" type="id-ne"/> + <field name="currencyUomId" type="id"/> <field name="organizationPartyId" type="id"><description>The internal organization Party that owns (or rather, is liable for) the account.</description></field> <field name="ownerPartyId" type="id"><description>The customer or third party that owns the account.</description></field> <field name="postToGlAccountId" type="id"></field> @@ -407,7 +407,7 @@ under the License. <field name="finAccountAuthId" type="id"/> <field name="finAccountId" type="id"/> <field name="amount" type="currency-amount"/> - <field name="currencyUomId" type="id-ne"/> + <field name="currencyUomId" type="id"/> <field name="authorizationDate" type="date-time"/> <field name="fromDate" type="date-time"/> <field name="thruDate" type="date-time"/> @@ -461,14 +461,14 @@ under the License. </entity> <entity entity-name="FinAccountTrans" package-name="org.apache.ofbiz.accounting.finaccount" title="Financial Account Transaction Entity"> <field name="finAccountTransId" type="id"></field> - <field name="finAccountTransTypeId" type="id-ne"></field> + <field name="finAccountTransTypeId" type="id"></field> <field name="finAccountId" type="id"></field> <field name="partyId" type="id"></field> <field name="glReconciliationId" type="id"></field> <field name="transactionDate" type="date-time"></field> <field name="entryDate" type="date-time"></field> <field name="amount" type="currency-amount"></field> - <field name="paymentId" type="id-ne"></field> + <field name="paymentId" type="id"></field> <field name="orderId" type="id"></field> <field name="orderItemSeqId" type="id"><description>To be used along with orderId to point to an OrderItem that represents the purchase of a product to add money to the account.</description></field> <field name="performedByPartyId" type="id"></field> @@ -557,7 +557,7 @@ under the License. title="Financial Account Type Entity"> <field name="finAccountTypeId" type="id"></field> <field name="parentTypeId" type="id"></field> - <field name="replenishEnumId" type="id-ne"></field> + <field name="replenishEnumId" type="id"></field> <field name="isRefundable" type="indicator"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> @@ -645,7 +645,7 @@ under the License. <field name="actualEndOfLife" type="date"></field> <field name="productionCapacity" type="fixed-point"></field> <field name="uomId" type="id"></field> - <field name="calendarId" type="id-ne"></field> + <field name="calendarId" type="id"></field> <field name="serialNumber" type="long-varchar"></field> <field name="locatedAtFacilityId" type="id"></field> <field name="locatedAtLocationSeqId" type="id"></field> @@ -803,7 +803,7 @@ under the License. <field name="fixedAssetId" type="id"></field> <field name="maintHistSeqId" type="id"></field> <field name="statusId" type="id"></field> - <field name="productMaintTypeId" type="id-ne"><description>If productMaintSeqId is known can lookup using that and the FixedAsset.productId; for un-scheduled maintenance is filled in directly</description></field> + <field name="productMaintTypeId" type="id"><description>If productMaintSeqId is known can lookup using that and the FixedAsset.productId; for un-scheduled maintenance is filled in directly</description></field> <field name="productMaintSeqId" type="id"><description>Optional, though should be filled in to determine upcoming maintenance for all scheduled maintenance</description></field> <field name="scheduleWorkEffortId" type="id"><description>Has field for estimated/actual start and finish dates, etc</description></field> <field name="intervalQuantity" type="fixed-point"></field> @@ -938,7 +938,7 @@ under the License. <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="registrationDate" type="date-time"></field> - <field name="govAgencyPartyId" type="id-ne"></field> + <field name="govAgencyPartyId" type="id"></field> <field name="registrationNumber" type="long-varchar"></field> <field name="licenseNumber" type="long-varchar"></field> <prim-key field="fixedAssetId"/> @@ -1023,7 +1023,7 @@ under the License. <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="allocatedDate" type="date-time"></field> - <field name="statusId" type="id-ne"></field> + <field name="statusId" type="id"></field> <field name="comments" type="comment"></field> <prim-key field="partyId"/> <prim-key field="roleTypeId"/> @@ -1111,7 +1111,7 @@ under the License. package-name="org.apache.ofbiz.accounting.fixedasset" title="Accommodation Map"> <field name="accommodationMapId" type="id"></field> - <field name="accommodationClassId" type="id-ne"></field> + <field name="accommodationClassId" type="id"></field> <field name="fixedAssetId" type="id"></field> <field name="accommodationMapTypeId" type="id"></field> <field name="numberOfSpaces" type="numeric"></field> @@ -1299,10 +1299,10 @@ under the License. <field name="quantity" type="fixed-point"></field> <field name="amount" type="currency-precise"></field> <field name="description" type="description"></field> - <field name="taxAuthPartyId" type="id-ne"/> - <field name="taxAuthGeoId" type="id-ne"/> - <field name="taxAuthorityRateSeqId" type="id-ne"></field> - <field name="salesOpportunityId" type="id-ne"></field> + <field name="taxAuthPartyId" type="id"/> + <field name="taxAuthGeoId" type="id"/> + <field name="taxAuthorityRateSeqId" type="id"></field> + <field name="salesOpportunityId" type="id"></field> <prim-key field="invoiceId"/> <prim-key field="invoiceItemSeqId"/> <relation type="one" fk-name="INVOICE_ITMITYP" rel-entity-name="InvoiceItemType"> @@ -1482,7 +1482,7 @@ under the License. title="Invoice Item Type Map Entity"> <field name="invoiceItemMapKey" type="id"></field> <field name="invoiceTypeId" type="id"></field> - <field name="invoiceItemTypeId" type="id-ne"></field> + <field name="invoiceItemTypeId" type="id"></field> <prim-key field="invoiceItemMapKey"/> <prim-key field="invoiceTypeId"/> <relation type="one" fk-name="INVOICE_ITEM_MAP" rel-entity-name="InvoiceItemType"> @@ -1853,7 +1853,7 @@ under the License. title="Transaction Entry Entity"> <field name="acctgTransId" type="id"></field> <field name="acctgTransEntrySeqId" type="id"></field> - <field name="acctgTransEntryTypeId" type="id-ne"></field> + <field name="acctgTransEntryTypeId" type="id"></field> <field name="description" type="description"></field> <field name="voucherRef" type="short-varchar"></field> <field name="partyId" type="id"></field> @@ -1863,8 +1863,8 @@ under the License. <field name="theirProductId" type="id"></field> <field name="inventoryItemId" type="id"></field> <field name="glAccountTypeId" type="id"></field> - <field name="glAccountId" type="id-ne"></field> - <field name="organizationPartyId" type="id-ne"></field> + <field name="glAccountId" type="id"></field> + <field name="organizationPartyId" type="id"></field> <field name="amount" type="currency-amount"></field> <field name="currencyUomId" type="id"></field> <field name="origAmount" type="currency-amount"></field> @@ -2113,7 +2113,7 @@ under the License. package-name="org.apache.ofbiz.accounting.ledger" title="General Ledger Account Group Entity"> <field name="glAccountGroupId" type="id"></field> - <field name="glAccountGroupTypeId" type="id-ne"></field> + <field name="glAccountGroupTypeId" type="id"></field> <field name="description" type="description"></field> <prim-key field="glAccountGroupId"/> <relation type="one" fk-name="GLACT_GRP_TP" rel-entity-name="GlAccountGroupType"> @@ -2125,7 +2125,7 @@ under the License. title="General Ledger Account Group Member Entity"> <field name="glAccountId" type="id"></field> <field name="glAccountGroupTypeId" type="id"></field> - <field name="glAccountGroupId" type="id-ne"></field> + <field name="glAccountGroupId" type="id"></field> <prim-key field="glAccountId"/> <prim-key field="glAccountGroupTypeId"/> <relation type="one" fk-name="GLACT_GPMBR_AC" rel-entity-name="GlAccount"> @@ -2222,7 +2222,7 @@ under the License. title="GL Account Organization Entity"> <field name="glAccountId" type="id"></field> <field name="organizationPartyId" type="id"></field> - <field name="roleTypeId" type="id-ne"></field> + <field name="roleTypeId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <prim-key field="glAccountId"/> @@ -2303,7 +2303,7 @@ under the License. title="GL Account Organization Entity"> <field name="glAccountTypeId" type="id"></field> <field name="organizationPartyId" type="id"></field> - <field name="glAccountId" type="id-ne"></field> + <field name="glAccountId" type="id"></field> <prim-key field="glAccountTypeId"/> <prim-key field="organizationPartyId"/> <relation type="one" fk-name="GLACCT_TPDF_GLAT" rel-entity-name="GlAccountType"> @@ -2347,7 +2347,7 @@ under the License. title="General Ledger Journal Entity"> <field name="glJournalId" type="id"></field> <field name="glJournalName" type="name"></field> - <field name="organizationPartyId" type="id-ne"></field> + <field name="organizationPartyId" type="id"></field> <field name="isPosted" type="indicator"></field> <field name="postedDate" type="date-time"></field> <prim-key field="glJournalId"/> @@ -2365,9 +2365,9 @@ under the License. <field name="createdByUserLogin" type="id-vlong"></field> <field name="lastModifiedDate" type="date-time"></field> <field name="lastModifiedByUserLogin" type="id-vlong"></field> - <field name="glAccountId" type="id-ne"></field> - <field name="statusId" type="id-ne"></field> - <field name="organizationPartyId" type="id-ne"></field> + <field name="glAccountId" type="id"></field> + <field name="statusId" type="id"></field> + <field name="organizationPartyId" type="id"></field> <field name="reconciledBalance" type="currency-amount"></field> <field name="openingBalance" type="currency-amount"></field> <field name="reconciledDate" type="date-time"></field> @@ -2424,18 +2424,18 @@ under the License. <field name="partyId" type="id"/> <field name="fiscalYearStartMonth" type="numeric"/> <field name="fiscalYearStartDay" type="numeric"/> - <field name="taxFormId" type="id-ne"/> - <field name="cogsMethodId" type="id-ne"/> - <field name="baseCurrencyUomId" type="id-ne"/> - <field name="invoiceSeqCustMethId" type="id-ne"/> + <field name="taxFormId" type="id"/> + <field name="cogsMethodId" type="id"/> + <field name="baseCurrencyUomId" type="id"/> + <field name="invoiceSeqCustMethId" type="id"/> <field name="invoiceIdPrefix" type="very-short"/> <field name="lastInvoiceNumber" type="numeric"/> <field name="lastInvoiceRestartDate" type="date-time"/> <field name="useInvoiceIdForReturns" type="indicator"/> - <field name="quoteSeqCustMethId" type="id-ne"/> + <field name="quoteSeqCustMethId" type="id"/> <field name="quoteIdPrefix" type="very-short"/> <field name="lastQuoteNumber" type="numeric"/> - <field name="orderSeqCustMethId" type="id-ne"/> + <field name="orderSeqCustMethId" type="id"/> <field name="orderIdPrefix" type="very-short"/> <field name="lastOrderNumber" type="numeric"/> <field name="refundPaymentMethodId" type="id"/> @@ -2446,9 +2446,9 @@ under the License. </description> </field> <!-- Deprecated Field--> - <field name="oldInvoiceSequenceEnumId" col-name="INVOICE_SEQUENCE_ENUM_ID" type="id-ne"/> - <field name="oldOrderSequenceEnumId" col-name="ORDER_SEQUENCE_ENUM_ID" type="id-ne"/> - <field name="oldQuoteSequenceEnumId" col-name="QUOTE_SEQUENCE_ENUM_ID" type="id-ne"/> + <field name="oldInvoiceSequenceEnumId" col-name="INVOICE_SEQUENCE_ENUM_ID" type="id"/> + <field name="oldOrderSequenceEnumId" col-name="ORDER_SEQUENCE_ENUM_ID" type="id"/> + <field name="oldQuoteSequenceEnumId" col-name="QUOTE_SEQUENCE_ENUM_ID" type="id"/> <prim-key field="partyId"/> <relation type="one" rel-entity-name="Party" fk-name="ACTG_PREF_PTY"> <key-map field-name="partyId"/> @@ -2543,7 +2543,7 @@ under the License. title="Defines GL Accounts for Inventory Variance Reasons"> <field name="varianceReasonId" type="id"></field> <field name="organizationPartyId" type="id"></field> - <field name="glAccountId" type="id-ne"></field> + <field name="glAccountId" type="id"></field> <prim-key field="varianceReasonId"/> <prim-key field="organizationPartyId"/> <relation type="one" fk-name="VRGL_VREAS" rel-entity-name="VarianceReason"> @@ -2678,7 +2678,7 @@ under the License. package-name="org.apache.ofbiz.accounting.payment" title="Billing Account Term Entity"> <field name="billingAccountTermId" type="id"></field> - <field name="billingAccountId" type="id-ne"></field> + <field name="billingAccountId" type="id"></field> <field name="termTypeId" type="id"></field> <field name="termValue" type="currency-amount"></field> <field name="termDays" type="numeric"></field> @@ -2724,7 +2724,7 @@ under the License. <field name="middleNameOnCard" type="name"></field> <field name="lastNameOnCard" type="name"></field> <field name="suffixOnCard" type="name"></field> - <field name="contactMechId" type="id-ne"><description>The Billing PostalAddress</description></field> + <field name="contactMechId" type="id"><description>The Billing PostalAddress</description></field> <field name="consecutiveFailedAuths" type="numeric"></field> <field name="lastFailedAuthDate" type="date-time"></field> <field name="consecutiveFailedNsf" type="numeric"></field> @@ -2745,7 +2745,7 @@ under the License. title="Credit Card Type GL Account Entity"> <field name="cardType" type="short-varchar"></field> <field name="organizationPartyId" type="id"></field> - <field name="glAccountId" type="id-ne"></field> + <field name="glAccountId" type="id"></field> <prim-key field="cardType"/> <prim-key field="organizationPartyId"/> </entity> @@ -2786,7 +2786,7 @@ under the License. <field name="accountNumber" type="long-varchar"></field> <field name="nameOnAccount" type="name"></field> <field name="companyNameOnAccount" type="name"></field> - <field name="contactMechId" type="id-ne"></field> + <field name="contactMechId" type="id"></field> <field name="yearsAtBank" type="numeric"></field> <prim-key field="paymentMethodId"/> <relation type="one" fk-name="EFTACCT_PMETH" rel-entity-name="PaymentMethod"> @@ -2810,7 +2810,7 @@ under the License. <field name="accountNumber" type="long-varchar"></field> <field name="nameOnAccount" type="name"></field> <field name="companyNameOnAccount" type="name"></field> - <field name="contactMechId" type="id-ne"></field> + <field name="contactMechId" type="id"></field> <field name="branchCode" type="short-varchar"></field> <prim-key field="paymentMethodId"/> <relation type="one" fk-name="CACCT_PMETH" rel-entity-name="PaymentMethod"> @@ -2831,7 +2831,7 @@ under the License. <field name="cardNumber" type="long-varchar" encrypt="true"></field> <field name="pinNumber" type="long-varchar" encrypt="true"></field> <field name="expireDate" type="credit-card-date"></field> - <field name="contactMechId" type="id-ne"></field> + <field name="contactMechId" type="id"></field> <prim-key field="paymentMethodId"/> <relation type="one" fk-name="GIFTCARD_PMNTMETH" rel-entity-name="PaymentMethod"> <key-map field-name="paymentMethodId"/> @@ -2847,12 +2847,12 @@ under the License. package-name="org.apache.ofbiz.accounting.payment" title="Gift Card Fulfillment History"> <field name="fulfillmentId" type="id"></field> - <field name="typeEnumId" type="id-ne"></field> - <field name="merchantId" type="id-vlong-ne"></field> - <field name="partyId" type="id-ne"></field> - <field name="orderId" type="id-ne"></field> - <field name="orderItemSeqId" type="id-ne"></field> - <field name="surveyResponseId" type="id-ne"></field> + <field name="typeEnumId" type="id"></field> + <field name="merchantId" type="id-vlong"></field> + <field name="partyId" type="id"></field> + <field name="orderId" type="id"></field> + <field name="orderItemSeqId" type="id"></field> + <field name="surveyResponseId" type="id"></field> <field name="cardNumber" type="long-varchar" encrypt="true"></field> <field name="pinNumber" type="long-varchar" encrypt="true"></field> <field name="amount" type="currency-amount"></field> @@ -2883,14 +2883,14 @@ under the License. package-name="org.apache.ofbiz.accounting.payment" title="Payment Entity"> <field name="paymentId" type="id"></field> - <field name="paymentTypeId" type="id-ne"></field> - <field name="paymentMethodTypeId" type="id-ne"></field> + <field name="paymentTypeId" type="id"></field> + <field name="paymentMethodTypeId" type="id"></field> <field name="paymentMethodId" type="id"></field> <field name="paymentGatewayResponseId" type="id"></field> <field name="paymentPreferenceId" type="id"></field> - <field name="partyIdFrom" type="id-ne"></field> - <field name="partyIdTo" type="id-ne"></field> - <field name="roleTypeIdTo" type="id-ne"></field> + <field name="partyIdFrom" type="id"></field> + <field name="partyIdTo" type="id"></field> + <field name="roleTypeIdTo" type="id"></field> <field name="statusId" type="id"></field> <field name="effectiveDate" type="date-time"></field> <field name="paymentRefNum" type="short-varchar"></field> @@ -3211,9 +3211,9 @@ under the License. title="Payment Method Entity"> <field name="paymentMethodId" type="id"></field> <field name="paymentMethodTypeId" type="id"></field> - <field name="partyId" type="id-ne"></field> - <field name="glAccountId" type="id-ne"></field> - <field name="finAccountId" type="id-ne"></field> + <field name="partyId" type="id"></field> + <field name="glAccountId" type="id"></field> + <field name="finAccountId" type="id"></field> <field name="description" type="description"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> @@ -3402,7 +3402,7 @@ under the License. title="Maps PaymentTypes to GlAccountTypes, allowing user to configure payments and gl accounts"> <field name="paymentTypeId" type="id"></field> <field name="organizationPartyId" type="id"/> - <field name="glAccountTypeId" type="id-ne"/> + <field name="glAccountTypeId" type="id"/> <prim-key field="paymentTypeId"/> <prim-key field="organizationPartyId"/> <relation type="one" fk-name="PMTGLACCT_PMTTYPE" rel-entity-name="PaymentType"> @@ -3434,7 +3434,7 @@ under the License. package-name="org.apache.ofbiz.accounting.payment" title="Payment Gateway Config"> <field name="paymentGatewayConfigId" type="id"></field> - <field name="paymentGatewayConfigTypeId" type="id-ne"></field> + <field name="paymentGatewayConfigTypeId" type="id"></field> <field name="description" type="description"></field> <prim-key field="paymentGatewayConfigId"/> <relation type="one" fk-name="PGC_PGCT" rel-entity-name="PaymentGatewayConfigType"> @@ -3685,7 +3685,7 @@ under the License. package-name="org.apache.ofbiz.accounting.payment" title="Payment Gateway Response Message"> <field name="paymentGatewayRespMsgId" type="id"></field> - <field name="paymentGatewayResponseId" type="id-ne"></field> + <field name="paymentGatewayResponseId" type="id"></field> <field name="pgrMessage" type="very-long"></field> <prim-key field="paymentGatewayRespMsgId"/> <relation type="one" fk-name="PAYGATRM_PAYGR" rel-entity-name="PaymentGatewayResponse"> @@ -3696,7 +3696,7 @@ under the License. package-name="org.apache.ofbiz.accounting.payment" title="Payment Gateway Response"> <field name="paymentGatewayResponseId" type="id"></field> - <field name="paymentServiceTypeEnumId" type="id-ne"></field> + <field name="paymentServiceTypeEnumId" type="id"></field> <field name="orderPaymentPreferenceId" type="id"></field> <field name="paymentMethodTypeId" type="id"></field> <field name="paymentMethodId" type="id"></field> @@ -3743,7 +3743,7 @@ under the License. title="Payment Group Entity"> <description>Payment Group</description> <field name="paymentGroupId" type="id"></field> - <field name="paymentGroupTypeId" type="id-ne"></field> + <field name="paymentGroupTypeId" type="id"></field> <field name="paymentGroupName" type="name"></field> <prim-key field="paymentGroupId"/> <relation type="one" fk-name="PAYMNTGP_PGTYPE" rel-entity-name="PaymentGroupType"> @@ -3793,7 +3793,7 @@ under the License. <field name="avsAddr" type="indicator"></field> <field name="avsZip" type="indicator"></field> <field name="correlationId" type="id"></field> - <field name="contactMechId" type="id-ne"></field> + <field name="contactMechId" type="id"></field> <field name="transactionId" type="short-varchar"></field> <prim-key field="paymentMethodId"/> <relation type="one" fk-name="PAYPAL_PMNTMETH" rel-entity-name="PaymentMethod"> @@ -3836,7 +3836,7 @@ under the License. <field name="taxAuthPartyId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> - <field name="partyTaxId" type="id-long-ne"></field> + <field name="partyTaxId" type="id-long"></field> <field name="isExempt" type="indicator"></field> <field name="isNexus" type="indicator"><!-- default N; if Y it means that this Party has a sufficient presence in the area to warrant having to charge tax --></field> <prim-key field="partyId"/> @@ -3901,7 +3901,7 @@ under the License. <field name="toTaxAuthPartyId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> - <field name="taxAuthorityAssocTypeId" type="id-ne"></field> + <field name="taxAuthorityAssocTypeId" type="id"></field> <prim-key field="taxAuthGeoId"/> <prim-key field="taxAuthPartyId"/> <prim-key field="toTaxAuthGeoId"/> @@ -3955,7 +3955,7 @@ under the License. <field name="taxAuthGeoId" type="id"></field> <field name="taxAuthPartyId" type="id"></field> <field name="organizationPartyId" type="id"></field> - <field name="glAccountId" type="id-ne"></field> + <field name="glAccountId" type="id"></field> <prim-key field="taxAuthGeoId"/> <prim-key field="taxAuthPartyId"/> <prim-key field="organizationPartyId"/> @@ -3989,12 +3989,12 @@ under the License. </view-entity> <entity entity-name="TaxAuthorityRateProduct" package-name="org.apache.ofbiz.accounting.tax" title="Tax Authority Rate Entity"> <field name="taxAuthorityRateSeqId" type="id"></field> - <field name="taxAuthGeoId" type="id-ne"></field> - <field name="taxAuthPartyId" type="id-ne"></field> - <field name="taxAuthorityRateTypeId" type="id-ne"></field> - <field name="productStoreId" type="id-ne"></field> - <field name="productCategoryId" type="id-ne"></field> - <field name="titleTransferEnumId" type="id-ne"></field> + <field name="taxAuthGeoId" type="id"></field> + <field name="taxAuthPartyId" type="id"></field> + <field name="taxAuthorityRateTypeId" type="id"></field> + <field name="productStoreId" type="id"></field> + <field name="productCategoryId" type="id"></field> + <field name="titleTransferEnumId" type="id"></field> <field name="minItemPrice" type="currency-amount"></field> <field name="minPurchase" type="currency-amount"></field> <field name="taxShipping" type="indicator"></field> @@ -4074,7 +4074,7 @@ under the License. <field name="partyId" type="id"/> <field name="roleTypeId" type="id"/> <field name="glAccountTypeId" type="id"/> - <field name="glAccountId" type="id-ne"/> + <field name="glAccountId" type="id"/> <prim-key field="organizationPartyId"/> <prim-key field="partyId"/> <prim-key field="roleTypeId"/> @@ -4224,7 +4224,7 @@ under the License. package-name="org.apache.ofbiz.accounting.ledger" title="General Ledger Account Category Entity"> <field name="glAccountCategoryId" type="id"></field> - <field name="glAccountCategoryTypeId" type="id-ne"></field> + <field name="glAccountCategoryTypeId" type="id"></field> <field name="description" type="description"></field> <prim-key field="glAccountCategoryId"/> <relation type="one" fk-name="GLACT_CAT_TP" rel-entity-name="GlAccountCategoryType"> Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/content-entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/content-entitymodel.xml?rev=1804026&r1=1804025&r2=1804026&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/content-entitymodel.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/content-entitymodel.xml Thu Aug 3 17:51:07 2017 @@ -251,11 +251,11 @@ under the License. package-name="org.apache.ofbiz.content.content" title="Content Approval Entity"> <field name="contentApprovalId" type="id"></field> - <field name="contentId" type="id-ne"></field> - <field name="contentRevisionSeqId" type="id-ne"></field> - <field name="partyId" type="id-ne"></field> - <field name="roleTypeId" type="id-ne"></field> - <field name="approvalStatusId" type="id-ne"></field> + <field name="contentId" type="id"></field> + <field name="contentRevisionSeqId" type="id"></field> + <field name="partyId" type="id"></field> + <field name="roleTypeId" type="id"></field> + <field name="approvalStatusId" type="id"></field> <field name="approvalDate" type="date-time"></field> <field name="sequenceNum" type="numeric"></field> <field name="comments" type="comment"></field> @@ -595,7 +595,7 @@ under the License. title="Content Revision Entity"> <field name="contentId" type="id"></field> <field name="contentRevisionSeqId" type="id"></field> - <field name="committedByPartyId" type="id-ne"></field> + <field name="committedByPartyId" type="id"></field> <field name="comments" type="comment"></field> <prim-key field="contentId"/> <prim-key field="contentRevisionSeqId"/> @@ -612,8 +612,8 @@ under the License. <field name="contentId" type="id"></field> <field name="contentRevisionSeqId" type="id"></field> <field name="itemContentId" type="id"></field> - <field name="oldDataResourceId" type="id-ne"></field> - <field name="newDataResourceId" type="id-ne"></field> + <field name="oldDataResourceId" type="id"></field> + <field name="newDataResourceId" type="id"></field> <prim-key field="contentId"/> <prim-key field="contentRevisionSeqId"/> <prim-key field="itemContentId"/> @@ -764,7 +764,7 @@ under the License. <field name="dataResourceId" type="id"></field> <field name="dataResourceTypeId" type="id"></field> <field name="dataTemplateTypeId" type="id"></field> - <field name="dataCategoryId" type="id-ne"></field> + <field name="dataCategoryId" type="id"></field> <field name="dataSourceId" type="id"></field> <field name="statusId" type="id"></field> <field name="dataResourceName" type="value"></field> @@ -995,7 +995,7 @@ under the License. package-name="org.apache.ofbiz.content.data" title="File Extension Entity"> <field name="fileExtensionId" type="id-long"></field> - <field name="mimeTypeId" type="id-vlong-ne"></field> + <field name="mimeTypeId" type="id-vlong"></field> <prim-key field="fileExtensionId"/> <relation type="one" fk-name="FILEEXT_MMTYP" rel-entity-name="MimeType"> <key-map field-name="mimeTypeId"/> @@ -1179,7 +1179,7 @@ under the License. <field name="isAnonymous" type="indicator"><description>Allow response to the survey without login?</description></field> <field name="allowMultiple" type="indicator"><description>Allow multiple responses to this survey (if Y), or just a single answer (if N)?</description></field> <field name="allowUpdate" type="indicator"><description>Allow change to responses?</description></field> - <field name="acroFormContentId" type="id-ne"><description>Points to PDF with AcroForm</description></field> + <field name="acroFormContentId" type="id"><description>Points to PDF with AcroForm</description></field> <prim-key field="surveyId"/> </entity> <entity entity-name="SurveyApplType" @@ -1235,8 +1235,8 @@ under the License. package-name="org.apache.ofbiz.content.survey" title="Survey Question Entity"> <field name="surveyQuestionId" type="id"/> - <field name="surveyQuestionCategoryId" type="id-ne"/> - <field name="surveyQuestionTypeId" type="id-ne"/> + <field name="surveyQuestionCategoryId" type="id"/> + <field name="surveyQuestionTypeId" type="id"/> <field name="description" type="description"/> <field name="question" type="very-long"/> <field name="hint" type="very-long"/> @@ -1307,8 +1307,8 @@ under the License. <field name="surveyQuestionId" type="id"/> <field name="fromDate" type="date-time"/> <field name="thruDate" type="date-time"/> - <field name="surveyPageSeqId" type="id-ne"/> - <field name="surveyMultiRespId" type="id-ne"/> + <field name="surveyPageSeqId" type="id"/> + <field name="surveyMultiRespId" type="id"/> <field name="surveyMultiRespColId" type="id"><description>Used to optionally associate this question to a specific column in the Multi-Response set; with this you can associate a single question to each cell in the question/column grid; this is useful for AcroForm round trips where the target PDF needs a question associated with each cell, or even the same question applied with different externalFieldRef values.</description></field> <field name="requiredField" type="indicator"/> <field name="sequenceNum" type="numeric"/> @@ -1385,7 +1385,7 @@ under the License. package-name="org.apache.ofbiz.content.survey" title="Survey Response Entity"> <field name="surveyResponseId" type="id"></field> - <field name="surveyId" type="id-ne"></field> + <field name="surveyId" type="id"></field> <field name="partyId" type="id"></field> <field name="responseDate" type="date-time"></field> <field name="lastModifiedDate" type="date-time"></field> @@ -1450,7 +1450,7 @@ under the License. <field name="surveyResponseId" type="id"></field> <field name="surveyQuestionId" type="id"></field> <field name="surveyMultiRespColId" type="id"><description>This is needed to support multiple responses for different MultiResp Columns; if not part of a MultiResp will be _NA_</description></field> - <field name="surveyMultiRespId" type="id-ne"><description>This is not part of the primary key, but should be populated so that the SurveyMultiRespColumn can be more easily looked up.</description></field> + <field name="surveyMultiRespId" type="id"><description>This is not part of the primary key, but should be populated so that the SurveyMultiRespColumn can be more easily looked up.</description></field> <field name="booleanResponse" type="indicator"></field> <field name="currencyResponse" type="currency-amount"></field> <field name="floatResponse" type="floating-point"></field> @@ -1505,7 +1505,7 @@ under the License. <!-- ========================================================= --> <extend-entity entity-name="WebPage"> - <field name="contentId" type="id-ne"></field> + <field name="contentId" type="id"></field> <relation type="one" fk-name="WEB_PAGE_CONTENT" rel-entity-name="Content"> <key-map field-name="contentId"/> </relation> Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/humanres-entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/humanres-entitymodel.xml?rev=1804026&r1=1804025&r2=1804026&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/humanres-entitymodel.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/humanres-entitymodel.xml Thu Aug 3 17:51:07 2017 @@ -84,7 +84,7 @@ under the License. package-name="org.apache.ofbiz.humanres.ability" title="Resume Entity"> <field name="resumeId" type="id"></field> - <field name="partyId" type="id-ne"></field> + <field name="partyId" type="id"></field> <field name="contentId" type="id"></field> <field name="resumeDate" type="date-time"></field> <field name="resumeText" type="long-varchar"></field> @@ -232,12 +232,12 @@ under the License. package-name="org.apache.ofbiz.humanres.ability" title="Person Training Entity"> <field name="partyId" type="id"></field> - <field name="trainingRequestId" type="id-ne"></field> + <field name="trainingRequestId" type="id"></field> <field name="trainingClassTypeId" type="id"></field> - <field name="workEffortId" type="id-ne"></field> + <field name="workEffortId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> - <field name="approverId" type="id-ne"></field> + <field name="approverId" type="id"></field> <field name="approvalStatus" type="short-varchar"></field> <field name="reason" type="description"></field> <prim-key field="partyId"/> @@ -432,11 +432,11 @@ under the License. title="Employee Leave Entity"> <field name="partyId" type="id"/> <field name="leaveTypeId" type="id"/> - <field name="emplLeaveReasonTypeId" type="id-ne"/> + <field name="emplLeaveReasonTypeId" type="id"/> <field name="fromDate" type="date-time"/> <field name="thruDate" type="date-time"/> - <field name="approverPartyId" type="id-ne"/> - <field name="leaveStatus" type="id-ne"/> + <field name="approverPartyId" type="id"/> + <field name="leaveStatus" type="id"/> <field name="description" type="description"/> <prim-key field="partyId"/> <prim-key field="leaveTypeId"/> @@ -563,7 +563,7 @@ under the License. <field name="partyId" type="id"></field> <field name="roleTypeId" type="id"></field> <field name="payrollPreferenceSeqId" type="id"></field> - <field name="deductionTypeId" type="id-ne"></field> + <field name="deductionTypeId" type="id"></field> <field name="paymentMethodTypeId" type="id"></field> <field name="periodTypeId" type="id"></field> <field name="fromDate" type="date-time"></field> Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/manufacturing-entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/manufacturing-entitymodel.xml?rev=1804026&r1=1804025&r2=1804026&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/manufacturing-entitymodel.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/manufacturing-entitymodel.xml Thu Aug 3 17:51:07 2017 @@ -46,7 +46,7 @@ under the License. <field name="ruleId" type="id"></field> <field name="productId" type="id"></field> <field name="productIdFor" type="id"></field> - <field name="productIdIn" type="id-ne"></field> + <field name="productIdIn" type="id"></field> <field name="ruleSeqId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="productIdInSubst" type="id"></field> @@ -86,7 +86,7 @@ under the License. </description> <field name="calendarId" type="id"></field> <field name="description" type="description"></field> - <field name="calendarWeekId" type="id-ne"></field> + <field name="calendarWeekId" type="id"></field> <prim-key field="calendarId"/> <relation type="one" fk-name="CALENDAR_WEEK" rel-entity-name="TechDataCalendarWeek"> <key-map field-name="calendarWeekId"/> @@ -114,7 +114,7 @@ under the License. <description>Used to defined some weeks which differ from the normal week defined in the calendar.</description> <field name="calendarId" type="id"></field> <field name="exceptionDateStart" type="date"></field> - <field name="calendarWeekId" type="id-ne"></field> + <field name="calendarWeekId" type="id"></field> <field name="description" type="description"></field> <prim-key field="calendarId"/> <prim-key field="exceptionDateStart"/> Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/marketing-entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/marketing-entitymodel.xml?rev=1804026&r1=1804025&r2=1804026&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/marketing-entitymodel.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/marketing-entitymodel.xml Thu Aug 3 17:51:07 2017 @@ -53,11 +53,11 @@ under the License. <field name="budgetedCost" type="currency-amount"></field> <field name="actualCost" type="currency-amount"></field> <field name="estimatedCost" type="currency-amount"></field> - <field name="currencyUomId" type="id-ne"></field> + <field name="currencyUomId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="isActive" type="indicator"></field> - <field name="convertedLeads" type="id-ne"></field> + <field name="convertedLeads" type="id"></field> <field name="expectedResponsePercent" type="floating-point"></field> <field name="expectedRevenue" type="currency-amount"></field> <field name="numSent" type="numeric"></field> @@ -149,8 +149,8 @@ under the License. package-name="org.apache.ofbiz.marketing.contact" title="Contact List Entity"> <field name="contactListId" type="id"></field> - <field name="contactListTypeId" type="id-ne"></field> - <field name="contactMechTypeId" type="id-ne"></field> + <field name="contactListTypeId" type="id"></field> + <field name="contactMechTypeId" type="id"></field> <field name="marketingCampaignId" type="id"></field> <field name="contactListName" type="name"></field> <field name="description" type="description"></field> @@ -210,7 +210,7 @@ under the License. <field name="contactMechId" type="id"></field> <field name="partyId" type="id"></field> <field name="messageId" type="value"></field> - <field name="statusId" type="id-ne"></field> + <field name="statusId" type="id"></field> <field name="changeByUserLoginId" type="id-vlong"></field> <prim-key field="contactListId"/> <prim-key field="communicationEventId"/> @@ -309,7 +309,7 @@ under the License. package-name="org.apache.ofbiz.marketing.segment" title="Segment Group Entity"> <field name="segmentGroupId" type="id"></field> - <field name="segmentGroupTypeId" type="id-ne"></field> + <field name="segmentGroupTypeId" type="id"></field> <field name="description" type="description"></field> <field name="productStoreId" type="id"></field> <prim-key field="segmentGroupId"/> @@ -439,7 +439,7 @@ under the License. package-name="org.apache.ofbiz.marketing.tracking" title="Tracking Code Entity"> <field name="trackingCodeId" type="id"></field> - <field name="trackingCodeTypeId" type="id-ne"></field> + <field name="trackingCodeTypeId" type="id"></field> <field name="marketingCampaignId" type="id"></field> <field name="redirectUrl" type="url"></field> <field name="overrideLogo" type="url"></field> @@ -470,7 +470,7 @@ under the License. title="Tracking Code Visit Entity"> <field name="orderId" type="id"></field> <field name="trackingCodeTypeId" type="id"></field> - <field name="trackingCodeId" type="id-ne"></field> + <field name="trackingCodeId" type="id"></field> <field name="isBillable" type="indicator"></field> <field name="siteId" type="long-varchar"></field> <field name="hasExported" type="indicator"></field> @@ -492,9 +492,9 @@ under the License. title="Tracking Code And Order Return"> <field name="returnId" type="id"></field> <field name="orderId" type="id"></field> - <field name="orderItemSeqId" type="id-ne"></field> + <field name="orderItemSeqId" type="id"></field> <field name="trackingCodeTypeId" type="id"></field> - <field name="trackingCodeId" type="id-ne"></field> + <field name="trackingCodeId" type="id"></field> <field name="isBillable" type="indicator"></field> <field name="siteId" type="long-varchar"></field> <field name="hasExported" type="indicator"></field> @@ -659,12 +659,12 @@ under the License. <field name="nextStepDate" type="date-time"/> <field name="estimatedAmount" type="currency-amount"/> <field name="estimatedProbability" type="fixed-point"/> - <field name="currencyUomId" type="id-ne"/> - <field name="marketingCampaignId" type="id-ne"/> - <field name="dataSourceId" type="id-ne"/> + <field name="currencyUomId" type="id"/> + <field name="marketingCampaignId" type="id"/> + <field name="dataSourceId" type="id"/> <field name="estimatedCloseDate" type="date-time"/> - <field name="opportunityStageId" type="id-ne"/> - <field name="typeEnumId" type="id-ne"/> + <field name="opportunityStageId" type="id"/> + <field name="typeEnumId" type="id"/> <field name="createdByUserLogin" type="id-vlong"/> <prim-key field="salesOpportunityId"/> <relation fk-name="SLSOPP_CRNCY_UOM" rel-entity-name="Uom" type="one"> @@ -688,14 +688,14 @@ under the License. package-name="org.apache.ofbiz.marketing.opportunity" title="Tracks a history of sales opportunity information"> <field name="salesOpportunityHistoryId" type="id"></field> - <field name="salesOpportunityId" type="id-ne"></field> + <field name="salesOpportunityId" type="id"></field> <field name="description" type="very-long"/> <field name="nextStep" type="very-long"/> <field name="estimatedAmount" type="currency-amount"/> <field name="estimatedProbability" type="fixed-point"/> - <field name="currencyUomId" type="id-ne"/> + <field name="currencyUomId" type="id"/> <field name="estimatedCloseDate" type="date-time"/> - <field name="opportunityStageId" type="id-ne"/> + <field name="opportunityStageId" type="id"/> <field name="changeNote" type="very-long"> <description>Used to track a reason for this change</description> <!-- maybe one day this should be a link to NoteData --> </field> @@ -864,7 +864,7 @@ under the License. package-name="org.apache.ofbiz.marketing.opportunity" title="Keeps a record of changes to a sales forecast."> <field name="salesForecastHistoryId" type="id"></field> - <field name="salesForecastId" type="id-ne"></field> + <field name="salesForecastId" type="id"></field> <field name="parentSalesForecastId" type="id"></field> <field name="organizationPartyId" type="id"></field> <field name="internalPartyId" type="id"></field> @@ -906,7 +906,7 @@ under the License. title="Sales opportunity competitors record"> <field name="salesOpportunityId" type="id"></field> <field name="competitorPartyId" type="id"></field> - <field name="positionEnumId" type="id-ne"></field> + <field name="positionEnumId" type="id"></field> <field name="strengths" type="very-long"></field> <field name="weaknesses" type="very-long"></field> <prim-key field="salesOpportunityId"/> 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=1804026&r1=1804025&r2=1804026&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/order-entitymodel.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/order-entitymodel.xml Thu Aug 3 17:51:07 2017 @@ -65,7 +65,7 @@ under the License. <field name="productPromoActionSeqId" type="id"></field> <field name="productFeatureId" type="id"></field> <field name="correspondingProductId" type="id"></field> - <field name="taxAuthorityRateSeqId" type="id-ne"></field> + <field name="taxAuthorityRateSeqId" type="id"></field> <field name="sourceReferenceId" type="id-long"></field> <field name="sourcePercentage" type="fixed-point"> <description>for tax entries this is the tax percentage</description> @@ -473,8 +473,8 @@ under the License. <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> + <field name="orderItemTypeId" type="id"></field> + <field name="orderItemGroupSeqId" type="id"></field> <field name="isItemGroupPrimary" type="indicator"></field> <field name="fromInventoryItemId" type="id"></field> <field name="budgetId" type="id"></field> @@ -514,7 +514,7 @@ under the License. <field name="shipAfterDate" type="date-time"></field> <field name="cancelBackOrderDate" type="date-time"><description>Used to cancel all orders from suppliers when its in past</description></field> <field name="overrideGlAccountId" type="id"><description>Used to specify the override or actual glAccountId used for the adjustment, avoids problems if configuration changes after initial posting, etc.</description></field> - <field name="salesOpportunityId" type="id-ne"></field> + <field name="salesOpportunityId" type="id"></field> <field name="changeByUserLoginId" type="id-vlong" enable-audit-log="true"></field> <prim-key field="orderId"/> <prim-key field="orderItemSeqId"/> @@ -701,8 +701,8 @@ under the License. never-cache="true" title="Order Item Change Entity"> <field name="orderItemChangeId" type="id"></field> - <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="changeTypeEnumId" type="id"></field> <field name="changeDatetime" type="date-time"></field> <field name="changeUserLogin" type="id-vlong"></field> @@ -737,7 +737,7 @@ under the License. <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> + <field name="contactMechId" type="id"></field> <prim-key field="orderId"/> <prim-key field="orderItemSeqId"/> <prim-key field="contactMechPurposeTypeId"/> @@ -792,8 +792,8 @@ under the License. never-cache="true" title="Order Item Price Info Entity"> <field name="orderItemPriceInfoId" type="id"></field> - <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="productPriceRuleId" type="id"></field> <field name="productPriceActionSeqId" type="id"></field> <field name="modifyAmount" type="currency-precise"></field> @@ -940,7 +940,7 @@ under the License. <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="reserveOrderEnumId" type="id"></field> <field name="quantity" type="fixed-point"></field> <field name="quantityNotAvailable" type="fixed-point"></field> <field name="reservedDatetime" type="date-time"></field> @@ -1010,8 +1010,8 @@ under the License. never-cache="true" title="Order Notification Entity"> <field name="orderNotificationId" type="id"></field> - <field name="orderId" type="id-ne"></field> - <field name="emailType" type="id-ne"></field> + <field name="orderId" type="id"></field> + <field name="emailType" type="id"></field> <field name="comments" type="comment"></field> <field name="notificationDate" type="date-time"></field> <prim-key field="orderNotificationId"/> @@ -1374,7 +1374,7 @@ under the License. package-name="org.apache.ofbiz.order.quote" title="Quote Entity"> <field name="quoteId" type="id"></field> - <field name="quoteTypeId" type="id-ne"></field> + <field name="quoteTypeId" type="id"></field> <field name="partyId" type="id"></field> <field name="issueDate" type="date-time"></field> <field name="statusId" type="id"></field> @@ -2001,7 +2001,7 @@ under the License. <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> + <field name="partyId" type="id"><description>party or party group(via partyRelationShip entity) responsible for responding to the communication request of this particular type</description></field> <prim-key field="custRequestTypeId"/> <relation type="one" fk-name="CUST_REQ_TYPE_PAR" title="Parent" rel-entity-name="CustRequestType"> <key-map field-name="parentTypeId" rel-field-name="custRequestTypeId"/> @@ -2295,7 +2295,7 @@ under the License. title="Work Requirement Fulfillment Entity"> <field name="requirementId" type="id"></field> <field name="workEffortId" type="id"></field> - <field name="workReqFulfTypeId" type="id-ne"></field> + <field name="workReqFulfTypeId" type="id"></field> <prim-key field="requirementId"/> <prim-key field="workEffortId"/> <relation type="one" fk-name="WORK_REQFL_REQ" rel-entity-name="Requirement"> @@ -2336,7 +2336,7 @@ under the License. <field name="productPromoActionSeqId" type="id"></field> <field name="productFeatureId" type="id"></field> <field name="correspondingProductId" type="id"></field> - <field name="taxAuthorityRateSeqId" type="id-ne"></field> + <field name="taxAuthorityRateSeqId" type="id"></field> <field name="sourceReferenceId" type="id-long"></field> <field name="sourcePercentage" type="fixed-point"> <description>for tax entries this is the tax percentage</description> @@ -2432,7 +2432,7 @@ under the License. package-name="org.apache.ofbiz.order.return" title="Return Entity"> <field name="returnId" type="id"></field> - <field name="returnHeaderTypeId" type="id-ne"></field> + <field name="returnHeaderTypeId" type="id"></field> <field name="statusId" type="id"></field> <field name="createdBy" type="id-vlong"></field> <field name="fromPartyId" type="id"></field> @@ -2444,7 +2444,7 @@ under the License. <field name="originContactMechId" type="id"></field> <field name="destinationFacilityId" type="id"></field> <field name="needsInventoryReceive" type="indicator"></field> - <field name="currencyUomId" type="id-ne"></field> + <field name="currencyUomId" type="id"></field> <field name="supplierRmaId" type="id"></field> <prim-key field="returnId"/> <relation type="one" fk-name="RTN_HEAD_TYPE" rel-entity-name="ReturnHeaderType"> @@ -2513,7 +2513,7 @@ under the License. <description>we need this field to be able to figure out net sales of a product</description> </field> <field name="description" type="description"></field> - <field name="orderId" type="id-ne"></field> + <field name="orderId" type="id"></field> <field name="orderItemSeqId" type="id"></field> <field name="statusId" type="id"></field> <field name="expectedItemStatus" type="id"></field> @@ -2612,7 +2612,7 @@ under the License. order items, or orderAdjustmentTypeId and returnAdjustmentTypeId. Separate mappings for different types of returns (customer vs. vendor)</description> <field name="returnItemMapKey" type="id"></field> <field name="returnHeaderTypeId" type="id"></field> - <field name="returnItemTypeId" type="id-ne"></field> + <field name="returnItemTypeId" type="id"></field> <prim-key field="returnItemMapKey"/> <prim-key field="returnHeaderTypeId"/> <relation type="one-nofk" rel-entity-name="ReturnItemType"> @@ -2759,8 +2759,8 @@ under the License. title="Order Abandoned Line Entity"> <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="productId" type="id"></field> + <field name="prodCatalogId" type="id"></field> <field name="quantity" type="fixed-point"></field> <field name="reservStart" type="date-time"></field> <field name="reservLength" type="fixed-point"></field> Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/party-entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/party-entitymodel.xml?rev=1804026&r1=1804025&r2=1804026&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/party-entitymodel.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/party-entitymodel.xml Thu Aug 3 17:51:07 2017 @@ -1552,11 +1552,11 @@ under the License. package-name="org.apache.ofbiz.party.party" title="Party Entity"> <field name="partyId" type="id"></field> - <field name="partyTypeId" type="id-ne"></field> + <field name="partyTypeId" type="id"></field> <field name="externalId" type="id"></field> - <field name="preferredCurrencyUomId" type="id-ne"></field> + <field name="preferredCurrencyUomId" type="id"></field> <field name="description" type="very-long"></field> - <field name="statusId" type="id-ne"></field> + <field name="statusId" type="id"></field> <field name="createdDate" type="date-time"></field> <field name="createdByUserLogin" type="id-vlong"></field> <field name="lastModifiedDate" type="date-time"></field> @@ -1872,7 +1872,7 @@ under the License. <field name="carrierPartyId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> - <field name="accountNumber" type="id-ne"><!-- the customer's or user's account number, also known as the shipper number sometimes --></field> + <field name="accountNumber" type="id"><!-- the customer's or user's account number, also known as the shipper number sometimes --></field> <prim-key field="partyId"/> <prim-key field="carrierPartyId"/> <prim-key field="fromDate"/> @@ -2077,7 +2077,7 @@ under the License. package-name="org.apache.ofbiz.party.party" title="Party Invitation Entity"> <field name="partyInvitationId" type="id"></field> - <field name="partyIdFrom" type="id-ne"></field> + <field name="partyIdFrom" type="id"></field> <field name="partyId" type="id"></field> <field name="toName" type="name"></field> <field name="emailAddress" type="long-varchar"></field> @@ -2269,10 +2269,10 @@ under the License. <field name="relationshipName" type="name"> <description>Official name of relationship, such as title in a company</description> </field> - <field name="securityGroupId" type="id-ne"></field> + <field name="securityGroupId" type="id"></field> <field name="priorityTypeId" type="id"></field> <field name="partyRelationshipTypeId" type="id"></field> - <field name="permissionsEnumId" type="id-ne"></field> + <field name="permissionsEnumId" type="id"></field> <field name="positionTitle" type="name"><description>The exact word used within the company</description></field> <field name="comments" type="comment"></field> <prim-key field="partyIdFrom"/> Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml?rev=1804026&r1=1804025&r2=1804026&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml Thu Aug 3 17:51:07 2017 @@ -322,7 +322,7 @@ under the License. <field name="productCategoryId" type="id"></field> <field name="organizationPartyId" type="id"></field> <field name="glAccountTypeId" type="id"></field> - <field name="glAccountId" type="id-ne"></field> + <field name="glAccountId" type="id"></field> <prim-key field="productCategoryId"/> <prim-key field="organizationPartyId"/> <prim-key field="glAccountTypeId"/> @@ -759,7 +759,7 @@ under the License. <field name="sequenceNum" type="numeric"></field> <field name="configOptionId" type="id"></field> <field name="productId" type="id"></field> - <field name="productOptionId" type="id-ne"></field> + <field name="productOptionId" type="id"></field> <field name="description" type="description"></field> <prim-key field="configId"/> <prim-key field="configItemId"/> @@ -910,7 +910,7 @@ under the License. title="Product Cost Calculation Entity"> <field name="productId" type="id"></field> <field name="costComponentTypeId" type="id"></field> - <field name="costComponentCalcId" type="id-ne"></field> + <field name="costComponentCalcId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="sequenceNum" type="numeric"></field> <field name="thruDate" type="date-time"></field> @@ -995,7 +995,7 @@ under the License. <field name="facilityId" type="id"></field> <field name="facilityTypeId" type="id"></field> <field name="parentFacilityId" type="id"></field> - <field name="ownerPartyId" type="id-ne"/> + <field name="ownerPartyId" type="id"/> <field name="defaultInventoryItemTypeId" type="id"></field> <field name="facilityName" type="name"></field> <field name="primaryFacilityGroupId" type="id"></field> @@ -1231,7 +1231,7 @@ under the License. <entity entity-name="FacilityLocation" package-name="org.apache.ofbiz.product.facility" title="Facility Location Entity"> <field name="facilityId" type="id"></field> <field name="locationSeqId" type="id"></field> - <field name="locationTypeEnumId" type="id-ne"></field> + <field name="locationTypeEnumId" type="id"></field> <field name="areaId" type="id"></field> <field name="aisleId" type="id"></field> <field name="sectionId" type="id"></field> @@ -1503,7 +1503,7 @@ under the License. default-resource-name="ProductEntityLabels" title="Product Feature Entity"> <field name="productFeatureId" type="id"></field> - <field name="productFeatureTypeId" type="id-ne"></field> + <field name="productFeatureTypeId" type="id"></field> <field name="productFeatureCategoryId" type="id"></field> <field name="description" type="description"></field> <field name="uomId" type="id"></field> @@ -2246,7 +2246,7 @@ under the License. package-name="org.apache.ofbiz.product.inventory" title="Inventory Item Label Entity"> <field name="inventoryItemLabelId" type="id"></field> - <field name="inventoryItemLabelTypeId" type="id-ne"></field> + <field name="inventoryItemLabelTypeId" type="id"></field> <field name="description" type="description"></field> <prim-key field="inventoryItemLabelId"/> <relation type="one" fk-name="INV_ITLA_TYPE" rel-entity-name="InventoryItemLabelType"> @@ -2258,7 +2258,7 @@ under the License. title="Inventory Item Label Applicability Entity"> <field name="inventoryItemId" type="id"></field> <field name="inventoryItemLabelTypeId" type="id"></field> - <field name="inventoryItemLabelId" type="id-ne"></field> + <field name="inventoryItemLabelId" type="id"></field> <field name="sequenceNum" type="numeric"></field> <prim-key field="inventoryItemId"/> <prim-key field="inventoryItemLabelTypeId"/> @@ -2276,8 +2276,8 @@ under the License. package-name="org.apache.ofbiz.product.inventory" title="Inventory Transfer Entity"> <field name="inventoryTransferId" type="id"></field> - <field name="statusId" type="id-ne"></field> - <field name="inventoryItemId" type="id-ne"></field> + <field name="statusId" type="id"></field> + <field name="inventoryItemId" type="id"></field> <field name="facilityId" type="id"></field> <field name="locationSeqId" type="id"></field> <field name="containerId" type="id"></field> @@ -2423,8 +2423,8 @@ under the License. <field name="priceWithTax" type="currency-precise"><description>Always with tax if populated, regardless of if price does or does not include tax.</description></field> <field name="taxAmount" type="currency-precise"/> <field name="taxPercentage" type="fixed-point"/> - <field name="taxAuthPartyId" type="id-ne"/> - <field name="taxAuthGeoId" type="id-ne"/> + <field name="taxAuthPartyId" type="id"/> + <field name="taxAuthGeoId" type="id"/> <field name="taxInPrice" type="indicator"><description>If Y the price field has tax included for the given taxAuthPartyId/taxAuthGeoId at the taxPercentage.</description></field> <field name="createdDate" type="date-time"></field> <field name="createdByUserLogin" type="id-vlong"></field> @@ -2481,7 +2481,7 @@ under the License. title="Product Price Action Entity"> <field name="productPriceRuleId" type="id"></field> <field name="productPriceActionSeqId" type="id"></field> - <field name="productPriceActionTypeId" type="id-ne"></field> + <field name="productPriceActionTypeId" type="id"></field> <field name="amount" type="fixed-point"></field> <field name="rateCode" type="short-varchar"></field> <prim-key field="productPriceRuleId"/> @@ -2515,9 +2515,9 @@ under the License. package-name="org.apache.ofbiz.product.price" title="Product Price Change History Entity"> <field name="productPriceChangeId" type="id"></field> - <field name="productId" type="id-ne"></field> - <field name="productPriceTypeId" type="id-ne"></field> - <field name="productPricePurposeId" type="id-ne"></field> + <field name="productId" type="id"></field> + <field name="productPriceTypeId" type="id"></field> + <field name="productPricePurposeId" type="id"></field> <field name="currencyUomId" type="id"></field> <field name="productStoreGroupId" type="id"></field> <field name="fromDate" type="date-time"></field> @@ -3071,7 +3071,7 @@ under the License. <field name="productId" type="id"></field> <field name="organizationPartyId" type="id"></field> <field name="glAccountTypeId" type="id"></field> - <field name="glAccountId" type="id-ne"></field> + <field name="glAccountId" type="id"></field> <prim-key field="productId"/> <prim-key field="organizationPartyId"/> <prim-key field="glAccountTypeId"/> @@ -3112,7 +3112,7 @@ under the License. <field name="keyword" type="short-varchar"></field> <field name="keywordTypeId" type="id"></field> <field name="relevancyWeight" type="numeric"></field> - <field name="statusId" type="id-ne"></field> + <field name="statusId" type="id"></field> <prim-key field="productId"/> <prim-key field="keyword"/> <prim-key field="keywordTypeId"/> @@ -3209,9 +3209,9 @@ under the License. package-name="org.apache.ofbiz.product.product" title="Product Review Entity"> <field name="productReviewId" type="id"></field> - <field name="productStoreId" type="id-ne"></field> - <field name="productId" type="id-ne"></field> - <field name="userLoginId" type="id-vlong-ne"></field> + <field name="productStoreId" type="id"></field> + <field name="productId" type="id"></field> + <field name="userLoginId" type="id-vlong"></field> <field name="statusId" type="id"></field> <field name="postedAnonymous" type="indicator"></field> <field name="postedDateTime" type="date-time"></field> @@ -3453,7 +3453,7 @@ under the License. <field name="productPromoId" type="id"></field> <field name="productPromoRuleId" type="id"></field> <field name="productPromoActionSeqId" type="id"></field> - <field name="productPromoActionEnumId" type="id-ne"></field> + <field name="productPromoActionEnumId" type="id"></field> <field name="orderAdjustmentTypeId" type="id"></field> <field name="serviceName" type="long-varchar"></field> <field name="quantity" type="fixed-point"></field> @@ -3497,7 +3497,7 @@ under the License. <field name="productPromoCondSeqId" type="id"></field> <field name="productCategoryId" type="id"></field> <field name="andGroupId" type="id"></field> - <field name="productPromoApplEnumId" type="id-ne"></field> + <field name="productPromoApplEnumId" type="id"></field> <field name="includeSubCategories" type="indicator"></field> <prim-key field="productPromoId"/> <prim-key field="productPromoRuleId"/> @@ -3519,7 +3519,7 @@ under the License. package-name="org.apache.ofbiz.product.promo" title="Product Promotion Entity"> <field name="productPromoCodeId" type="id"></field> - <field name="productPromoId" type="id-ne"></field> + <field name="productPromoId" type="id"></field> <field name="userEntered" type="indicator"></field> <field name="requireEmailOrParty" type="indicator"></field> <field name="useLimitPerCode" type="numeric"></field> @@ -3629,7 +3629,7 @@ under the License. <field name="productPromoActionSeqId" type="id"></field> <field name="productPromoCondSeqId" type="id"></field> <field name="productId" type="id"></field> - <field name="productPromoApplEnumId" type="id-ne"></field> + <field name="productPromoApplEnumId" type="id"></field> <prim-key field="productPromoId"/> <prim-key field="productPromoRuleId"/> <prim-key field="productPromoActionSeqId"/> @@ -3662,9 +3662,9 @@ under the License. title="Product Promotion Use Entity"> <field name="orderId" type="id"></field> <field name="promoSequenceId" type="id"></field> - <field name="productPromoId" type="id-ne"></field> - <field name="productPromoCodeId" type="id-ne"></field> - <field name="partyId" type="id-ne"></field> + <field name="productPromoId" type="id"></field> + <field name="productPromoCodeId" type="id"></field> + <field name="partyId" type="id"></field> <field name="totalDiscountAmount" type="currency-amount"></field> <field name="quantityLeftInActions" type="fixed-point"></field> <prim-key field="orderId"/> @@ -4206,10 +4206,10 @@ under the License. package-name="org.apache.ofbiz.product.store" title="Product Store Carrier Shipment Method Entity"> <field name="productStoreShipMethId" type="id"></field> - <field name="productStoreId" type="id-ne"></field> - <field name="shipmentMethodTypeId" type="id-ne"></field> - <field name="partyId" type="id-ne"></field> - <field name="roleTypeId" type="id-ne"></field> + <field name="productStoreId" type="id"></field> + <field name="shipmentMethodTypeId" type="id"></field> + <field name="partyId" type="id"></field> + <field name="roleTypeId" type="id"></field> <field name="companyPartyId" type="id"></field> <field name="minWeight" type="fixed-point"></field> <field name="maxWeight" type="fixed-point"></field> @@ -4309,10 +4309,10 @@ under the License. package-name="org.apache.ofbiz.product.store" title="Product Store Survey Application Entity"> <field name="productStoreSurveyId" type="id"></field> - <field name="productStoreId" type="id-ne"></field> - <field name="surveyApplTypeId" type="id-ne"></field> + <field name="productStoreId" type="id"></field> + <field name="surveyApplTypeId" type="id"></field> <field name="groupName" type="name"></field> - <field name="surveyId" type="id-ne"></field> + <field name="surveyId" type="id"></field> <field name="productId" type="id"></field> <field name="productCategoryId" type="id"></field> <field name="fromDate" type="date-time"></field> @@ -4699,7 +4699,7 @@ under the License. package-name="org.apache.ofbiz.product.supplier" title="Reorder Guideline Entity"> <field name="reorderGuidelineId" type="id"></field> - <field name="productId" type="id-ne"></field> + <field name="productId" type="id"></field> <field name="partyId" type="id"></field> <field name="roleTypeId" type="id"></field> <field name="facilityId" type="id"></field> @@ -4851,13 +4851,13 @@ under the License. package-name="org.apache.ofbiz.product.product" title="Product Group Order Entity"> <field name="groupOrderId" type="id"></field> - <field name="productId" type="id-ne"></field> + <field name="productId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> - <field name="statusId" type="id-ne"></field> + <field name="statusId" type="id"></field> <field name="reqOrderQty" type="fixed-point"></field> <field name="soldOrderQty" type="fixed-point"></field> - <field name="jobId" type="id-ne"></field> + <field name="jobId" type="id"></field> <prim-key field="groupOrderId"/> <relation type="one" fk-name="PROD_GROUP_ORDER" rel-entity-name="Product"> <key-map field-name="productId"/> 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=1804026&r1=1804025&r2=1804026&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/shipment-entitymodel.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/shipment-entitymodel.xml Thu Aug 3 17:51:07 2017 @@ -45,9 +45,9 @@ under the License. package-name="org.apache.ofbiz.shipment.issuance" title="Item Issuance Entity"> <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> + <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="shipmentId" type="id"></field> <field name="shipmentItemSeqId" type="id"></field> @@ -155,9 +155,9 @@ under the License. title="Picklist Entity"> <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> - <field name="statusId" type="id-ne"></field> + <field name="facilityId" type="id"></field> + <field name="shipmentMethodTypeId" type="id"></field> + <field name="statusId" type="id"></field> <field name="picklistDate" type="date-time"></field> <field name="createdByUserLogin" type="id-vlong"></field> <field name="lastModifiedByUserLogin" type="id-vlong"></field> @@ -196,7 +196,7 @@ under the License. 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"></field> - <field name="picklistId" type="id-ne"></field> + <field name="picklistId" type="id"></field> <field name="binLocationNumber" type="numeric"></field> <field name="primaryOrderId" type="id"></field> <field name="primaryShipGroupSeqId" type="id"></field> @@ -220,7 +220,7 @@ under the License. <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="itemStatusId" type="id"></field> <field name="quantity" type="fixed-point"></field> <prim-key field="picklistBinId"/> <prim-key field="orderId"/> @@ -315,8 +315,8 @@ under the License. <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> - <field name="statusIdTo" type="id-ne"></field> + <field name="statusId" type="id"></field> + <field name="statusIdTo" type="id"></field> <prim-key field="picklistId"/> <prim-key field="changeDate"/> <relation type="one" fk-name="PCKLST_STHST_PKLT" rel-entity-name="Picklist"> @@ -557,7 +557,7 @@ under the License. title="Shipment Entity"> <field name="shipmentId" type="id"></field> <field name="shipmentTypeId" type="id"></field> - <field name="statusId" type="id-ne"></field> + <field name="statusId" type="id"></field> <field name="primaryOrderId" type="id"></field> <field name="primaryReturnId" type="id"></field> <field name="primaryShipGroupSeqId" type="id"></field> @@ -739,7 +739,7 @@ under the License. title="Shipment Contact Mechanism Entity"> <field name="shipmentId" type="id"></field> <field name="shipmentContactMechTypeId" type="id"></field> - <field name="contactMechId" type="id-ne"></field> + <field name="contactMechId" type="id"></field> <prim-key field="shipmentId"/> <prim-key field="shipmentContactMechTypeId"/> <relation type="one" fk-name="SHPMT_CMECH" rel-entity-name="Shipment"> @@ -853,7 +853,7 @@ under the License. package-name="org.apache.ofbiz.shipment.shipment" title="Shipment Gateway Config"> <field name="shipmentGatewayConfigId" type="id"></field> - <field name="shipmentGatewayConfTypeId" type="id-ne"></field> + <field name="shipmentGatewayConfTypeId" type="id"></field> <field name="description" type="description"></field> <prim-key field="shipmentGatewayConfigId"/> <relation type="one" fk-name="SGC_SGCT" rel-entity-name="ShipmentGatewayConfigType"> 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=1804026&r1=1804025&r2=1804026&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/workeffort-entitymodel.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/workeffort-entitymodel.xml Thu Aug 3 17:51:07 2017 @@ -131,9 +131,9 @@ under the License. package-name="org.apache.ofbiz.workeffort.workeffort" title="WorkEffort Application Sandbox Entity"> <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> + <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="runtimeDataId" type="id"></field> <prim-key field="applicationId"/> @@ -505,7 +505,7 @@ under the License. title="Work Effort Fixed Asset Assignment Entity"> <field name="workEffortId" type="id"></field> <field name="fixedAssetId" type="id"></field> - <field name="statusId" type="id-ne"></field> + <field name="statusId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="availabilityStatusId" type="id"><description>Points to StatusItem value with statusTypeId="WEFA_AVAILABILITY"</description></field> @@ -550,7 +550,7 @@ under the License. <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> + <field name="statusId" type="id"></field> <field name="estimatedQuantity" type="floating-point"></field> <field name="estimatedCost" type="currency-amount"></field> <prim-key field="workEffortId"/> @@ -599,7 +599,7 @@ under the License. title="Work Effort Inventory Assignment Entity"> <field name="workEffortId" type="id"></field> <field name="inventoryItemId" type="id"></field> - <field name="statusId" type="id-ne"></field> + <field name="statusId" type="id"></field> <field name="quantity" type="floating-point"></field> <prim-key field="workEffortId"/> <prim-key field="inventoryItemId"/> @@ -633,7 +633,7 @@ under the License. title="Work Effort Cost Calculation Entity"> <field name="workEffortId" type="id"></field> <field name="costComponentTypeId" type="id"></field> - <field name="costComponentCalcId" type="id-ne"></field> + <field name="costComponentCalcId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <prim-key field="workEffortId"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |