A patch from Nicolas Malin "Use CustomMethod for select order, quote and invoice hook to resolve id." (https://issues.apache.org/jira/browse/OFBIZ-3765) - OFBIZ-3765
JLR: Quoting Anne on user ML: There are still some files that refer to the deprecated
* invoiceSequenceEnumId,
* quoteSequenceEnumId
* orderSequenceEnumId fields of PartyAcctgPreference.
Files I know of are:
applications/accounting/servicedef/services_admin.xml
applications/accounting/widget/GlSetupForms.xml
applications/commonext/script/org/ofbiz/setup/SetupEvents.xml
Nicolas: quick corrections to use old attributes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1065014 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -42,15 +42,18 @@ under the License.
|
||||
<exclude field-name="taxFormId"/>
|
||||
<exclude field-name="cogsMethodId"/>
|
||||
<exclude field-name="baseCurrencyUomId"/>
|
||||
<exclude field-name="invoiceSequenceEnumId"/>
|
||||
<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="quoteSequenceEnumId"/>
|
||||
<exclude field-name="oldQuoteSequenceEnumId"/>
|
||||
<exclude field-name="quoteSeqCustMethId"/>
|
||||
<exclude field-name="quoteIdPrefix"/>
|
||||
<exclude field-name="lastQuoteNumber"/>
|
||||
<exclude field-name="orderSequenceEnumId"/>
|
||||
<exclude field-name="oldOrderSequenceEnumId"/>
|
||||
<exclude field-name="orderSeqCustMethId"/>
|
||||
<exclude field-name="orderIdPrefix"/>
|
||||
<exclude field-name="lastOrderNumber"/>
|
||||
</auto-attributes>
|
||||
|
||||
@@ -149,8 +149,8 @@ under the License.
|
||||
(UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
|
||||
<text maxlength="10" size="5"/>
|
||||
</field>
|
||||
<field name="invoiceSequenceEnumId" use-when="partyAcctgPreference==null"
|
||||
tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('invoiceSequenceEnumId')!=null)return
|
||||
<field name="oldInvoiceSequenceEnumId" use-when="partyAcctgPreference==null"
|
||||
tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('oldInvoiceSequenceEnumId')!=null)return
|
||||
(UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
|
||||
<drop-down>
|
||||
<entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
|
||||
@@ -171,8 +171,8 @@ under the License.
|
||||
(UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
|
||||
<text maxlength="10" size="5"/>
|
||||
</field>
|
||||
<field name="quoteSequenceEnumId" use-when="partyAcctgPreference==null"
|
||||
tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('quoteSequenceEnumId')!=null)return
|
||||
<field name="oldQuoteSequenceEnumId" use-when="partyAcctgPreference==null"
|
||||
tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('oldQuoteSequenceEnumId')!=null)return
|
||||
(UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
|
||||
<drop-down>
|
||||
<entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
|
||||
@@ -185,8 +185,8 @@ under the License.
|
||||
tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('orderIdPrefix')!=null)return (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
|
||||
<text maxlength="10" size="5"/>
|
||||
</field>
|
||||
<field name="orderSequenceEnumId" use-when="partyAcctgPreference==null"
|
||||
tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('orderSequenceEnumId')!=null)return
|
||||
<field name="oldOrderSequenceEnumId" use-when="partyAcctgPreference==null"
|
||||
tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('oldOrderSequenceEnumId')!=null)return
|
||||
(UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
|
||||
<drop-down>
|
||||
<entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
|
||||
@@ -229,8 +229,8 @@ under the License.
|
||||
(UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
|
||||
<display/>
|
||||
</field>
|
||||
<field name="invoiceSequenceEnumId" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties;
|
||||
if(partyAcctgPreference!= null&&partyAcctgPreference.get('invoiceSequenceEnumId')==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('invoiceSequenceEnumId')!=null)return
|
||||
<field name="oldInvoiceSequenceEnumId" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties;
|
||||
if(partyAcctgPreference!= null&&partyAcctgPreference.get('oldInvoiceSequenceEnumId')==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('oldInvoiceSequenceEnumId')!=null)return
|
||||
(UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
|
||||
<display-entity entity-name="Enumeration" key-field-name="enumId"/>
|
||||
</field>
|
||||
@@ -239,8 +239,8 @@ under the License.
|
||||
(UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
|
||||
<display/>
|
||||
</field>
|
||||
<field name="quoteSequenceEnumId" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties;
|
||||
if(partyAcctgPreference!= null&&partyAcctgPreference.get('quoteSequenceEnumId')==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('quoteSequenceEnumId')!=null)return
|
||||
<field name="oldQuoteSequenceEnumId" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties;
|
||||
if(partyAcctgPreference!= null&&partyAcctgPreference.get('oldQuoteSequenceEnumId')==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('oldQuoteSequenceEnumId')!=null)return
|
||||
(UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
|
||||
<display-entity entity-name="Enumeration" key-field-name="enumId"/>
|
||||
</field>
|
||||
@@ -254,8 +254,8 @@ under the License.
|
||||
(UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
|
||||
<display/>
|
||||
</field>
|
||||
<field name="orderSequenceEnumId" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties;
|
||||
if(partyAcctgPreference!= null&&partyAcctgPreference.get('orderSequenceEnumId')==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('orderSequenceEnumId')!=null)return
|
||||
<field name="oldOrderSequenceEnumId" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties;
|
||||
if(partyAcctgPreference!= null&&partyAcctgPreference.get('oldOrderSequenceEnumId')==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('oldOrderSequenceEnumId')!=null)return
|
||||
(UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
|
||||
<display-entity entity-name="Enumeration" key-field-name="enumId"/>
|
||||
</field>
|
||||
|
||||
@@ -300,11 +300,11 @@
|
||||
<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.invoiceSequenceEnumId" value="INVSQ_ENF_SEQ"/>
|
||||
<set field="acctgPreferenceCtx.oldInvoiceSequenceEnumId" value="INVSQ_ENF_SEQ"/>
|
||||
<set field="acctgPreferenceCtx.invoiceIdPrefix" from-field="parameters.invoiceIdPrefix"/>
|
||||
<set field="acctgPreferenceCtx.quoteSequenceEnumId" value="INVSQ_ENF_SEQ"/>
|
||||
<set field="acctgPreferenceCtx.oldQuoteSequenceEnumId" value="INVSQ_ENF_SEQ"/>
|
||||
<set field="acctgPreferenceCtx.quoteIdPrefix" value="QU"/>
|
||||
<set field="acctgPreferenceCtx.orderSequenceEnumId" value="INVSQ_ENF_SEQ"/>
|
||||
<set field="acctgPreferenceCtx.oldOrderSequenceEnumId" value="INVSQ_ENF_SEQ"/>
|
||||
<set field="acctgPreferenceCtx.orderIdPrefix" value="OD"/>
|
||||
<call-service service-name="createPartyAcctgPreference" in-map-name="acctgPreferenceCtx"/>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user