svn commit: r1796379 [2/8] - in /ofbiz: ofbiz-framework/trunk/applicat
Locked
svn commit: r1796379 [2/8] - in /ofbiz: ofbiz-framework/trunk/applicat
 
|
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=1796379&r1=1796378&r2=1796379&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml Sat May 27 11:28:36 2017 @@ -48,7 +48,7 @@ under the License. <entity entity-name="Budget" package-name="org.apache.ofbiz.accounting.budget" title="Budget Entity"> - <field name="budgetId" type="id-ne"></field> + <field name="budgetId" type="id"></field> <field name="budgetTypeId" type="id"></field> <field name="customTimePeriodId" type="id"></field> <field name="comments" type="comment"></field> @@ -66,8 +66,8 @@ under the License. <entity entity-name="BudgetAttribute" package-name="org.apache.ofbiz.accounting.budget" title="Budget Attribute Entity"> - <field name="budgetId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="budgetId" 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="budgetId"/> @@ -82,8 +82,8 @@ under the License. <entity entity-name="BudgetItem" package-name="org.apache.ofbiz.accounting.budget" title="Budget Item Entity"> - <field name="budgetId" type="id-ne"></field> - <field name="budgetItemSeqId" type="id-ne"></field> + <field name="budgetId" type="id"></field> + <field name="budgetItemSeqId" type="id"></field> <field name="budgetItemTypeId" type="id"></field> <field name="amount" type="currency-amount"></field> <field name="purpose" type="long-varchar"></field> @@ -103,9 +103,9 @@ under the License. <entity entity-name="BudgetItemAttribute" package-name="org.apache.ofbiz.accounting.budget" title="Budget Item Attribute Entity"> - <field name="budgetId" type="id-ne"></field> - <field name="budgetItemSeqId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="budgetId" type="id"></field> + <field name="budgetItemSeqId" 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="budgetId"/> @@ -122,8 +122,8 @@ under the License. <entity entity-name="BudgetItemType" package-name="org.apache.ofbiz.accounting.budget" title="Budget Item Type Entity"> - <field name="budgetItemTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="budgetItemTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="budgetItemTypeId"/> @@ -134,8 +134,8 @@ under the License. <entity entity-name="BudgetItemTypeAttr" package-name="org.apache.ofbiz.accounting.budget" title="Budget Item Type Attribute Entity"> - <field name="budgetItemTypeId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="budgetItemTypeId" type="id"></field> + <field name="attrName" type="id-long"></field> <field name="description" type="description"></field> <prim-key field="budgetItemTypeId"/> <prim-key field="attrName"/> @@ -152,10 +152,10 @@ under the License. <entity entity-name="BudgetReview" package-name="org.apache.ofbiz.accounting.budget" title="Budget Review Entity"> - <field name="budgetId" type="id-ne"></field> - <field name="budgetReviewId" type="id-ne"></field> - <field name="partyId" type="id-ne"></field> - <field name="budgetReviewResultTypeId" type="id-ne"></field> + <field name="budgetId" type="id"></field> + <field name="budgetReviewId" type="id"></field> + <field name="partyId" type="id"></field> + <field name="budgetReviewResultTypeId" type="id"></field> <field name="reviewDate" type="date-time"></field> <prim-key field="budgetId"/> <prim-key field="budgetReviewId"/> @@ -174,7 +174,7 @@ under the License. <entity entity-name="BudgetReviewResultType" package-name="org.apache.ofbiz.accounting.budget" title="Budget Review Result Type Entity"> - <field name="budgetReviewResultTypeId" type="id-ne"></field> + <field name="budgetReviewResultTypeId" type="id"></field> <field name="description" type="description"></field> <field name="comments" type="comment"></field> <prim-key field="budgetReviewResultTypeId"/> @@ -182,8 +182,8 @@ under the License. <entity entity-name="BudgetRevision" package-name="org.apache.ofbiz.accounting.budget" title="Budget Revision Entity"> - <field name="budgetId" type="id-ne"></field> - <field name="revisionSeqId" type="id-ne"></field> + <field name="budgetId" type="id"></field> + <field name="revisionSeqId" type="id"></field> <field name="dateRevised" type="date-time"></field> <prim-key field="budgetId"/> <prim-key field="revisionSeqId"/> @@ -194,9 +194,9 @@ under the License. <entity entity-name="BudgetRevisionImpact" package-name="org.apache.ofbiz.accounting.budget" title="Budget Revision Impact Entity"> - <field name="budgetId" type="id-ne"></field> - <field name="budgetItemSeqId" type="id-ne"></field> - <field name="revisionSeqId" type="id-ne"></field> + <field name="budgetId" type="id"></field> + <field name="budgetItemSeqId" type="id"></field> + <field name="revisionSeqId" type="id"></field> <field name="revisedAmount" type="currency-amount"></field> <field name="addDeleteFlag" type="indicator"></field> <field name="revisionReason" type="long-varchar"></field> @@ -218,9 +218,9 @@ under the License. <entity entity-name="BudgetRole" package-name="org.apache.ofbiz.accounting.budget" title="Budget Role Entity"> - <field name="budgetId" type="id-ne"></field> - <field name="partyId" type="id-ne"></field> - <field name="roleTypeId" type="id-ne"></field> + <field name="budgetId" type="id"></field> + <field name="partyId" type="id"></field> + <field name="roleTypeId" type="id"></field> <prim-key field="budgetId"/> <prim-key field="partyId"/> <prim-key field="roleTypeId"/> @@ -238,15 +238,15 @@ under the License. <entity entity-name="BudgetScenario" package-name="org.apache.ofbiz.accounting.budget" title="Budget Scenario Entity"> - <field name="budgetScenarioId" type="id-ne"></field> + <field name="budgetScenarioId" type="id"></field> <field name="description" type="description"></field> <prim-key field="budgetScenarioId"/> </entity> <entity entity-name="BudgetScenarioApplication" package-name="org.apache.ofbiz.accounting.budget" title="Budget Scenario Application Entity"> - <field name="budgetScenarioApplicId" type="id-ne"></field> - <field name="budgetScenarioId" type="id-ne"></field> + <field name="budgetScenarioApplicId" type="id"></field> + <field name="budgetScenarioId" type="id"></field> <field name="budgetId" type="id"></field> <field name="budgetItemSeqId" type="id"></field> <field name="amountChange" type="currency-amount"></field> @@ -267,8 +267,8 @@ under the License. <entity entity-name="BudgetScenarioRule" package-name="org.apache.ofbiz.accounting.budget" title="Budget Scenario Rule Entity"> - <field name="budgetScenarioId" type="id-ne"></field> - <field name="budgetItemTypeId" type="id-ne"></field> + <field name="budgetScenarioId" type="id"></field> + <field name="budgetItemTypeId" type="id"></field> <field name="amountChange" type="currency-amount"></field> <field name="percentageChange" type="fixed-point"></field> <prim-key field="budgetScenarioId"/> @@ -283,8 +283,8 @@ under the License. <entity entity-name="BudgetStatus" package-name="org.apache.ofbiz.accounting.budget" title="Budget Status Entity"> - <field name="budgetId" type="id-ne"></field> - <field name="statusId" type="id-ne"></field> + <field name="budgetId" type="id"></field> + <field name="statusId" type="id"></field> <field name="statusDate" type="date-time"></field> <field name="comments" type="comment"></field> <field name="changeByUserLoginId" type="id-vlong"></field> @@ -303,8 +303,8 @@ under the License. <entity entity-name="BudgetType" package-name="org.apache.ofbiz.accounting.budget" title="Budget Type Entity"> - <field name="budgetTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="budgetTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="budgetTypeId"/> @@ -315,8 +315,8 @@ under the License. <entity entity-name="BudgetTypeAttr" package-name="org.apache.ofbiz.accounting.budget" title="Budget Type Attribute Entity"> - <field name="budgetTypeId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="budgetTypeId" type="id"></field> + <field name="attrName" type="id-long"></field> <field name="description" type="description"></field> <prim-key field="budgetTypeId"/> <prim-key field="attrName"/> @@ -337,7 +337,7 @@ under the License. <!-- ========================================================= --> <entity entity-name="FinAccount" package-name="org.apache.ofbiz.accounting.finaccount" title="Financial Account Entity"> - <field name="finAccountId" type="id-ne"></field> + <field name="finAccountId" type="id"></field> <field name="finAccountTypeId" type="id"></field> <field name="statusId" type="id"></field> <field name="finAccountName" type="name"></field> @@ -390,8 +390,8 @@ under the License. </view-link> </view-entity> <entity entity-name="FinAccountAttribute" package-name="org.apache.ofbiz.accounting.finaccount" title="Financial Account Attribute Entity"> - <field name="finAccountId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="finAccountId" 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="finAccountId"/> @@ -404,8 +404,8 @@ under the License. </relation> </entity> <entity entity-name="FinAccountAuth" package-name="org.apache.ofbiz.accounting.finaccount" title="Financial Account Authorizations record"> - <field name="finAccountAuthId" type="id-ne"/> - <field name="finAccountId" type="id-ne"/> + <field name="finAccountAuthId" type="id"/> + <field name="finAccountId" type="id"/> <field name="amount" type="currency-amount"/> <field name="currencyUomId" type="id-ne"/> <field name="authorizationDate" type="date-time"/> @@ -417,9 +417,9 @@ under the License. </relation> </entity> <entity entity-name="FinAccountRole" package-name="org.apache.ofbiz.accounting.finaccount" title="Financial Account Role Entity"> - <field name="finAccountId" type="id-ne"></field> - <field name="partyId" type="id-ne"></field> - <field name="roleTypeId" type="id-ne"></field> + <field name="finAccountId" 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="finAccountId"/> @@ -441,7 +441,7 @@ under the License. </relation> </entity> <entity entity-name="FinAccountStatus" package-name="org.apache.ofbiz.accounting.finaccount" title="Financial Account Status Entity"> - <field name="finAccountId" type="id-ne"></field> + <field name="finAccountId" type="id"></field> <field name="statusId" type="id"></field> <field name="statusDate" type="date-time"></field> <field name="statusEndDate" type="date-time"></field> @@ -460,7 +460,7 @@ under the License. </relation> </entity> <entity entity-name="FinAccountTrans" package-name="org.apache.ofbiz.accounting.finaccount" title="Financial Account Transaction Entity"> - <field name="finAccountTransId" type="id-ne"></field> + <field name="finAccountTransId" type="id"></field> <field name="finAccountTransTypeId" type="id-ne"></field> <field name="finAccountId" type="id"></field> <field name="partyId" type="id"></field> @@ -509,8 +509,8 @@ under the License. </relation> </entity> <entity entity-name="FinAccountTransAttribute" package-name="org.apache.ofbiz.accounting.finaccount" title="Financial Account Transaction Attribute Entity"> - <field name="finAccountTransId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="finAccountTransId" 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="finAccountTransId"/> @@ -526,8 +526,8 @@ under the License. package-name="org.apache.ofbiz.accounting.finaccount" default-resource-name="AccountingEntityLabels" title="Financial Account Transaction Type Entity"> - <field name="finAccountTransTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="finAccountTransTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="finAccountTransTypeId"/> @@ -536,8 +536,8 @@ under the License. </relation> </entity> <entity entity-name="FinAccountTransTypeAttr" package-name="org.apache.ofbiz.accounting.finaccount" title="Financial Account Transaction Type Attribute Entity"> - <field name="finAccountTransTypeId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="finAccountTransTypeId" type="id"></field> + <field name="attrName" type="id-long"></field> <field name="description" type="description"></field> <prim-key field="finAccountTransTypeId"/> <prim-key field="attrName"/> @@ -555,8 +555,8 @@ under the License. package-name="org.apache.ofbiz.accounting.finaccount" default-resource-name="AccountingEntityLabels" title="Financial Account Type Entity"> - <field name="finAccountTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="finAccountTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="replenishEnumId" type="id-ne"></field> <field name="isRefundable" type="indicator"></field> <field name="hasTable" type="indicator"></field> @@ -570,8 +570,8 @@ under the License. </relation> </entity> <entity entity-name="FinAccountTypeAttr" package-name="org.apache.ofbiz.accounting.finaccount" title="Financial Account Type Attribute Entity"> - <field name="finAccountTypeId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="finAccountTypeId" type="id"></field> + <field name="attrName" type="id-long"></field> <field name="attrValue" type="long-varchar"></field> <field name="description" type="description"></field> <prim-key field="finAccountTypeId"/> @@ -587,8 +587,8 @@ under the License. </relation> </entity> <entity entity-name="FinAccountTypeGlAccount" package-name="org.apache.ofbiz.accounting.finaccount" title="Financial Account Type GL Account Entity"> - <field name="finAccountTypeId" type="id-ne"></field> - <field name="organizationPartyId" type="id-ne"></field> + <field name="finAccountTypeId" type="id"></field> + <field name="organizationPartyId" type="id"></field> <field name="glAccountId" type="id"></field> <prim-key field="finAccountTypeId"/> <prim-key field="organizationPartyId"/> @@ -628,7 +628,7 @@ under the License. <!-- ========================================================= --> <entity entity-name="FixedAsset" package-name="org.apache.ofbiz.accounting.fixedasset" title="Fixed Asset Entity"> - <field name="fixedAssetId" type="id-ne"></field> + <field name="fixedAssetId" type="id"></field> <field name="fixedAssetTypeId" type="id"></field> <field name="parentFixedAssetId" type="id"></field> <field name="instanceOfProductId" type="id"></field> @@ -703,8 +703,8 @@ under the License. <entity entity-name="FixedAssetAttribute" package-name="org.apache.ofbiz.accounting.fixedasset" title="Fixed Asset Attribute Entity"> - <field name="fixedAssetId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="fixedAssetId" 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="fixedAssetId"/> @@ -719,8 +719,8 @@ under the License. <entity entity-name="FixedAssetDepMethod" package-name="org.apache.ofbiz.accounting.fixedasset" title="Fixed Asset Depreciation Method Entity"> - <field name="depreciationCustomMethodId" type="id-ne"></field> - <field name="fixedAssetId" type="id-ne"></field> + <field name="depreciationCustomMethodId" type="id"></field> + <field name="fixedAssetId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <prim-key field="depreciationCustomMethodId"/> @@ -733,8 +733,8 @@ under the License. </relation> </entity> <entity entity-name="FixedAssetGeoPoint" package-name="org.apache.ofbiz.accounting.fixedasset" title="Fixed Asset Geo Location with history"> - <field name="fixedAssetId" type="id-ne"></field> - <field name="geoPointId" type="id-ne"></field> + <field name="fixedAssetId" type="id"></field> + <field name="geoPointId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <prim-key field="fixedAssetId"/> @@ -777,8 +777,8 @@ under the License. <entity entity-name="FixedAssetIdent" package-name="org.apache.ofbiz.accounting.fixedasset" title="Fixed Asset Identification Entity"> - <field name="fixedAssetId" type="id-ne"></field> - <field name="fixedAssetIdentTypeId" type="id-ne"></field> + <field name="fixedAssetId" type="id"></field> + <field name="fixedAssetIdentTypeId" type="id"></field> <field name="idValue" type="long-varchar"></field> <prim-key field="fixedAssetId"/> <prim-key field="fixedAssetIdentTypeId"/> @@ -793,15 +793,15 @@ under the License. package-name="org.apache.ofbiz.accounting.fixedasset" default-resource-name="AccountingEntityLabels" title="Fixed Asset Identification Type Entity"> - <field name="fixedAssetIdentTypeId" type="id-ne"></field> + <field name="fixedAssetIdentTypeId" type="id"></field> <field name="description" type="description"></field> <prim-key field="fixedAssetIdentTypeId"/> </entity> <entity entity-name="FixedAssetMaint" package-name="org.apache.ofbiz.accounting.fixedasset" title="Fixed Asset Maintenance Entity"> - <field name="fixedAssetId" type="id-ne"></field> - <field name="maintHistSeqId" type="id-ne"></field> + <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="productMaintSeqId" type="id"><description>Optional, though should be filled in to determine upcoming maintenance for all scheduled maintenance</description></field> @@ -838,8 +838,8 @@ under the License. <entity entity-name="FixedAssetMeter" package-name="org.apache.ofbiz.accounting.fixedasset" title="Fixed Asset Meter Entity"> - <field name="fixedAssetId" type="id-ne"></field> - <field name="productMeterTypeId" type="id-ne"></field> + <field name="fixedAssetId" type="id"></field> + <field name="productMeterTypeId" type="id"></field> <field name="readingDate" type="date-time"></field> <field name="meterValue" type="fixed-point"></field> <field name="readingReasonEnumId" type="id"></field> @@ -859,9 +859,9 @@ under the License. <entity entity-name="FixedAssetProduct" package-name="org.apache.ofbiz.accounting.fixedasset" title="Fixed Asset Product Representation Entity"> - <field name="fixedAssetId" type="id-ne"></field> - <field name="productId" type="id-ne"></field> - <field name="fixedAssetProductTypeId" type="id-ne"></field> + <field name="fixedAssetId" type="id"></field> + <field name="productId" type="id"></field> + <field name="fixedAssetProductTypeId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="comments" type="comment"></field> @@ -889,16 +889,16 @@ under the License. package-name="org.apache.ofbiz.accounting.fixedasset" default-resource-name="AccountingEntityLabels" title="Fixed Asset Product Type Entity"> - <field name="fixedAssetProductTypeId" type="id-ne"></field> + <field name="fixedAssetProductTypeId" type="id"></field> <field name="description" type="description"></field> <prim-key field="fixedAssetProductTypeId"/> </entity> <entity entity-name="FixedAssetTypeGlAccount" package-name="org.apache.ofbiz.accounting.fixedasset" title="Gl Account Mapping For Fixed Asset Or Fixed Asset Types"> - <field name="fixedAssetTypeId" type="id-ne"><description>The fixed asset type for the mappings. This field can be set to _NA_ in order to define a mapping for all types or for a specific asset (specified by the id in the fixedAssetId field).</description></field> - <field name="fixedAssetId" type="id-ne"><description>The fixed asset id for the mappings. This field can be set to _NA_ in order to define a mapping for all assets of a given type (specified by the id in the fixedAssetTypeId field).</description></field> - <field name="organizationPartyId" type="id-ne"></field> + <field name="fixedAssetTypeId" type="id"><description>The fixed asset type for the mappings. This field can be set to _NA_ in order to define a mapping for all types or for a specific asset (specified by the id in the fixedAssetId field).</description></field> + <field name="fixedAssetId" type="id"><description>The fixed asset id for the mappings. This field can be set to _NA_ in order to define a mapping for all assets of a given type (specified by the id in the fixedAssetTypeId field).</description></field> + <field name="organizationPartyId" type="id"></field> <field name="assetGlAccountId" type="id"><description>The (debit) account for the initial asset value (purchase cost)</description></field> <field name="accDepGlAccountId" type="id"><description>The (credit) account for the accumulated depreciation</description></field> <field name="depGlAccountId" type="id"><description>The (debit) account for the depreciation expense (matches the accDepGlAccountId)</description></field> @@ -934,7 +934,7 @@ under the License. </entity> <entity entity-name="FixedAssetRegistration" package-name="org.apache.ofbiz.accounting.fixedasset" title="Fixed Asset Registration Entity"> - <field name="fixedAssetId" type="id-ne"></field> + <field name="fixedAssetId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="registrationDate" type="date-time"></field> @@ -951,8 +951,8 @@ under the License. </relation> </entity> <entity entity-name="FixedAssetStdCost" package-name="org.apache.ofbiz.accounting.fixedasset" title="Fixed Asset Standard Cost Entity"> - <field name="fixedAssetId" type="id-ne"></field> - <field name="fixedAssetStdCostTypeId" type="id-ne"></field> + <field name="fixedAssetId" type="id"></field> + <field name="fixedAssetStdCostTypeId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="amountUomId" type="id"></field> @@ -974,8 +974,8 @@ under the License. package-name="org.apache.ofbiz.accounting.fixedasset" default-resource-name="AccountingEntityLabels" title="Fixed Asset Standard Cost Type Entity"> - <field name="fixedAssetStdCostTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="fixedAssetStdCostTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="fixedAssetStdCostTypeId"/> @@ -987,8 +987,8 @@ under the License. package-name="org.apache.ofbiz.accounting.fixedasset" default-resource-name="AccountingEntityLabels" title="Fixed Asset Type Entity"> - <field name="fixedAssetTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="fixedAssetTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="fixedAssetTypeId"/> @@ -999,8 +999,8 @@ under the License. <entity entity-name="FixedAssetTypeAttr" package-name="org.apache.ofbiz.accounting.fixedasset" title="Fixed Asset Type Attribute Entity"> - <field name="fixedAssetTypeId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="fixedAssetTypeId" type="id"></field> + <field name="attrName" type="id-long"></field> <field name="description" type="description"></field> <prim-key field="fixedAssetTypeId"/> <prim-key field="attrName"/> @@ -1017,9 +1017,9 @@ under the License. <entity entity-name="PartyFixedAssetAssignment" package-name="org.apache.ofbiz.accounting.fixedasset" title="Party Fixed Asset Assignment Entity"> - <field name="partyId" type="id-ne"></field> - <field name="roleTypeId" type="id-ne"></field> - <field name="fixedAssetId" type="id-ne"></field> + <field name="partyId" type="id"></field> + <field name="roleTypeId" type="id"></field> + <field name="fixedAssetId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="allocatedDate" type="date-time"></field> @@ -1059,8 +1059,8 @@ under the License. </view-entity> <entity entity-name="FixedAssetMaintOrder" package-name="org.apache.ofbiz.accounting.fixedasset" title="Fixed Asset Maintance And Order Entity"> - <field name="fixedAssetId" type="id-ne"></field> - <field name="maintHistSeqId" type="id-ne"></field> + <field name="fixedAssetId" type="id"></field> + <field name="maintHistSeqId" type="id"></field> <field name="orderId" type="id"></field> <field name="orderItemSeqId" type="id"></field> <prim-key field="fixedAssetId"/> @@ -1082,8 +1082,8 @@ under the License. <entity entity-name="AccommodationClass" package-name="org.apache.ofbiz.accounting.fixedasset" title="Accommodation Class"> - <field name="accommodationClassId" type="id-ne"></field> - <field name="parentClassId" type="id-ne"></field> + <field name="accommodationClassId" type="id"></field> + <field name="parentClassId" type="id"></field> <field name="description" type="description"></field> <prim-key field="accommodationClassId"/> <relation type="one" fk-name="ACCOMM_CLASS_PAR" title="Parent" rel-entity-name="AccommodationClass"> @@ -1093,7 +1093,7 @@ under the License. <entity entity-name="AccommodationSpot" package-name="org.apache.ofbiz.order.reservations" title="Accommodation Spot"> - <field name="accommodationSpotId" type="id-ne"></field> + <field name="accommodationSpotId" type="id"></field> <field name="accommodationClassId" type="id"></field> <field name="fixedAssetId" type="id"></field> <field name="numberOfSpaces" type="numeric"></field> @@ -1110,7 +1110,7 @@ under the License. <entity entity-name="AccommodationMap" package-name="org.apache.ofbiz.accounting.fixedasset" title="Accommodation Map"> - <field name="accommodationMapId" type="id-ne"></field> + <field name="accommodationMapId" type="id"></field> <field name="accommodationClassId" type="id-ne"></field> <field name="fixedAssetId" type="id"></field> <field name="accommodationMapTypeId" type="id"></field> @@ -1130,7 +1130,7 @@ under the License. <entity entity-name="AccommodationMapType" package-name="org.apache.ofbiz.accounting.fixedasset" title="Accommodation Map Type"> - <field name="accommodationMapTypeId" type="id-ne"></field> + <field name="accommodationMapTypeId" type="id"></field> <field name="description" type="description"></field> <prim-key field="accommodationMapTypeId"/> </entity> @@ -1159,7 +1159,7 @@ under the License. <entity entity-name="Invoice" package-name="org.apache.ofbiz.accounting.invoice" title="Invoice Entity"> - <field name="invoiceId" type="id-ne"></field> + <field name="invoiceId" type="id"></field> <field name="invoiceTypeId" type="id"></field> <field name="partyIdFrom" type="id"></field> <field name="partyId" type="id"></field> @@ -1214,8 +1214,8 @@ under the License. <entity entity-name="InvoiceAttribute" package-name="org.apache.ofbiz.accounting.invoice" title="Invoice Attribute Entity"> - <field name="invoiceId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="invoiceId" 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="invoiceId"/> @@ -1230,9 +1230,9 @@ under the License. <entity entity-name="InvoiceContent" package-name="org.apache.ofbiz.accounting.invoice" title="Invoice Content Entity"> - <field name="invoiceId" type="id-ne"></field> - <field name="invoiceContentTypeId" type="id-ne"></field> - <field name="contentId" type="id-ne"></field> + <field name="invoiceId" type="id"></field> + <field name="invoiceContentTypeId" 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="contentId"/> @@ -1252,7 +1252,7 @@ under the License. <entity entity-name="InvoiceContentType" package-name="org.apache.ofbiz.accounting.invoice" title="Invoice Content Type Entity"> - <field name="invoiceContentTypeId" type="id-ne"></field> + <field name="invoiceContentTypeId" type="id"></field> <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> @@ -1265,9 +1265,9 @@ under the License. package-name="org.apache.ofbiz.accounting.invoice" never-cache="true" title="Invoice Contact Mechanism Entity"> - <field name="invoiceId" type="id-ne"></field> - <field name="contactMechPurposeTypeId" type="id-ne"></field> - <field name="contactMechId" type="id-ne"></field> + <field name="invoiceId" type="id"></field> + <field name="contactMechPurposeTypeId" type="id"></field> + <field name="contactMechId" type="id"></field> <prim-key field="invoiceId"/> <prim-key field="contactMechPurposeTypeId"/> <prim-key field="contactMechId"/> @@ -1284,8 +1284,8 @@ under the License. <entity entity-name="InvoiceItem" package-name="org.apache.ofbiz.accounting.invoice" title="Invoice Item Entity"> - <field name="invoiceId" type="id-ne"></field> - <field name="invoiceItemSeqId" type="id-ne"></field> + <field name="invoiceId" type="id"></field> + <field name="invoiceItemSeqId" type="id"></field> <field name="invoiceItemTypeId" type="id"></field> <field name="overrideGlAccountId" type="id"><description>used to specify the override or actual glAccountId used for the invoice, avoids problems if configuration changes after initial posting, etc </description></field> <field name="overrideOrgPartyId" type="id"><description>Used to specify the organization override rather than using the payToPartyId</description></field> @@ -1357,11 +1357,11 @@ under the License. <entity entity-name="InvoiceItemAssoc" package-name="org.apache.ofbiz.accounting.invoice" title="Invoice Item Association Entity"> - <field name="invoiceIdFrom" type="id-ne"></field> - <field name="invoiceItemSeqIdFrom" type="id-ne"></field> - <field name="invoiceIdTo" type="id-ne"></field> - <field name="invoiceItemSeqIdTo" type="id-ne"></field> - <field name="invoiceItemAssocTypeId" type="id-ne"></field> + <field name="invoiceIdFrom" type="id"></field> + <field name="invoiceItemSeqIdFrom" type="id"></field> + <field name="invoiceIdTo" type="id"></field> + <field name="invoiceItemSeqIdTo" type="id"></field> + <field name="invoiceItemAssocTypeId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="partyIdFrom" type="id"></field> @@ -1396,8 +1396,8 @@ under the License. <entity entity-name="InvoiceItemAssocType" package-name="org.apache.ofbiz.accounting.invoice" title="Invoice Item Assoc Type Entity"> - <field name="invoiceItemAssocTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="invoiceItemAssocTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="invoiceItemAssocTypeId"/> @@ -1409,9 +1409,9 @@ under the License. <entity entity-name="InvoiceItemAttribute" package-name="org.apache.ofbiz.accounting.invoice" title="Invoice Item Attribute Entity"> - <field name="invoiceId" type="id-ne"></field> - <field name="invoiceItemSeqId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="invoiceId" type="id"></field> + <field name="invoiceItemSeqId" 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="invoiceId"/> @@ -1428,8 +1428,8 @@ under the License. <entity entity-name="InvoiceItemType" package-name="org.apache.ofbiz.accounting.invoice" title="Invoice Item Type Entity" default-resource-name="AccountingEntityLabels"> - <field name="invoiceItemTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="invoiceItemTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <field name="defaultGlAccountId" type="id"></field> @@ -1444,8 +1444,8 @@ under the License. <entity entity-name="InvoiceItemTypeAttr" package-name="org.apache.ofbiz.accounting.invoice" title="Invoice Item Type Attribute Entity"> - <field name="invoiceItemTypeId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="invoiceItemTypeId" type="id"></field> + <field name="attrName" type="id-long"></field> <field name="description" type="description"></field> <prim-key field="invoiceItemTypeId"/> <prim-key field="attrName"/> @@ -1462,8 +1462,8 @@ under the License. <entity entity-name="InvoiceItemTypeGlAccount" package-name="org.apache.ofbiz.accounting.invoice" title="Invoice Item Type GL Account Entity"> - <field name="invoiceItemTypeId" type="id-ne"></field> - <field name="organizationPartyId" type="id-ne"></field> + <field name="invoiceItemTypeId" type="id"></field> + <field name="organizationPartyId" type="id"></field> <field name="glAccountId" type="id"></field> <prim-key field="invoiceItemTypeId"/> <prim-key field="organizationPartyId"/> @@ -1480,8 +1480,8 @@ under the License. <entity entity-name="InvoiceItemTypeMap" package-name="org.apache.ofbiz.accounting.invoice" title="Invoice Item Type Map Entity"> - <field name="invoiceItemMapKey" type="id-ne"></field> - <field name="invoiceTypeId" type="id-ne"></field> + <field name="invoiceItemMapKey" type="id"></field> + <field name="invoiceTypeId" type="id"></field> <field name="invoiceItemTypeId" type="id-ne"></field> <prim-key field="invoiceItemMapKey"/> <prim-key field="invoiceTypeId"/> @@ -1498,9 +1498,9 @@ under the License. <entity entity-name="InvoiceRole" package-name="org.apache.ofbiz.accounting.invoice" title="Invoice Role Entity"> - <field name="invoiceId" type="id-ne"></field> - <field name="partyId" type="id-ne"></field> - <field name="roleTypeId" type="id-ne"></field> + <field name="invoiceId" type="id"></field> + <field name="partyId" type="id"></field> + <field name="roleTypeId" type="id"></field> <field name="datetimePerformed" type="date-time"></field> <field name="percentage" type="fixed-point"></field> <prim-key field="invoiceId"/> @@ -1523,8 +1523,8 @@ under the License. <entity entity-name="InvoiceStatus" package-name="org.apache.ofbiz.accounting.invoice" title="Invoice Status Entity"> - <field name="statusId" type="id-ne"></field> - <field name="invoiceId" type="id-ne"></field> + <field name="statusId" type="id"></field> + <field name="invoiceId" type="id"></field> <field name="statusDate" type="date-time"></field> <field name="changeByUserLoginId" type="id-vlong"/> <prim-key field="statusId"/> @@ -1543,7 +1543,7 @@ under the License. <entity entity-name="InvoiceTerm" package-name="org.apache.ofbiz.accounting.invoice" title="Invoice Term Entity"> - <field name="invoiceTermId" type="id-ne"></field> + <field name="invoiceTermId" type="id"></field> <field name="termTypeId" type="id"></field> <field name="invoiceId" type="id"></field> <field name="invoiceItemSeqId" type="id"></field> @@ -1567,8 +1567,8 @@ under the License. <entity entity-name="InvoiceTermAttribute" package-name="org.apache.ofbiz.accounting.invoice" title="Invoice Term Attribute Entity"> - <field name="invoiceTermId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="invoiceTermId" 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="invoiceTermId"/> @@ -1583,8 +1583,8 @@ under the License. <entity entity-name="InvoiceType" package-name="org.apache.ofbiz.accounting.invoice" title="Invoice Type Entity" default-resource-name="AccountingEntityLabels"> - <field name="invoiceTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="invoiceTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="invoiceTypeId"/> @@ -1595,8 +1595,8 @@ under the License. <entity entity-name="InvoiceTypeAttr" package-name="org.apache.ofbiz.accounting.invoice" title="Invoice Type Attribute Entity"> - <field name="invoiceTypeId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="invoiceTypeId" type="id"></field> + <field name="attrName" type="id-long"></field> <field name="description" type="description"></field> <prim-key field="invoiceTypeId"/> <prim-key field="attrName"/> @@ -1613,8 +1613,8 @@ under the License. <entity entity-name="InvoiceNote" package-name="org.apache.ofbiz.accounting.invoice" title="Invoice Note Entity"> - <field name="invoiceId" type="id-ne"></field> - <field name="noteId" type="id-ne"></field> + <field name="invoiceId" type="id"></field> + <field name="noteId" type="id"></field> <prim-key field="invoiceId"/> <prim-key field="noteId"/> <relation type="one" fk-name="INVOICE_NOTE_INV" rel-entity-name="Invoice"> @@ -1746,7 +1746,7 @@ under the License. <entity entity-name="AcctgTrans" package-name="org.apache.ofbiz.accounting.ledger" title="Accounting Transaction Entity"> - <field name="acctgTransId" type="id-ne"></field> + <field name="acctgTransId" type="id"></field> <field name="acctgTransTypeId" type="id"></field> <field name="description" type="description"></field> <field name="transactionDate" type="date-time"></field> @@ -1835,8 +1835,8 @@ under the License. <entity entity-name="AcctgTransAttribute" package-name="org.apache.ofbiz.accounting.ledger" title="Accounting Transaction Attribute Entity"> - <field name="acctgTransId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="acctgTransId" 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="acctgTransId"/> @@ -1851,8 +1851,8 @@ under the License. <entity entity-name="AcctgTransEntry" package-name="org.apache.ofbiz.accounting.ledger" title="Transaction Entry Entity"> - <field name="acctgTransId" type="id-ne"></field> - <field name="acctgTransEntrySeqId" type="id-ne"></field> + <field name="acctgTransId" type="id"></field> + <field name="acctgTransEntrySeqId" type="id"></field> <field name="acctgTransEntryTypeId" type="id-ne"></field> <field name="description" type="description"></field> <field name="voucherRef" type="short-varchar"></field> @@ -2021,8 +2021,8 @@ under the License. <entity entity-name="AcctgTransEntryType" package-name="org.apache.ofbiz.accounting.ledger" title="Accounting Transaction Entry Type Entity"> - <field name="acctgTransEntryTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="acctgTransEntryTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="acctgTransEntryTypeId"/> @@ -2034,8 +2034,8 @@ under the License. package-name="org.apache.ofbiz.accounting.ledger" default-resource-name="AccountingEntityLabels" title="Accounting Transaction Type Entity"> - <field name="acctgTransTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="acctgTransTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="acctgTransTypeId"/> @@ -2046,8 +2046,8 @@ under the License. <entity entity-name="AcctgTransTypeAttr" package-name="org.apache.ofbiz.accounting.ledger" title="Accounting Transaction Type Attribute Entity"> - <field name="acctgTransTypeId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="acctgTransTypeId" type="id"></field> + <field name="attrName" type="id-long"></field> <field name="description" type="description"></field> <prim-key field="acctgTransTypeId"/> <prim-key field="attrName"/> @@ -2065,7 +2065,7 @@ under the License. package-name="org.apache.ofbiz.accounting.ledger" title="General Ledger Account Entity"> <!-- default-resource-name="ChartOfAccountsEntityLabels" <= this does not exist yet and his blocking LookupGlAccount --> - <field name="glAccountId" type="id-ne"></field> + <field name="glAccountId" type="id"></field> <field name="glAccountTypeId" type="id"></field> <field name="glAccountClassId" type="id"></field> <field name="glResourceTypeId" type="id"></field> @@ -2100,8 +2100,8 @@ under the License. package-name="org.apache.ofbiz.accounting.ledger" default-resource-name="AccountingEntityLabels" title="General Ledger Account Class Entity"> - <field name="glAccountClassId" type="id-ne"></field> - <field name="parentClassId" type="id-ne"></field> + <field name="glAccountClassId" type="id"></field> + <field name="parentClassId" type="id"></field> <field name="description" type="description"></field> <field name="isAssetClass" type="indicator"></field> <prim-key field="glAccountClassId"/> @@ -2112,7 +2112,7 @@ under the License. <entity entity-name="GlAccountGroup" package-name="org.apache.ofbiz.accounting.ledger" title="General Ledger Account Group Entity"> - <field name="glAccountGroupId" type="id-ne"></field> + <field name="glAccountGroupId" type="id"></field> <field name="glAccountGroupTypeId" type="id-ne"></field> <field name="description" type="description"></field> <prim-key field="glAccountGroupId"/> @@ -2123,8 +2123,8 @@ under the License. <entity entity-name="GlAccountGroupMember" package-name="org.apache.ofbiz.accounting.ledger" title="General Ledger Account Group Member Entity"> - <field name="glAccountId" type="id-ne"></field> - <field name="glAccountGroupTypeId" type="id-ne"></field> + <field name="glAccountId" type="id"></field> + <field name="glAccountGroupTypeId" type="id"></field> <field name="glAccountGroupId" type="id-ne"></field> <prim-key field="glAccountId"/> <prim-key field="glAccountGroupTypeId"/> @@ -2141,16 +2141,16 @@ under the License. <entity entity-name="GlAccountGroupType" package-name="org.apache.ofbiz.accounting.ledger" title="General Ledger Account Group Type Entity"> - <field name="glAccountGroupTypeId" type="id-ne"></field> + <field name="glAccountGroupTypeId" type="id"></field> <field name="description" type="description"></field> <prim-key field="glAccountGroupTypeId"/> </entity> <entity entity-name="GlAccountHistory" package-name="org.apache.ofbiz.accounting.ledger" title="GL Account History Entity"> - <field name="glAccountId" type="id-ne"></field> - <field name="organizationPartyId" type="id-ne"></field> - <field name="customTimePeriodId" type="id-ne"></field> + <field name="glAccountId" type="id"></field> + <field name="organizationPartyId" type="id"></field> + <field name="customTimePeriodId" type="id"></field> <field name="openingBalance" type="currency-amount"></field> <field name="postedDebits" type="currency-amount"></field> <field name="postedCredits" type="currency-amount"></field> @@ -2220,8 +2220,8 @@ under the License. <entity entity-name="GlAccountOrganization" package-name="org.apache.ofbiz.accounting.ledger" title="GL Account Organization Entity"> - <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="roleTypeId" type="id-ne"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> @@ -2262,9 +2262,9 @@ under the License. <entity entity-name="GlAccountRole" package-name="org.apache.ofbiz.accounting.ledger" title="GL Account Role Entity"> - <field name="glAccountId" type="id-ne"></field> - <field name="partyId" type="id-ne"></field> - <field name="roleTypeId" type="id-ne"></field> + <field name="glAccountId" 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="glAccountId"/> @@ -2289,8 +2289,8 @@ under the License. package-name="org.apache.ofbiz.accounting.ledger" default-resource-name="AccountingEntityLabels" title="General Ledger Account Type Entity"> - <field name="glAccountTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="glAccountTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="glAccountTypeId"/> @@ -2301,8 +2301,8 @@ under the License. <entity entity-name="GlAccountTypeDefault" package-name="org.apache.ofbiz.accounting.ledger" title="GL Account Organization Entity"> - <field name="glAccountTypeId" type="id-ne"></field> - <field name="organizationPartyId" type="id-ne"></field> + <field name="glAccountTypeId" type="id"></field> + <field name="organizationPartyId" type="id"></field> <field name="glAccountId" type="id-ne"></field> <prim-key field="glAccountTypeId"/> <prim-key field="organizationPartyId"/> @@ -2319,8 +2319,8 @@ under the License. <entity entity-name="GlBudgetXref" package-name="org.apache.ofbiz.accounting.ledger" title="General Ledger Budget Cross Reference Entity"> - <field name="glAccountId" type="id-ne"></field> - <field name="budgetItemTypeId" type="id-ne"></field> + <field name="glAccountId" type="id"></field> + <field name="budgetItemTypeId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="allocationPercentage" type="fixed-point"></field> @@ -2338,14 +2338,14 @@ under the License. package-name="org.apache.ofbiz.accounting.ledger" default-resource-name="AccountingEntityLabels" title="General Ledger Fiscal Entity"> - <field name="glFiscalTypeId" type="id-ne"></field> + <field name="glFiscalTypeId" type="id"></field> <field name="description" type="description"></field> <prim-key field="glFiscalTypeId"/> </entity> <entity entity-name="GlJournal" package-name="org.apache.ofbiz.accounting.ledger" title="General Ledger Journal Entity"> - <field name="glJournalId" type="id-ne"></field> + <field name="glJournalId" type="id"></field> <field name="glJournalName" type="name"></field> <field name="organizationPartyId" type="id-ne"></field> <field name="isPosted" type="indicator"></field> @@ -2358,7 +2358,7 @@ under the License. <entity entity-name="GlReconciliation" package-name="org.apache.ofbiz.accounting.ledger" title="General Ledger Reconciliation Entity"> - <field name="glReconciliationId" type="id-ne"></field> + <field name="glReconciliationId" type="id"></field> <field name="glReconciliationName" type="name"></field> <field name="description" type="description"></field> <field name="createdDate" type="date-time"></field> @@ -2385,9 +2385,9 @@ under the License. <entity entity-name="GlReconciliationEntry" package-name="org.apache.ofbiz.accounting.ledger" title="General Ledger Reconciliation Entry Entity"> - <field name="glReconciliationId" type="id-ne"></field> - <field name="acctgTransId" type="id-ne"></field> - <field name="acctgTransEntrySeqId" type="id-ne"></field> + <field name="glReconciliationId" type="id"></field> + <field name="acctgTransId" type="id"></field> + <field name="acctgTransEntrySeqId" type="id"></field> <field name="reconciledAmount" type="currency-amount"></field> <prim-key field="glReconciliationId"/> <prim-key field="acctgTransId"/> @@ -2407,21 +2407,21 @@ under the License. package-name="org.apache.ofbiz.accounting.ledger" default-resource-name="AccountingEntityLabels" title="General Ledger Resource Entity"> - <field name="glResourceTypeId" type="id-ne"></field> + <field name="glResourceTypeId" type="id"></field> <field name="description" type="description"></field> <prim-key field="glResourceTypeId"/> </entity> <entity entity-name="GlXbrlClass" package-name="org.apache.ofbiz.accounting.ledger" title="General Ledger XBRL Class Entity"> - <field name="glXbrlClassId" type="id-ne"></field> + <field name="glXbrlClassId" type="id"></field> <field name="description" type="description"></field> <prim-key field="glXbrlClassId"/> </entity> <entity entity-name="PartyAcctgPreference" package-name="org.apache.ofbiz.accounting.ledger" title="Party (organization) accounting preferences"> - <field name="partyId" type="id-ne"/> + <field name="partyId" type="id"/> <field name="fiscalYearStartMonth" type="numeric"/> <field name="fiscalYearStartDay" type="numeric"/> <field name="taxFormId" type="id-ne"/> @@ -2492,10 +2492,10 @@ under the License. package-name="org.apache.ofbiz.accounting.ledger" title="Running tally of average cost"> <description>Running tally of a product's average cost in a particular company and facility</description> - <field name="productAverageCostTypeId" type="id-ne"/> - <field name="organizationPartyId" type="id-ne"/> - <field name="productId" type="id-ne"/> - <field name="facilityId" type="id-ne"/> + <field name="productAverageCostTypeId" type="id"/> + <field name="organizationPartyId" type="id"/> + <field name="productId" type="id"/> + <field name="facilityId" type="id"/> <field name="fromDate" type="date-time"/> <field name="thruDate" type="date-time"/> <field name="averageCost" type="fixed-point"/> @@ -2520,8 +2520,8 @@ under the License. <entity entity-name="ProductAverageCostType" package-name="org.apache.ofbiz.accounting.ledger" title="Product average cost type" default-resource-name="AccountingEntityLabels"> - <field name="productAverageCostTypeId" type="id-ne"/> - <field name="parentTypeId" type="id-ne"/> + <field name="productAverageCostTypeId" type="id"/> + <field name="parentTypeId" type="id"/> <field name="hasTable" type="indicator"/> <field name="description" type="description"/> <prim-key field="productAverageCostTypeId"/> @@ -2532,7 +2532,7 @@ under the License. <entity entity-name="SettlementTerm" package-name="org.apache.ofbiz.accounting.ledger" title="Settlement Term Entity"> - <field name="settlementTermId" type="id-ne"></field> + <field name="settlementTermId" type="id"></field> <field name="termName" type="name"></field> <field name="termValue" type="numeric"></field> <field name="uomId" type="id"></field> @@ -2541,8 +2541,8 @@ under the License. <entity entity-name="VarianceReasonGlAccount" package-name="org.apache.ofbiz.accounting.ledger" title="Defines GL Accounts for Inventory Variance Reasons"> - <field name="varianceReasonId" type="id-ne"></field> - <field name="organizationPartyId" type="id-ne"></field> + <field name="varianceReasonId" type="id"></field> + <field name="organizationPartyId" type="id"></field> <field name="glAccountId" type="id-ne"></field> <prim-key field="varianceReasonId"/> <prim-key field="organizationPartyId"/> @@ -2565,7 +2565,7 @@ under the License. package-name="org.apache.ofbiz.accounting.payment" title="Billing Account Entity"> <description>A BillingAccount Payment Method</description> - <field name="billingAccountId" type="id-ne"></field> + <field name="billingAccountId" type="id"></field> <field name="accountLimit" type="currency-amount"></field> <field name="accountCurrencyUomId" type="id"></field> <field name="contactMechId" type="id"><!-- This is a PostalAddress --></field> @@ -2633,9 +2633,9 @@ under the License. <entity entity-name="BillingAccountRole" package-name="org.apache.ofbiz.accounting.payment" title="Billing Account Role Entity"> - <field name="billingAccountId" type="id-ne"></field> - <field name="partyId" type="id-ne"></field> - <field name="roleTypeId" type="id-ne"></field> + <field name="billingAccountId" 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="billingAccountId"/> @@ -2677,7 +2677,7 @@ under the License. <entity entity-name="BillingAccountTerm" package-name="org.apache.ofbiz.accounting.payment" title="Billing Account Term Entity"> - <field name="billingAccountTermId" type="id-ne"></field> + <field name="billingAccountTermId" type="id"></field> <field name="billingAccountId" type="id-ne"></field> <field name="termTypeId" type="id"></field> <field name="termValue" type="currency-amount"></field> @@ -2697,8 +2697,8 @@ under the License. <entity entity-name="BillingAccountTermAttr" package-name="org.apache.ofbiz.accounting.payment" title="Billing Account Term Attribute Entity"> - <field name="billingAccountTermId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="billingAccountTermId" type="id"></field> + <field name="attrName" type="id-long"></field> <field name="attrValue" type="value"></field> <prim-key field="billingAccountTermId"/> <prim-key field="attrName"/> @@ -2712,7 +2712,7 @@ under the License. <entity entity-name="CreditCard" package-name="org.apache.ofbiz.accounting.payment" title="Credit Card Information Entity"> - <field name="paymentMethodId" type="id-ne"></field> + <field name="paymentMethodId" type="id"></field> <field name="cardType" type="short-varchar"></field> <field name="cardNumber" type="credit-card-number" encrypt="true"></field> <field name="validFromDate" type="credit-card-date"><description>Not common in some parts of the world.</description></field> @@ -2744,7 +2744,7 @@ under the License. package-name="org.apache.ofbiz.accounting.payment" title="Credit Card Type GL Account Entity"> <field name="cardType" type="short-varchar"></field> - <field name="organizationPartyId" type="id-ne"></field> + <field name="organizationPartyId" type="id"></field> <field name="glAccountId" type="id-ne"></field> <prim-key field="cardType"/> <prim-key field="organizationPartyId"/> @@ -2752,7 +2752,7 @@ under the License. <entity entity-name="Deduction" package-name="org.apache.ofbiz.accounting.payment" title="Deduction Entity"> - <field name="deductionId" type="id-ne"></field> + <field name="deductionId" type="id"></field> <field name="deductionTypeId" type="id"></field> <field name="paymentId" type="id"></field> <field name="amount" type="currency-amount"></field> @@ -2767,8 +2767,8 @@ under the License. <entity entity-name="DeductionType" package-name="org.apache.ofbiz.accounting.payment" title="Deduction Type Entity"> - <field name="deductionTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="deductionTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="deductionTypeId"/> @@ -2779,7 +2779,7 @@ under the License. <entity entity-name="EftAccount" package-name="org.apache.ofbiz.accounting.payment" title="EFT Account Information Entity"> - <field name="paymentMethodId" type="id-ne"></field> + <field name="paymentMethodId" type="id"></field> <field name="bankName" type="name"></field> <field name="routingNumber" type="short-varchar"><description>See https://en.wikipedia.org/wiki/Bank_code </description></field> <field name="accountType" type="short-varchar"></field> @@ -2803,7 +2803,7 @@ under the License. <entity entity-name="CheckAccount" package-name="org.apache.ofbiz.accounting.payment" title="Check Information Entity"> - <field name="paymentMethodId" type="id-ne"></field> + <field name="paymentMethodId" type="id"></field> <field name="bankName" type="name"></field> <field name="routingNumber" type="short-varchar"><description>See https://en.wikipedia.org/wiki/Bank_code </description></field> <field name="accountType" type="short-varchar"></field> @@ -2827,7 +2827,7 @@ under the License. <entity entity-name="GiftCard" package-name="org.apache.ofbiz.accounting.payment" title="Gift Card Information Entity"> - <field name="paymentMethodId" type="id-ne"></field> + <field name="paymentMethodId" type="id"></field> <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> @@ -2846,7 +2846,7 @@ under the License. <entity entity-name="GiftCardFulfillment" package-name="org.apache.ofbiz.accounting.payment" title="Gift Card Fulfillment History"> - <field name="fulfillmentId" type="id-ne"></field> + <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> @@ -2882,7 +2882,7 @@ under the License. <entity entity-name="Payment" package-name="org.apache.ofbiz.accounting.payment" title="Payment Entity"> - <field name="paymentId" type="id-ne"></field> + <field name="paymentId" type="id"></field> <field name="paymentTypeId" type="id-ne"></field> <field name="paymentMethodTypeId" type="id-ne"></field> <field name="paymentMethodId" type="id"></field> @@ -3070,7 +3070,7 @@ under the License. <entity entity-name="PaymentApplication" package-name="org.apache.ofbiz.accounting.payment" title="Payment Application Entity"> - <field name="paymentApplicationId" type="id-ne"></field> + <field name="paymentApplicationId" type="id"></field> <field name="paymentId" type="id"></field> <field name="invoiceId" type="id"></field> <field name="invoiceItemSeqId" type="id"></field> @@ -3106,8 +3106,8 @@ under the License. <entity entity-name="PaymentAttribute" package-name="org.apache.ofbiz.accounting.payment" title="Payment Attribute Entity"> - <field name="paymentId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="paymentId" 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="paymentId"/> @@ -3122,9 +3122,9 @@ under the License. <entity entity-name="PaymentBudgetAllocation" package-name="org.apache.ofbiz.accounting.payment" title="Payment Budget Allocation Entity"> - <field name="budgetId" type="id-ne"></field> - <field name="budgetItemSeqId" type="id-ne"></field> - <field name="paymentId" type="id-ne"></field> + <field name="budgetId" type="id"></field> + <field name="budgetItemSeqId" type="id"></field> + <field name="paymentId" type="id"></field> <field name="amount" type="currency-amount"></field> <prim-key field="budgetId"/> <prim-key field="budgetItemSeqId"/> @@ -3143,9 +3143,9 @@ under the License. <entity entity-name="PaymentContent" package-name="org.apache.ofbiz.accounting.payment" title="Payment Content Entity"> - <field name="paymentId" type="id-ne"></field> - <field name="paymentContentTypeId" type="id-ne"></field> - <field name="contentId" type="id-ne"></field> + <field name="paymentId" type="id"></field> + <field name="paymentContentTypeId" 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="contentId"/> @@ -3165,7 +3165,7 @@ under the License. <entity entity-name="PaymentContentType" package-name="org.apache.ofbiz.accounting.payment" title="Payment Content Type Entity"> - <field name="paymentContentTypeId" type="id-ne"></field> + <field name="paymentContentTypeId" type="id"></field> <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> @@ -3209,7 +3209,7 @@ under the License. <entity entity-name="PaymentMethod" package-name="org.apache.ofbiz.accounting.payment" title="Payment Method Entity"> - <field name="paymentMethodId" type="id-ne"></field> + <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> @@ -3341,7 +3341,7 @@ under the License. <entity entity-name="PaymentMethodType" package-name="org.apache.ofbiz.accounting.payment" title="PaymentMethodType Entity" default-resource-name="AccountingEntityLabels"> - <field name="paymentMethodTypeId" type="id-ne"></field> + <field name="paymentMethodTypeId" type="id"></field> <field name="description" type="description"></field> <field name="defaultGlAccountId" type="id"></field> <prim-key field="paymentMethodTypeId"/> @@ -3352,8 +3352,8 @@ under the License. <entity entity-name="PaymentMethodTypeGlAccount" package-name="org.apache.ofbiz.accounting.payment" title="Payment Method Type GL Account Entity"> - <field name="paymentMethodTypeId" type="id-ne"></field> - <field name="organizationPartyId" type="id-ne"></field> + <field name="paymentMethodTypeId" type="id"></field> + <field name="organizationPartyId" type="id"></field> <field name="glAccountId" type="id"></field> <prim-key field="paymentMethodTypeId"/> <prim-key field="organizationPartyId"/> @@ -3370,8 +3370,8 @@ under the License. <entity entity-name="PaymentType" package-name="org.apache.ofbiz.accounting.payment" title="Payment Type Entity" default-resource-name="AccountingEntityLabels"> - <field name="paymentTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="paymentTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="paymentTypeId"/> @@ -3382,8 +3382,8 @@ under the License. <entity entity-name="PaymentTypeAttr" package-name="org.apache.ofbiz.accounting.payment" title="Payment Type Attribute Entity"> - <field name="paymentTypeId" type="id-ne"></field> - <field name="attrName" type="id-long-ne"></field> + <field name="paymentTypeId" type="id"></field> + <field name="attrName" type="id-long"></field> <field name="description" type="description"></field> <prim-key field="paymentTypeId"/> <prim-key field="attrName"/> @@ -3400,8 +3400,8 @@ under the License. <entity entity-name="PaymentGlAccountTypeMap" package-name="org.apache.ofbiz.accounting.payment" title="Maps PaymentTypes to GlAccountTypes, allowing user to configure payments and gl accounts"> - <field name="paymentTypeId" type="id-ne"></field> - <field name="organizationPartyId" type="id-ne"/> + <field name="paymentTypeId" type="id"></field> + <field name="organizationPartyId" type="id"/> <field name="glAccountTypeId" type="id-ne"/> <prim-key field="paymentTypeId"/> <prim-key field="organizationPartyId"/> @@ -3418,7 +3418,7 @@ under the License. <entity entity-name="PaymentGatewayConfigType" package-name="org.apache.ofbiz.accounting.payment" title="Payment Gateway Config Type"> - <field name="paymentGatewayConfigTypeId" type="id-ne"></field> + <field name="paymentGatewayConfigTypeId" type="id"></field> <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> @@ -3433,7 +3433,7 @@ under the License. <entity entity-name="PaymentGatewayConfig" package-name="org.apache.ofbiz.accounting.payment" title="Payment Gateway Config"> - <field name="paymentGatewayConfigId" type="id-ne"></field> + <field name="paymentGatewayConfigId" type="id"></field> <field name="paymentGatewayConfigTypeId" type="id-ne"></field> <field name="description" type="description"></field> <prim-key field="paymentGatewayConfigId"/> @@ -3444,7 +3444,7 @@ under the License. <entity entity-name="PaymentGatewaySagePay" package-name="org.apache.ofbiz.accounting.payment" title="SagePay Payment Gateway Configuration"> - <field name="paymentGatewayConfigId" type="id-ne"></field> + <field name="paymentGatewayConfigId" type="id"></field> <field name="vendor" type="short-varchar"><description>Vendor name</description></field> <field name="productionHost" type="short-varchar"><description>Production Host</description></field> <field name="testingHost" type="short-varchar"><description>Testing Host</description></field> @@ -3466,7 +3466,7 @@ under the License. <entity entity-name="PaymentGatewayAuthorizeNet" package-name="org.apache.ofbiz.accounting.payment" title="Authorize Dot Net Payment Gateway Configuration"> - <field name="paymentGatewayConfigId" type="id-ne"></field> + <field name="paymentGatewayConfigId" type="id"></field> <field name="transactionUrl" type="value"><description>Transaction URL</description></field> <field name="certificateAlias" type="value"><description>Certificate Alias</description></field> <field name="apiVersion" type="short-varchar"><description>Target Authorize Dot Net API version</description></field> @@ -3493,7 +3493,7 @@ under the License. <entity entity-name="PaymentGatewayEway" package-name="org.apache.ofbiz.accounting.payment" title="eWay Payment Gateway Configuration"> - <field name="paymentGatewayConfigId" type="id-ne"></field> + <field name="paymentGatewayConfigId" type="id"></field> <field name="customerId" type="value"/> <field name="refundPwd" type="value" encrypt="true"/> <field name="testMode" type="short-varchar"/> @@ -3507,7 +3507,7 @@ under the License. <entity entity-name="PaymentGatewayCyberSource" package-name="org.apache.ofbiz.accounting.payment" title="CyberSource Payment Gateway Configuration"> - <field name="paymentGatewayConfigId" type="id-ne"></field> + <field name="paymentGatewayConfigId" type="id"></field> <field name="merchantId" type="value"><description>You merchant ID</description></field> <field name="apiVersion" type="short-varchar"><description>Target CyberSource API version</description></field> <field name="production" type="short-varchar"><description>Enable production "mode" (true|false)</description></field> @@ -3533,7 +3533,7 @@ under the License. <entity entity-name="PaymentGatewayPayflowPro" package-name="org.apache.ofbiz.accounting.payment" title="Payflow Pro Payment Gateway Config"> - <field name="paymentGatewayConfigId" type="id-ne"></field> + <field name="paymentGatewayConfigId" type="id"></field> <field name="certsPath" type="value"><description>Path the the VeriSign Certificate</description></field> <field name="hostAddress" type="value"><description>Address of the payment processor</description></field> <field name="hostPort" type="numeric"><description>Port of the payment processor</description></field> @@ -3565,7 +3565,7 @@ under the License. <entity entity-name="PaymentGatewayPayPal" package-name="org.apache.ofbiz.accounting.payment" title="PayPal Payment Gateway Config"> - <field name="paymentGatewayConfigId" type="id-ne"></field> + <field name="paymentGatewayConfigId" type="id"></field> <field name="businessEmail" type="value"><description>Business e-mail</description></field> <field name="apiUserName" type="short-varchar"><description>PayPal API UserName</description></field> <field name="apiPassword" type="short-varchar"><description>PayPal API Password</description></field> @@ -3588,7 +3588,7 @@ under the License. <entity entity-name="PaymentGatewayClearCommerce" package-name="org.apache.ofbiz.accounting.payment" title="Clear Commerce Payment Gateway Config"> - <field name="paymentGatewayConfigId" type="id-ne"></field> + <field name="paymentGatewayConfigId" type="id"></field> <field name="sourceId" type="short-varchar"><description>Useful for tagging transactions</description></field> <field name="groupId" type="short-varchar"><description>Useful for grouping transactions</description></field> <field name="clientId" type="short-varchar"><description>Client Id of account information</description></field> @@ -3607,7 +3607,7 @@ under the License. <entity entity-name="PaymentGatewayWorldPay" package-name="org.apache.ofbiz.accounting.payment" title="RBS WorldPay Payment Gateway Config"> - <field name="paymentGatewayConfigId" type="id-ne"></field> + <field name="paymentGatewayConfigId" type="id"></field> <field name="redirectUrl" type="value"><description>Redirect URL</description></field> <field name="instId" type="value" encrypt="true"><description>Worldpay instance Id</description></field> <field name="authMode" type="indicator"><description>Authorization Mode (A: Full-Auth / E: Pre-Auth)</description></field> @@ -3626,7 +3626,7 @@ under the License. <entity entity-name="PaymentGatewayOrbital" package-name="org.apache.ofbiz.accounting.payment" title="Orbital Payment Gateway Config"> - <field name="paymentGatewayConfigId" type="id-ne"></field> + <field name="paymentGatewayConfigId" type="id"></field> <field name="username" type="short-varchar"><description>Orbital Username of account information</description></field> <field name="connectionPassword" type="value" encrypt="true"><description>Orbital Password of account information</description></field> <field name="merchantId" type="value"><description>You merchant ID</description></field> @@ -3649,7 +3649,7 @@ under the License. <entity entity-name="PaymentGatewaySecurePay" package-name="org.apache.ofbiz.accounting.payment" title="SecurePay Payment Gateway Config"> - <field name="paymentGatewayConfigId" type="id-ne"></field> + <field name="paymentGatewayConfigId" type="id"></field> <field name="merchantId" type="value"><description>You merchant ID</description></field> <field name="pwd" type="value" encrypt="true"><description>SecurePay Password of account information</description></field> <field name="serverURL" type="value"><description>Server URL of the payment processor</description></field> @@ -3663,7 +3663,7 @@ under the License. <entity entity-name="PaymentGatewayiDEAL" package-name="org.apache.ofbiz.accounting.payment" title="iDEAL Payment Gateway Config"> - <field name="paymentGatewayConfigId" type="id-ne"></field> + <field name="paymentGatewayConfigId" type="id"></field> <field name="merchantId" type="value"><description>The ID of the webshop, received by the acceptor during the registration process</description></field> <field name="merchantSubId" type="value"><description>SubID of the webshop, default value = 0 (zero); only to be changed in consultation with the acquirer</description></field> <field name="merchantReturnURL" type="value"><description>URL of the page in the webshop to which the consumer is redirected after an iDEAL transaction. This value can be overruled as necessary in the webshop implementation</description></field> @@ -3684,7 +3684,7 @@ under the License. <entity entity-name="PaymentGatewayRespMsg" package-name="org.apache.ofbiz.accounting.payment" title="Payment Gateway Response Message"> - <field name="paymentGatewayRespMsgId" type="id-ne"></field> + <field name="paymentGatewayRespMsgId" type="id"></field> <field name="paymentGatewayResponseId" type="id-ne"></field> <field name="pgrMessage" type="very-long"></field> <prim-key field="paymentGatewayRespMsgId"/> @@ -3695,7 +3695,7 @@ under the License. <entity entity-name="PaymentGatewayResponse" package-name="org.apache.ofbiz.accounting.payment" title="Payment Gateway Response"> - <field name="paymentGatewayResponseId" type="id-ne"></field> + <field name="paymentGatewayResponseId" type="id"></field> <field name="paymentServiceTypeEnumId" type="id-ne"></field> <field name="orderPaymentPreferenceId" type="id"></field> <field name="paymentMethodTypeId" type="id"></field> @@ -3742,7 +3742,7 @@ under the License. package-name="org.apache.ofbiz.accounting.payment" title="Payment Group Entity"> <description>Payment Group</description> - <field name="paymentGroupId" type="id-ne"></field> + <field name="paymentGroupId" type="id"></field> <field name="paymentGroupTypeId" type="id-ne"></field> <field name="paymentGroupName" type="name"></field> <prim-key field="paymentGroupId"/> @@ -3754,8 +3754,8 @@ under the License. package-name="org.apache.ofbiz.accounting.payment" title="Payment Group Type Entity"> <description>Payment Group Type</description> - <field name="paymentGroupTypeId" type="id-ne"></field> - <field name="parentTypeId" type="id-ne"></field> + <field name="paymentGroupTypeId" type="id"></field> + <field name="parentTypeId" type="id"></field> <field name="hasTable" type="indicator"></field> <field name="description" type="description"></field> <prim-key field="paymentGroupTypeId"/> @@ -3767,8 +3767,8 @@ under the License. package-name="org.apache.ofbiz.accounting.payment" title="Payment Group Member Entity"> <description>Payment Group Member</description> - <field name="paymentGroupId" type="id-ne"></field> - <field name="paymentId" type="id-ne"></field> + <field name="paymentGroupId" type="id"></field> + <field name="paymentId" type="id"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> <field name="sequenceNum" type="numeric"></field> @@ -3786,7 +3786,7 @@ under the License. <entity entity-name="PayPalPaymentMethod" package-name="org.apache.ofbiz.accounting.payment"> <description>PayPal Payment Method Details</description> - <field name="paymentMethodId" type="id-ne"></field> + <field name="paymentMethodId" type="id"></field> <field name="payerId" type="id"></field> <field name="expressCheckoutToken" type="short-varchar"></field> <field name="payerStatus" type="short-varchar"></field> @@ -3810,7 +3810,7 @@ under the License. <entity entity-name="ValueLinkKey" package-name="org.apache.ofbiz.accounting.payment" title="Value Link Key Store"> - <field name="merchantId" type="id-vlong-ne"></field> + <field name="merchantId" type="id-vlong"></field> <field name="publicKey" type="very-long"></field> <field name="privateKey" type="very-long"></field> <field name="exchangeKey" type="very-long"></field> @@ -3831,9 +3831,9 @@ under the License. <entity entity-name="PartyTaxAuthInfo" package-name="org.apache.ofbiz.accounting.tax" title="Party Tax Information Entity"> <description></description> - <field name="partyId" type="id-ne"></field> - <field name="taxAuthGeoId" type="id-ne"></field> - <field name="taxAuthPartyId" type="id-ne"></field> + <field name="partyId" type="id"></field> + <field name="taxAuthGeoId" type="id"></field> + <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> @@ -3866,8 +3866,8 @@ under the License. </view-link> </view-entity> <entity entity-name="TaxAuthority" package-name="org.apache.ofbiz.accounting.tax" title="Tax Authority Entity"> - <field name="taxAuthGeoId" type="id-ne"></field> - <field name="taxAuthPartyId" type="id-ne"></field> + <field name="taxAuthGeoId" type="id"></field> + <field name="taxAuthPartyId" type="id"></field> <field name="requireTaxIdForExemption" type="indicator"></field> <field name="taxIdFormatPattern" type="long-varchar"></field> <field name="includeTaxInPrice" type="indicator"><!-- this is mainly for VAT tax authorities --></field> @@ -3895,10 +3895,10 @@ under the License. </view-link> </view-entity> <entity entity-name="TaxAuthorityAssoc" package-name="org.apache.ofbiz.accounting.tax" title="Tax Authority Association Entity"> - <field name="taxAuthGeoId" type="id-ne"></field> - <field name="taxAuthPartyId" type="id-ne"></field> - <field name="toTaxAuthGeoId" type="id-ne"></field> - <field name="toTaxAuthPartyId" type="id-ne"></field> + <field name="taxAuthGeoId" type="id"></field> + <field name="taxAuthPartyId" type="id"></field> + <field name="toTaxAuthGeoId" type="id"></field> + <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> @@ -3923,14 +3923,14 @@ under the License. package-name="org.apache.ofbiz.accounting.tax" default-resource-name="AccountingEntityLabels" title="Tax Authority Assoc Type Entity"> - <field name="taxAuthorityAssocTypeId" type="id-ne"></field> + <field name="taxAuthorityAssocTypeId" type="id"></field> <field name="description" type="description"></field> <prim-key field="taxAuthorityAssocTypeId"/> </entity> <entity entity-name="TaxAuthorityCategory" package-name="org.apache.ofbiz.accounting.tax" title="Tax Authority Product Category Entity"> - <field name="taxAuthGeoId" type="id-ne"></field> - <field name="taxAuthPartyId" type="id-ne"></field> - <field name="productCategoryId" type="id-ne"></field> + <field name="taxAuthGeoId" type="id"></field> + <field name="taxAuthPartyId" type="id"></field> + <field name="productCategoryId" type="id"></field> <prim-key field="taxAuthGeoId"/> <prim-key field="taxAuthPartyId"/> <prim-key field="productCategoryId"/> @@ -3952,9 +3952,9 @@ under the License. </view-link> </view-entity> <entity entity-name="TaxAuthorityGlAccount" package-name="org.apache.ofbiz.accounting.tax" title="Tax Authority GL Account Entity"> - <field name="taxAuthGeoId" type="id-ne"></field> - <field name="taxAuthPartyId" type="id-ne"></field> - <field name="organizationPartyId" type="id-ne"></field> + <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> <prim-key field="taxAuthGeoId"/> <prim-key field="taxAuthPartyId"/> @@ -3988,7 +3988,7 @@ under the License. </view-link> </view-entity> <entity entity-name="TaxAuthorityRateProduct" package-name="org.apache.ofbiz.accounting.tax" title="Tax Authority Rate Entity"> [... 90 lines stripped ...] |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |