Re: svn commit: r912588 - /ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r912588 - /ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml

BJ Freeman
this seems to be the one that introduced the erorr
null&&aggregatedPartyAcctgPreference.get
it causes artifact to fail.


=========================
BJ Freeman  <http://bjfreeman.elance.com>
Strategic Power Office with Supplier Automation  <http://www.businessesnetwork.com/automation/viewforum.php?f=52>
Specialtymarket.com  <http://www.specialtymarket.com/>
Systems Integrator-- Glad to Assist

Chat  Y! messenger: bjfr33man
[hidden email] sent the following on 2/22/2010 6:43 AM:


> Author: jacopoc
> Date: Mon Feb 22 14:43:08 2010
> New Revision: 912588
>
> URL: http://svn.apache.org/viewvc?rev=912588&view=rev
> Log:
> Fixed typo in variable name.
>
> Modified:
>      ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
>
> Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=912588&r1=912587&r2=912588&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original)
> +++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Mon Feb 22 14:43:08 2010
> @@ -72,13 +72,13 @@
>           <field name="submitButton" title="${uiLabelMap.AccountingCreateAssignment}"><submit button-type="button"/></field>
>       </form>
>
> -<form name="PartyAcctgPreference" type="single" target="createPartyAcctgPreference" default-map-name="agregatedPartyAcctgPreference"
> +<form name="PartyAcctgPreference" type="single" target="createPartyAcctgPreference" default-map-name="aggregatedPartyAcctgPreference"
>               header-row-style="header-row" default-table-style="basic-table">
>           <actions>
>               <service service-name="getPartyAccountingPreferences" result-map="result">
>                   <field-map field-name="organizationPartyId"/>
>               </service>
> -<set field="agregatedPartyAcctgPreference" from-field="result.partyAccountingPreference" type="Map"/>
> +<set field="aggregatedPartyAcctgPreference" from-field="result.partyAccountingPreference" type="Map"/>
>           </actions>
>           <alt-target use-when="partyAcctgPreference!=null" target="updatePartyAcctgPreference"/>
>           <auto-fields-service service-name="createPartyAcctgPreference"/>
> @@ -87,7 +87,7 @@
>           <field name="partyId" title="${uiLabelMap.AccountingOrganizationPartyId}"><display/></field>
>           <!-- if there is no partyAcctgPreference yet, then we show drop-downs for the fields and a submit button -->
>           <field name="fiscalYearStartMonth" use-when="partyAcctgPreference==null"
> -            tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('fiscalYearStartMonth')!=null)return (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
> +            tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('fiscalYearStartMonth')!=null)return (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
>               <drop-down>
>                   <option key="1" description="${uiLabelMap.AccountingFiscalMonth01}"/>
>                   <option key="2" description="${uiLabelMap.AccountingFiscalMonth02}"/>
> @@ -104,7 +104,7 @@
>               </drop-down>
>           </field>
>           <field name="fiscalYearStartDay" use-when="partyAcctgPreference==null"
> -            tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('fiscalYearStartDay')!=null)return (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
> +            tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('fiscalYearStartDay')!=null)return (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
>               <drop-down>
>                   <option key="1"/><option key="2"/><option key="3"/><option key="4"/><option key="5"/>
>                   <option key="6"/><option key="7"/><option key="8"/><option key="9"/><option key="10"/>
> @@ -116,7 +116,7 @@
>               </drop-down>
>           </field>
>           <field name="taxFormId" use-when="partyAcctgPreference==null"
> -            tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('taxFormId')!=null)return
> +            tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('taxFormId')!=null)return
>               (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
>               <drop-down>
>                   <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
> @@ -126,7 +126,7 @@
>               </drop-down>
>           </field>
>           <field name="cogsMethodId" use-when="partyAcctgPreference==null"
> -            tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('cogsMethodId')!=null)return (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
> +            tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('cogsMethodId')!=null)return (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
>               <drop-down>
>                   <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
>                       <entity-constraint name="enumTypeId" operator="equals" value="COGS_METHODS"/>
> @@ -135,7 +135,7 @@
>               </drop-down>
>           </field>
>           <field name="baseCurrencyUomId" use-when="partyAcctgPreference==null"
> -            tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('baseCurrencyUomId')!=null)return
> +            tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('baseCurrencyUomId')!=null)return
>               (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
>               <drop-down no-current-selected-key="${defaultOrganizationPartyCurrencyUomId}">
>                   <entity-options key-field-name="uomId" description="${description} - ${abbreviation}" entity-name="Uom">
> @@ -145,12 +145,12 @@
>               </drop-down>
>           </field>
>           <field name="invoiceIdPrefix" use-when="partyAcctgPreference==null"
> -            tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('invoiceIdPrefix')!=null)return
> +            tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('invoiceIdPrefix')!=null)return
>               (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(agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('invoiceSequenceEnumId')!=null)return
> +            tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('invoiceSequenceEnumId')!=null)return
>               (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
>               <drop-down>
>                   <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
> @@ -160,19 +160,19 @@
>               </drop-down>
>           </field>
>           <field name="useInvoiceIdForReturns" use-when="partyAcctgPreference==null"
> -            tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('useInvoiceIdForReturns')!=null)return
> +            tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('useInvoiceIdForReturns')!=null)return
>               (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
>               <drop-down allow-empty="true">
>                   <option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/>
>               </drop-down>
>           </field>
>           <field name="quoteIdPrefix" use-when="partyAcctgPreference==null"
> -            tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('quoteIdPrefix')!=null)return
> +            tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('quoteIdPrefix')!=null)return
>               (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(agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('quoteSequenceEnumId')!=null)return
> +            tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('quoteSequenceEnumId')!=null)return
>               (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
>               <drop-down>
>                   <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
> @@ -182,11 +182,11 @@
>               </drop-down>
>           </field>
>           <field name="orderIdPrefix" use-when="partyAcctgPreference==null"
> -            tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('orderIdPrefix')!=null)return (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
> +            tooltip="${groovy: import org.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="orderSequenceEnumId" use-when="partyAcctgPreference==null"
> -            tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('orderSequenceEnumId')!=null)return
> +            tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('orderSequenceEnumId')!=null)return
>               (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
>               <drop-down>
>                   <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
> @@ -200,92 +200,92 @@
>
>           <!-- otherwise, we just display the fields.  there is no submit button because we shouldn't try to create it again and don't support an update option right now-->
>           <field name="fiscalYearStartMonth" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties;
> -                if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('fiscalYearStartMonth')==null&amp;&amp;agregatedPartyAcctgPreference.get('fiscalYearStartMonth')!=null)return
> +                if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('fiscalYearStartMonth')==null&amp;&amp;aggregatedPartyAcctgPreference.get('fiscalYearStartMonth')!=null)return
>               (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
>               <display/>
>           </field>
>           <field name="fiscalYearStartDay" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties;
> -            if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('fiscalYearStartDay')==null&amp;&amp;agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('fiscalYearStartDay')!=null)return
> +            if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('fiscalYearStartDay')==null&amp;&amp;aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('fiscalYearStartDay')!=null)return
>                       (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale);)}">
>               <display/>
>           </field>
>           <field name="taxFormId" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties;
> -                if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('taxFormId')==null&amp;&amp;agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('taxFormId')!=null)return
> +                if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('taxFormId')==null&amp;&amp;aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('taxFormId')!=null)return
>                       (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale);)}">
>               <display-entity entity-name="Enumeration" key-field-name="enumId"/>
>           </field>
>           <field name="cogsMethodId" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties;
> -            if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('cogsMethodId')==null&amp;&amp;agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('cogsMethodId')!=null)return
> +            if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('cogsMethodId')==null&amp;&amp;aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('cogsMethodId')!=null)return
>                       (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale);)}">
>               <display-entity entity-name="Enumeration" key-field-name="enumId"/>
>           </field>
>           <field name="baseCurrencyUomId" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties;
> -                if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('baseCurrencyUomId')==null&amp;&amp;agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('baseCurrencyUomId')!=null)return
> +                if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('baseCurrencyUomId')==null&amp;&amp;aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('baseCurrencyUomId')!=null)return
>                   (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale);)}">
>               <display/>
>           </field>
>           <field name="invoiceIdPrefix" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties;
> -                if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('invoiceIdPrefix')==null&amp;&amp;agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('invoiceIdPrefix')!=null)return
> +                if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('invoiceIdPrefix')==null&amp;&amp;aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('invoiceIdPrefix')!=null)return
>                   (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&amp;&amp;partyAcctgPreference.get('invoiceSequenceEnumId')==null&amp;&amp;agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('invoiceSequenceEnumId')!=null)return
> +                if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('invoiceSequenceEnumId')==null&amp;&amp;aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('invoiceSequenceEnumId')!=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.ofbiz.base.util.UtilProperties;
> -                if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('useInvoiceIdForReturns')==null&amp;&amp;agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('useInvoiceIdForReturns')!=null)return
> +                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="quoteSequenceEnumId" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties;
> -                if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('quoteSequenceEnumId')==null&amp;&amp;agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('quoteSequenceEnumId')!=null)return
> +                if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('quoteSequenceEnumId')==null&amp;&amp;aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('quoteSequenceEnumId')!=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.ofbiz.base.util.UtilProperties;
> -                if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('quoteIdPrefix')==null&amp;&amp;agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('quoteIdPrefix')!=null)return
> +                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);)}">
>               <display/>
>           </field>
>           <field name="lastQuoteNumber" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties;
> -                if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('lastQuoteNumber')==null&amp;&amp;agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('lastQuoteNumber')!=null)return
> +                if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('lastQuoteNumber')==null&amp;&amp;aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('lastQuoteNumber')!=null)return
>                   (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&amp;&amp;partyAcctgPreference.get('orderSequenceEnumId')==null&amp;&amp;agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('orderSequenceEnumId')!=null)return
> +                if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('orderSequenceEnumId')==null&amp;&amp;aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('orderSequenceEnumId')!=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.ofbiz.base.util.UtilProperties;
> -                if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('orderIdPrefix')==null&amp;&amp;agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('orderIdPrefix')!=null)return
> +                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);)}">
>               <display/>
>           </field>
>           <field name="lastOrderNumber" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties;
> -                if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('lastOrderNumber')==null&amp;&amp;agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('lastOrderNumber')!=null)return
> +                if(partyAcctgPreference!= null&amp;&amp;partyAcctgPreference.get('lastOrderNumber')==null&amp;&amp;aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('lastOrderNumber')!=null)return
>                   (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale);)}">
>               <display/>
>           </field>
>
>           <!-- these 2 are ONLY displayed, never allow manual editing -->
>           <field name="lastInvoiceNumber" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties;
> -                if((partyAcctgPreference==null&amp;&amp;agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('lastInvoiceNumber')!=null) ||
> -                (partyAcctgPreference!=null&amp;&amp;partyAcctgPreference.get('lastInvoiceNumber')==null&amp;&amp;agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('lastInvoiceNumber')!=null))return
> +                if((partyAcctgPreference==null&amp;&amp;aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('lastInvoiceNumber')!=null) ||
> +                (partyAcctgPreference!=null&amp;&amp;partyAcctgPreference.get('lastInvoiceNumber')==null&amp;&amp;aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('lastInvoiceNumber')!=null))return
>                       (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale);)}">
>               <display/>
>           </field>
>           <field name="lastInvoiceRestartDate" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties;
> -                if((partyAcctgPreference==null&amp;&amp;agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('lastInvoiceRestartDate')!=null) ||
> -                (partyAcctgPreference!=null&amp;&amp;partyAcctgPreference.get('lastInvoiceRestartDate')==null&amp;&amp;agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('lastInvoiceRestartDate')!=null))return (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale);)}">
> +                if((partyAcctgPreference==null&amp;&amp;aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('lastInvoiceRestartDate')!=null) ||
> +                (partyAcctgPreference!=null&amp;&amp;partyAcctgPreference.get('lastInvoiceRestartDate')==null&amp;&amp;aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('lastInvoiceRestartDate')!=null))return (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale);)}">
>               <display/>
>           </field>
>           <!-- these 2 are always can be updated -->
>           <field name="refundPaymentMethodId" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties;
> -                if((partyAcctgPreference==null&amp;&amp;agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('refundPaymentMethodId')!=null) ||
> -                (partyAcctgPreference!=null&amp;&amp;partyAcctgPreference.get('refundPaymentMethodId')==null&amp;&amp;agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('refundPaymentMethodId')!=null))return
> +                if((partyAcctgPreference==null&amp;&amp;aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('refundPaymentMethodId')!=null) ||
> +                (partyAcctgPreference!=null&amp;&amp;partyAcctgPreference.get('refundPaymentMethodId')==null&amp;&amp;aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('refundPaymentMethodId')!=null))return
>                   (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale);)}">
>               <drop-down>
>                   <entity-options entity-name="PaymentMethod" description="${description}" key-field-name="paymentMethodId">
> @@ -294,8 +294,8 @@
>               </drop-down>
>           </field>
>           <field name="errorGlJournalId" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties;
> -            if((partyAcctgPreference==null&amp;&amp;agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('errorGlJournalId')!=null) ||
> -            (partyAcctgPreference!=null&amp;&amp;partyAcctgPreference.get('errorGlJournalId')==null&amp;&amp;agregatedPartyAcctgPreference!= null&amp;&amp;agregatedPartyAcctgPreference.get('errorGlJournalId')!=null))return
> +            if((partyAcctgPreference==null&amp;&amp;aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('errorGlJournalId')!=null) ||
> +            (partyAcctgPreference!=null&amp;&amp;partyAcctgPreference.get('errorGlJournalId')==null&amp;&amp;aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('errorGlJournalId')!=null))return
>               (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
>               <drop-down allow-empty="true">
>                   <entity-options entity-name="GlJournal" key-field-name="glJournalId" description="${glJournalName} [${glJournalId}]">
>
>
>