You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by nm...@apache.org on 2019/01/02 17:58:36 UTC
svn commit: r1850182 - in
/ofbiz/ofbiz-framework/trunk/applications/datamodel:
data/seed/AccountingSeedData.xml entitydef/accounting-entitymodel.xml
entitydef/order-entitymodel.xml entitydef/product-entitymodel.xml
Author: nmalin
Date: Wed Jan 2 17:58:36 2019
New Revision: 1850182
URL: http://svn.apache.org/viewvc?rev=1850182&view=rev
Log:
Fixed: Update and clean deprecated code after release 18.12 creation
(OFBIZ-10761)
Remove deprecated entity fields deprecated for more 10 years and without impact with source code
Add since deprecate release on comment for PartyAcctgPreference definition and demo data to help the next analyse
Modified:
ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/AccountingSeedData.xml
ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml
ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/order-entitymodel.xml
ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml
Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/AccountingSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/AccountingSeedData.xml?rev=1850182&r1=1850181&r2=1850182&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/AccountingSeedData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/AccountingSeedData.xml Wed Jan 2 17:58:36 2019
@@ -977,7 +977,7 @@ under the License.
<!-- order sequencing mode for accounting preferences -->
<CustomMethodType customMethodTypeId="ORDER_HOOK" parentTypeId="HOOK" hasTable="N" description="Order Sequence methods"/>
<CustomMethod customMethodId="ORDER_HOOK_ENF_SEQ" customMethodTypeId="ORDER_HOOK" customMethodName="orderSequence_enforced" description="Enforced Sequence (no gaps, per organization)"/>
- <!-- Deprecated sequencing mode by enumeration -->
+ <!-- Deprecated sequencing mode by enumeration since Release 17.12-->
<EnumerationType description="Invoice Sequence Mode" enumTypeId="INVOICE_SEQMD" hasTable="N"/>
<Enumeration description="Standard (faster, may have gaps, per system)" enumCode="STANDARD" enumId="INVSQ_STANDARD" sequenceId="01" enumTypeId="INVOICE_SEQMD"/>
<Enumeration description="Enforced Sequence (no gaps, per organization)" enumCode="ENF_SEQ" enumId="INVSQ_ENF_SEQ" sequenceId="02" enumTypeId="INVOICE_SEQMD"/>
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=1850182&r1=1850181&r2=1850182&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml Wed Jan 2 17:58:36 2019
@@ -2465,7 +2465,7 @@ under the License.
</description>
</field>
<field name="enableAccounting" type="indicator"/>
- <!-- Deprecated Field-->
+ <!-- Deprecated Field since Release 17.12-->
<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"/>
@@ -2497,7 +2497,7 @@ under the License.
<relation type="one" fk-name="ACTGPREF_GLJRNL" rel-entity-name="GlJournal">
<key-map field-name="errorGlJournalId" rel-field-name="glJournalId"/>
</relation>
- <!-- Deprecated relation-->
+ <!-- Deprecated relation since Release 17.12-->
<relation type="one" fk-name="ACTGPREF_INVSQ" title="InvoiceSequence" rel-entity-name="Enumeration">
<key-map field-name="oldInvoiceSequenceEnumId" rel-field-name="enumId"/>
</relation>
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=1850182&r1=1850181&r2=1850182&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/order-entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/order-entitymodel.xml Wed Jan 2 17:58:36 2019
@@ -99,9 +99,6 @@ under the License.
<field name="originalAdjustmentId" type="id">
<description>specifies relation to source OrderAdjustment - eg. for tax on shipping charges</description>
</field>
- <!-- old fields, deprecated -->
- <field name="oldAmountPerQuantity" col-name="AMOUNT_PER_QUANTITY" type="currency-amount"></field>
- <field name="oldPercentage" col-name="PERCENTAGE" type="floating-point"></field>
<prim-key field="orderAdjustmentId"/>
<relation type="one" fk-name="ORDER_ADJ_TYPE" rel-entity-name="OrderAdjustmentType">
<key-map field-name="orderAdjustmentTypeId"/>
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=1850182&r1=1850181&r2=1850182&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml Wed Jan 2 17:58:36 2019
@@ -3900,13 +3900,6 @@ under the License.
<field name="showOutOfStockProducts" type="indicator"><description>Default Y. If N then out of stock products will not be displayed on site</description></field>
<field name="orderDecimalQuantity" type="indicator"><description>use to indicate if decimal quantity can be ordered for this producStore. Default value is Y</description></field>
<field name="allowComment" type="indicator"><description>Allow comments for order line items per store</description></field>
-
- <!-- old fields, deprecated -->
- <field name="oldStyleSheet" col-name="STYLE_SHEET" type="url"></field>
- <field name="oldHeaderLogo" col-name="HEADER_LOGO" type="url"></field>
- <field name="oldHeaderMiddleBackground" col-name="HEADER_MIDDLE_BACKGROUND" type="url"></field>
- <field name="oldHeaderRightBackground" col-name="HEADER_RIGHT_BACKGROUND" type="url"></field>
-
<prim-key field="productStoreId"/>
<relation type="one" fk-name="PROD_STR_PRSTRGP" title="Primary" rel-entity-name="ProductStoreGroup">
<key-map field-name="primaryStoreGroupId" rel-field-name="productStoreGroupId"/>