Removed old unused fields: oldPickStartDate oldMaritalStatus oldSquar…

…eFootage oldInvoiceSequenceEnumId oldOrderSequenceEnumId oldQuoteSequenceEnumId from the entity.
apache · Nov 29, 2023 · 1533626 · 1533626
1 parent bfda8a6
commit 1533626
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 84 deletions.
diff --git a/applications/accounting/servicedef/services_admin.xml b/applications/accounting/servicedef/services_admin.xml
@@ -43,17 +43,14 @@ under the License.
             <exclude field-name="taxFormId"/>
             <exclude field-name="cogsMethodId"/>
             <exclude field-name="baseCurrencyUomId"/>
-            <exclude field-name="oldInvoiceSequenceEnumId"/>
             <exclude field-name="invoiceSeqCustMethId"/>
             <exclude field-name="invoiceIdPrefix"/>
             <exclude field-name="lastInvoiceNumber"/>
             <exclude field-name="lastInvoiceRestartDate"/>
             <exclude field-name="useInvoiceIdForReturns"/>
-            <exclude field-name="oldQuoteSequenceEnumId"/>
             <exclude field-name="quoteSeqCustMethId"/>
             <exclude field-name="quoteIdPrefix"/>
             <exclude field-name="lastQuoteNumber"/>
-            <exclude field-name="oldOrderSequenceEnumId"/>
             <exclude field-name="orderSeqCustMethId"/>
             <exclude field-name="orderIdPrefix"/>
             <exclude field-name="lastOrderNumber"/>

diff --git a/applications/accounting/widget/GlSetupForms.xml b/applications/accounting/widget/GlSetupForms.xml
@@ -229,16 +229,6 @@ under the License.
             (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
             <text maxlength="10" size="5"/>
         </field>
-        <field name="oldInvoiceSequenceEnumId" use-when="partyAcctgPreference==null"
-            tooltip="${groovy: import org.apache.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('oldInvoiceSequenceEnumId')!=null)return
-            (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
-            <drop-down>
-                <entity-options entity-name="Enumeration" key-field-name="enumId">
-                    <entity-constraint name="enumTypeId" operator="equals" value="INVOICE_SEQMD"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>
         <field name="useInvoiceIdForReturns" use-when="partyAcctgPreference==null"
             tooltip="${groovy: import org.apache.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('useInvoiceIdForReturns')!=null)return
             (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
@@ -251,30 +241,10 @@ under the License.
             (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
             <text maxlength="10" size="5"/>
         </field>
-        <field name="oldQuoteSequenceEnumId" use-when="partyAcctgPreference==null"
-            tooltip="${groovy: import org.apache.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('oldQuoteSequenceEnumId')!=null)return
-            (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
-            <drop-down>
-                <entity-options entity-name="Enumeration" key-field-name="enumId">
-                    <entity-constraint name="enumTypeId" operator="equals" value="QUOTE_SEQMD"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>
         <field name="orderIdPrefix" use-when="partyAcctgPreference==null"
             tooltip="${groovy: import org.apache.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('orderIdPrefix')!=null)return (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
             <text maxlength="10" size="5"/>
         </field>
-        <field name="oldOrderSequenceEnumId" use-when="partyAcctgPreference==null"
-            tooltip="${groovy: import org.apache.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('oldOrderSequenceEnumId')!=null)return
-            (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
-            <drop-down>
-                <entity-options entity-name="Enumeration" key-field-name="enumId">
-                    <entity-constraint name="enumTypeId" operator="equals" value="ORDER_SEQMD"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>
         <field name="createButton" use-when="partyAcctgPreference==null" title="${uiLabelMap.CommonAdd}"><submit/></field>
         <field name="updateButton" use-when="partyAcctgPreference!=null" title="${uiLabelMap.CommonUpdate}"><submit/></field>
 
@@ -309,21 +279,11 @@ under the License.
                 (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
             <display/>
         </field>
-        <field name="oldInvoiceSequenceEnumId" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.apache.ofbiz.base.util.UtilProperties;
-                if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('oldInvoiceSequenceEnumId')==null&amp;&amp;aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('oldInvoiceSequenceEnumId')!=null)return
-                (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
-            <display-entity entity-name="Enumeration" key-field-name="enumId"/>
-        </field>
         <field name="useInvoiceIdForReturns" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.apache.ofbiz.base.util.UtilProperties;
                 if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('useInvoiceIdForReturns')==null&amp;&amp;aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('useInvoiceIdForReturns')!=null)return
                 (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
             <display/>
         </field>
-        <field name="oldQuoteSequenceEnumId" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.apache.ofbiz.base.util.UtilProperties;
-                if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('oldQuoteSequenceEnumId')==null&amp;&amp;aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('oldQuoteSequenceEnumId')!=null)return
-                (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
-            <display-entity entity-name="Enumeration" key-field-name="enumId"/>
-        </field>
         <field name="quoteIdPrefix" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.apache.ofbiz.base.util.UtilProperties;
                 if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('quoteIdPrefix')==null&amp;&amp;aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('quoteIdPrefix')!=null)return
                 (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
@@ -334,11 +294,6 @@ under the License.
                 (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
             <display/>
         </field>
-        <field name="oldOrderSequenceEnumId" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.apache.ofbiz.base.util.UtilProperties;
-                if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('oldOrderSequenceEnumId')==null&amp;&amp;aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('oldOrderSequenceEnumId')!=null)return
-                (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
-            <display-entity entity-name="Enumeration" key-field-name="enumId"/>
-        </field>
         <field name="orderIdPrefix" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.apache.ofbiz.base.util.UtilProperties;
                 if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('orderIdPrefix')==null&amp;&amp;aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('orderIdPrefix')!=null)return
                 (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">

diff --git a/applications/commonext/minilang/setup/SetupEvents.xml b/applications/commonext/minilang/setup/SetupEvents.xml
@@ -300,11 +300,8 @@
             <set field="acctgPreferenceCtx.taxFormId" value="US_IRS_1120"/>
             <set field="acctgPreferenceCtx.cogsMethodId" value="COGS_AVG_COST"/>
             <set field="acctgPreferenceCtx.baseCurrencyUomId" value="USD"/>
-            <set field="acctgPreferenceCtx.oldInvoiceSequenceEnumId" value="INVSQ_ENF_SEQ"/>
             <set field="acctgPreferenceCtx.invoiceIdPrefix" from-field="parameters.invoiceIdPrefix"/>
-            <set field="acctgPreferenceCtx.oldQuoteSequenceEnumId" value="INVSQ_ENF_SEQ"/>
             <set field="acctgPreferenceCtx.quoteIdPrefix" value="QU"/>
-            <set field="acctgPreferenceCtx.oldOrderSequenceEnumId" value="INVSQ_ENF_SEQ"/>
             <set field="acctgPreferenceCtx.orderIdPrefix" value="OD"/>
             <call-service service-name="createPartyAcctgPreference" in-map-name="acctgPreferenceCtx"/>
         </if-empty>

diff --git a/applications/datamodel/DATAMODEL_CHANGES.adoc b/applications/datamodel/DATAMODEL_CHANGES.adoc
@@ -284,7 +284,7 @@ No changes
 |OrderItemShipGroup |estimatedShipDate |Added |No |NA
 |OrderItemShipGroup |estimatedDeliveryDate |Added |No |NA
 |OrderItemShipGrpInvRes |priority |Added |No |NA
-|OrderItemShipGrpInvRes |oldPickStartDate |Added |No |NA
+|OrderItemShipGrpInvRes |oldPickStartDate |Removed |No |NA
 |OrderItemTypeAttr |description |Added |No |NA
 |OrderTermAttribute |attrDescription |Added |No |NA
 |OrderPaymentPreference |track2 |Added |No |NA
@@ -296,9 +296,9 @@ No changes
 |PartyAcctgPreference |orderSequenceEnumId |Removed |No |NA
 |PartyAcctgPreference |quoteSequenceEnumId |Removed |No |NA
 |PartyAcctgPreference |invoiceSequenceEnumId |Removed |No |NA
-|PartyAcctgPreference |oldOrderSequenceEnumId |Added |No |NA
-|PartyAcctgPreference |oldQuoteSequenceEnumId |Added |No |NA
-|PartyAcctgPreference |oldInvoiceSequenceEnumId |Added |No |NA
+|PartyAcctgPreference |oldOrderSequenceEnumId |Removed |No |NA
+|PartyAcctgPreference |oldQuoteSequenceEnumId |Removed |No |NA
+|PartyAcctgPreference |oldInvoiceSequenceEnumId |Removed |No |NA
 |PartyAcctgPreference |orderSeqCustMethId |Added |No |NA
 |PartyQual |infoString |Removed |No |NA
 |PartyQual |institutionInternalId |Removed |No |NA

diff --git a/applications/datamodel/entitydef/accounting-entitymodel.xml b/applications/datamodel/entitydef/accounting-entitymodel.xml
@@ -2469,10 +2469,6 @@ under the License.
             </description>
         </field>
         <field name="enableAccounting" type="indicator"/>
-        <!-- 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"/>
         <prim-key field="partyId"/>
         <relation type="one" rel-entity-name="Party" fk-name="ACTG_PREF_PTY">
             <key-map field-name="partyId"/>
@@ -2501,16 +2497,6 @@ 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 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>
-        <relation type="one" fk-name="ACTGPREF_QTESQ" title="QuoteSequence" rel-entity-name="Enumeration">
-            <key-map field-name="oldQuoteSequenceEnumId" rel-field-name="enumId"/>
-        </relation>
-        <relation type="one" fk-name="ACTGPREF_ODRSQ" title="OrderSequence" rel-entity-name="Enumeration">
-            <key-map field-name="oldOrderSequenceEnumId" rel-field-name="enumId"/>
-        </relation>
     </entity>
     <entity entity-name="PartyPrefDocTypeTpl"
             package-name="org.apache.ofbiz.accounting.ledger"

diff --git a/applications/datamodel/entitydef/order-entitymodel.xml b/applications/datamodel/entitydef/order-entitymodel.xml
@@ -1009,7 +1009,6 @@ under the License.
       <field name="currentPromisedDate" type="date-time"></field>
       <field name="priority" type="indicator"><description>Sets priority for Inventory Reservation</description></field>
       <field name="sequenceId" type="numeric"></field>
-      <field name="oldPickStartDate" col-name="PICK_START_DATE" type="date-time"></field> <!-- this is no longer used and is here for migration or whatever if needed -->
       <prim-key field="orderId"/>
       <prim-key field="shipGroupSeqId"/>
       <prim-key field="orderItemSeqId"/>

diff --git a/applications/datamodel/entitydef/party-entitymodel.xml b/applications/datamodel/entitydef/party-entitymodel.xml
@@ -2818,7 +2818,6 @@ under the License.
       <field name="height" type="floating-point"></field>
       <field name="weight" type="floating-point"></field>
       <field name="mothersMaidenName" type="long-varchar" encrypt="true"></field>
-      <field name="oldMaritalStatus" type="indicator" col-name="MARITAL_STATUS"><description>Deprecated since branch release: Upcoming branch, use martialStatusEnumId</description></field>
       <field name="maritalStatusEnumId" type="id"/>
       <field name="socialSecurityNumber" type="long-varchar" encrypt="true"></field>
       <field name="passportNumber" type="long-varchar" encrypt="true"></field>

diff --git a/applications/datamodel/entitydef/product-entitymodel.xml b/applications/datamodel/entitydef/product-entitymodel.xml
@@ -1001,7 +1001,6 @@ under the License.
         <field name="defaultInventoryItemTypeId" type="id"></field>
         <field name="facilityName" type="name"></field>
         <field name="primaryFacilityGroupId" type="id"></field>
-        <field name="oldSquareFootage" type="numeric" col-name="SQUARE_FOOTAGE"></field>
         <field name="facilitySize" type="fixed-point"></field>
         <field name="facilitySizeUomId" type="id"></field>
         <field name="productStoreId" type="id"></field>

diff --git a/applications/product/config/ProductUiLabels.xml b/applications/product/config/ProductUiLabels.xml
@@ -6275,18 +6275,6 @@
         <value xml:lang="zh">指定的编号</value>
         <value xml:lang="zh-TW">指定編號</value>
     </property>
-    <property key="FormFieldTitle_oldPickStartDate">
-        <value xml:lang="de">Altes Kommissionierungs-Startdatum</value>
-        <value xml:lang="en">Old Pick Start Date</value>
-        <value xml:lang="es">Antigua fecha de recogida</value>
-        <value xml:lang="fr">Ancienne date de départ du prélèvement</value>
-        <value xml:lang="it">Vecchia Data Inizio Prelievo</value>
-        <value xml:lang="ja">前回ピッキング開始日</value>
-        <value xml:lang="th">วันที่เลือกเดิม</value>
-        <value xml:lang="vi">Ngày bắt đầu Xử lý đặt hàng (Pick) trước đây</value>
-        <value xml:lang="zh">旧的分拣开始日期</value>
-        <value xml:lang="zh-TW">舊的揀貨開始日期</value>
-    </property>
     <property key="FormFieldTitle_oneInventoryFacility">
         <value xml:lang="de">Eine Lagereinrichtung</value>
         <value xml:lang="en">One Inventory Facility</value>