Author: hansbak
Date: Fri Oct 29 05:56:21 2010
New Revision: 1028621

URL: http://svn.apache.org/viewvc?rev=1028621&view=rev
Log:

- solve groovy syntax at PartyAcctgPreference form
- set default logo from accounting company or when not present the ofbiz logo 
and allow the browser to set trhe size from the logo image.
  1.) TrialBalance.rptdesign
  2.) InvoiceAcctgTransEntry.rptdesign
  3.) AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
  4.) IncomeStatement.rptdesign
  5.) PaymentAcctgTransEntry.rptdesign
svn commit -m 

Modified:
    
ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
    
ofbiz/trunk/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign
    
ofbiz/trunk/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign
    
ofbiz/trunk/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
    
ofbiz/trunk/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign
    
ofbiz/trunk/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign
    ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml

Modified: 
ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign?rev=1028621&r1=1028620&r2=1028621&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
 (original)
+++ 
ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
 Fri Oct 29 05:56:21 2010
@@ -17,6 +17,9 @@ organizationPartyGroup = delegator.findO
 
 // set logo image url
 logoImageUrl = organizationPartyGroup.getString("logoImageUrl");
+if (!logoImageUrl) {
+    logoImageUrl = 
FileUtil.getFile("component://images/webapp/images/ofbiz_logo.gif").getPath();
+}
 
 dateFormatter = new java.text.SimpleDateFormat("dd MMMMM yyyy");
 
@@ -901,7 +904,7 @@ return true;
     <page-setup>
         <simple-master-page name="Simple MasterPage" id="2">
             <property name="orientation">landscape</property>
-            <property name="headerHeight">2in</property>
+            <property name="headerHeight">2.9in</property>
             <page-header>
                 <grid id="7">
                     <property name="width">10.363636363636363in</property>
@@ -928,10 +931,12 @@ return true;
                             <property name="rowSpan">1</property>
                             <property name="textAlign">left</property>
                             <image id="28">
-                                <property name="height">43px</property>
-                                <property name="width">238px</property>
                                 <method name="onCreate"><![CDATA[if 
(logoImageUrl) {
-    this.URL = logoImageUrl;
+    if (logoImageUrl.startsWith("http")) {
+        this.URL = logoImageUrl;
+    } else {
+        this.file = logoImageUrl;
+    }
 }]]></method>
                                 <property name="source">url</property>
                                 <property 
name="fitToContainer">false</property>

Modified: 
ofbiz/trunk/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign?rev=1028621&r1=1028620&r2=1028621&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign
 (original)
+++ 
ofbiz/trunk/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign
 Fri Oct 29 05:56:21 2010
@@ -27,6 +27,9 @@ partyNameView = delegator.findOne("Party
 
 // set logo image url
 logoImageUrl = organizationPartyGroup.getString("logoImageUrl");
+if (!logoImageUrl) {
+    logoImageUrl = 
FileUtil.getFile("component://images/webapp/images/ofbiz_logo.gif").getPath();
+}
 
 fromDate = null;
 if (params["fromDate"].value) {
@@ -454,11 +457,11 @@ return true;]]></method>
     </styles>
     <page-setup>
         <simple-master-page name="Simple MasterPage" id="2">
-            <property name="headerHeight">1.75in</property>
+            <property name="headerHeight">2.5in</property>
             <page-header>
                 <grid id="8">
                     <property name="backgroundColor">#FFFFFF</property>
-                    <property name="height">1.6979166666666667in</property>
+                    <property name="height">2.3434343434343434in</property>
                     <property name="width">7.875in</property>
                     <column id="9">
                         <property name="width">1.28125in</property>
@@ -477,16 +480,17 @@ return true;]]></method>
                         <property name="width">2.6770833333333335in</property>
                     </column>
                     <row id="12">
-                        <property name="height">0.5416666666666666in</property>
                         <cell id="13">
                             <property name="colSpan">2</property>
                             <property name="rowSpan">1</property>
                             <property name="textAlign">left</property>
                             <image id="28">
-                                <property name="height">43px</property>
-                                <property name="width">238px</property>
                                 <method name="onCreate"><![CDATA[if 
(logoImageUrl) {
-    this.URL = logoImageUrl;
+    if (logoImageUrl.startsWith("http")) {
+        this.URL = logoImageUrl;
+    } else {
+        this.file = logoImageUrl;
+    }
 }]]></method>
                                 <property name="source">url</property>
                                 <property 
name="fitToContainer">false</property>

Modified: 
ofbiz/trunk/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign?rev=1028621&r1=1028620&r2=1028621&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign
 (original)
+++ 
ofbiz/trunk/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign
 Fri Oct 29 05:56:21 2010
@@ -27,6 +27,9 @@ partyNameView = delegator.findOne("Party
 
 // set logo image url
 logoImageUrl = organizationPartyGroup.getString("logoImageUrl");
+if (!logoImageUrl) {
+    logoImageUrl = 
FileUtil.getFile("component://images/webapp/images/ofbiz_logo.gif").getPath();
+}
 
 fromDate = null;
 if (params["fromDate"].value) {
@@ -407,10 +410,11 @@ return true;]]></method>
     </styles>
     <page-setup>
         <simple-master-page name="Simple MasterPage" id="2">
-            <property name="headerHeight">2in</property>
+            <property name="leftMargin">0.25in</property>
+            <property name="headerHeight">2.6in</property>
             <page-header>
                 <grid id="8">
-                    <property name="height">2.875in</property>
+                    <property name="height">2.6666666666666665in</property>
                     <property name="width">7.84375in</property>
                     <column id="9">
                         <property name="width">1.2916666666666667in</property>
@@ -434,10 +438,12 @@ return true;]]></method>
                             <property name="rowSpan">1</property>
                             <property name="textAlign">left</property>
                             <image id="28">
-                                <property name="height">43px</property>
-                                <property name="width">238px</property>
                                 <method name="onCreate"><![CDATA[if 
(logoImageUrl) {
-    this.URL = logoImageUrl;
+    if (logoImageUrl.startsWith("http")) {
+        this.URL = logoImageUrl;
+    } else {
+        this.file = logoImageUrl;
+    }
 }]]></method>
                                 <property name="source">url</property>
                                 <property 
name="fitToContainer">false</property>
@@ -527,7 +533,7 @@ return true;]]></method>
                         <cell id="26"/>
                     </row>
                     <row id="32">
-                        <property name="height">0.5104166666666666in</property>
+                        <property 
name="height">0.21212121212121213in</property>
                         <cell id="33">
                             <label id="37">
                                 <property name="fontWeight">bold</property>

Modified: 
ofbiz/trunk/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign?rev=1028621&r1=1028620&r2=1028621&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
 (original)
+++ 
ofbiz/trunk/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
 Fri Oct 29 05:56:21 2010
@@ -43,6 +43,9 @@ companyLogoCtx.put("parameters", paramet
 companyLogoCtx.put("delegator", delegator);
 
GroovyUtil.runScriptAtLocation("component://order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy",
 companyLogoCtx);
 logoImageUrl = companyLogoCtx.get("logoImageUrl");
+if (!logoImageUrl) {
+    logoImageUrl = 
FileUtil.getFile("component://images/webapp/images/ofbiz_logo.gif").getPath();
+}
 
 // create application list
 var context = FastMap.newInstance();
@@ -569,7 +572,7 @@ return true;]]></method>
     <page-setup>
         <simple-master-page name="Simple MasterPage" id="2">
             <property name="orientation">landscape</property>
-            <property name="headerHeight">2in</property>
+            <property name="headerHeight">2.7in</property>
             <page-header>
                 <grid id="7">
                     <property name="width">10.363636363636363in</property>
@@ -596,10 +599,12 @@ return true;]]></method>
                             <property name="rowSpan">1</property>
                             <property name="textAlign">left</property>
                             <image id="28">
-                                <property name="height">43px</property>
-                                <property name="width">238px</property>
                                 <method name="onCreate"><![CDATA[if 
(logoImageUrl) {
-    this.URL = logoImageUrl;
+    if (logoImageUrl.startsWith("http")) {
+        this.URL = logoImageUrl;
+    } else {
+        this.file = logoImageUrl;
+    }
 }]]></method>
                                 <property name="source">url</property>
                                 <property 
name="fitToContainer">false</property>

Modified: 
ofbiz/trunk/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign?rev=1028621&r1=1028620&r2=1028621&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign
 (original)
+++ 
ofbiz/trunk/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign
 Fri Oct 29 05:56:21 2010
@@ -33,6 +33,9 @@ organizationPartyGroup = delegator.findO
 
 // set logo image url
 logoImageUrl = organizationPartyGroup.getString("logoImageUrl");
+if (!logoImageUrl) {
+    logoImageUrl = 
FileUtil.getFile("component://images/webapp/images/ofbiz_logo.gif").getPath();
+}
 
 // create debit/credit total variable
 debitTotal = 0;
@@ -546,7 +549,7 @@ return true;]]></method>
     <page-setup>
         <simple-master-page name="Simple MasterPage" id="2">
             <property name="orientation">landscape</property>
-            <property name="headerHeight">2.25in</property>
+            <property name="headerHeight">3in</property>
             <page-header>
                 <grid id="7">
                     <property name="width">10.363636363636363in</property>
@@ -573,10 +576,12 @@ return true;]]></method>
                             <property name="rowSpan">1</property>
                             <property name="textAlign">left</property>
                             <image id="28">
-                                <property name="height">43px</property>
-                                <property name="width">238px</property>
                                 <method name="onCreate"><![CDATA[if 
(logoImageUrl) {
-    this.URL = logoImageUrl;
+    if (logoImageUrl.startsWith("http")) {
+        this.URL = logoImageUrl;
+    } else {
+        this.file = logoImageUrl;
+    }
 }]]></method>
                                 <property name="source">url</property>
                                 <property 
name="fitToContainer">false</property>

Modified: 
ofbiz/trunk/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign?rev=1028621&r1=1028620&r2=1028621&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign
 (original)
+++ 
ofbiz/trunk/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign
 Fri Oct 29 05:56:21 2010
@@ -26,6 +26,9 @@ customerTimePeriod = delegator.findOne("
 
 // set logo image url
 logoImageUrl = organizationPartyGroup.getString("logoImageUrl");
+if (!logoImageUrl) {
+    logoImageUrl = 
FileUtil.getFile("component://images/webapp/images/ofbiz_logo.gif").getPath();
+}
 
 // prepare parties list
 partyIds = 
org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator,
 organizationPartyId, "GROUP_ROLLUP");
@@ -267,11 +270,11 @@ return true;]]></method>
     <page-setup>
         <simple-master-page name="Simple MasterPage" id="2">
             <property name="orientation">landscape</property>
-            <property name="headerHeight">1.5in</property>
+            <property name="headerHeight">2.5in</property>
             <page-header>
                 <grid id="8">
                     <property name="backgroundColor">#FFFFFF</property>
-                    <property name="height">1.6979166666666667in</property>
+                    <property name="height">2.292929292929293in</property>
                     <property name="width">10.424242424242424in</property>
                     <column id="9">
                         <property name="width">2.272727272727273in</property>
@@ -290,16 +293,17 @@ return true;]]></method>
                         <property name="width">2.727272727272727in</property>
                     </column>
                     <row id="12">
-                        <property name="height">0.5416666666666666in</property>
                         <cell id="13">
                             <property name="colSpan">2</property>
                             <property name="rowSpan">1</property>
                             <property name="textAlign">left</property>
                             <image id="28">
-                                <property name="height">43px</property>
-                                <property name="width">238px</property>
                                 <method name="onCreate"><![CDATA[if 
(logoImageUrl) {
-    this.URL = logoImageUrl;
+    if (logoImageUrl.startsWith("http")) {
+        this.URL = logoImageUrl;
+    } else {
+        this.file = logoImageUrl;
+    }
 }]]></method>
                                 <property name="source">url</property>
                                 <property 
name="fitToContainer">false</property>

Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=1028621&r1=1028620&r2=1028621&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Fri Oct 29 
05:56:21 2010
@@ -206,67 +206,67 @@ under the License.
         </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;aggregatedPartyAcctgPreference!=
 
null&amp;&amp;aggregatedPartyAcctgPreference.get('fiscalYearStartDay')!=null)return
-                    (UtilProperties.getMessage('AccountingUiLabels', 
'AccountingInheritedValue', locale);)}">
+                    (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;aggregatedPartyAcctgPreference!=
 null&amp;&amp;aggregatedPartyAcctgPreference.get('taxFormId')!=null)return
-                    (UtilProperties.getMessage('AccountingUiLabels', 
'AccountingInheritedValue', locale);)}">
+                    (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;aggregatedPartyAcctgPreference!=
 null&amp;&amp;aggregatedPartyAcctgPreference.get('cogsMethodId')!=null)return
-                    (UtilProperties.getMessage('AccountingUiLabels', 
'AccountingInheritedValue', locale);)}">
+                    (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;aggregatedPartyAcctgPreference!=
 
null&amp;&amp;aggregatedPartyAcctgPreference.get('baseCurrencyUomId')!=null)return
-                (UtilProperties.getMessage('AccountingUiLabels', 
'AccountingInheritedValue', locale);)}">
+                (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;aggregatedPartyAcctgPreference!=
 
null&amp;&amp;aggregatedPartyAcctgPreference.get('invoiceIdPrefix')!=null)return
-                (UtilProperties.getMessage('AccountingUiLabels', 
'AccountingInheritedValue', locale);)}">
+                (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;aggregatedPartyAcctgPreference!=
 
null&amp;&amp;aggregatedPartyAcctgPreference.get('invoiceSequenceEnumId')!=null)return
-                (UtilProperties.getMessage('AccountingUiLabels', 
'AccountingInheritedValue', locale);)}">
+                (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;aggregatedPartyAcctgPreference!=
 
null&amp;&amp;aggregatedPartyAcctgPreference.get('useInvoiceIdForReturns')!=null)return
-                (UtilProperties.getMessage('AccountingUiLabels', 
'AccountingInheritedValue', locale);)}">
+                (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;aggregatedPartyAcctgPreference!=
 
null&amp;&amp;aggregatedPartyAcctgPreference.get('quoteSequenceEnumId')!=null)return
-                (UtilProperties.getMessage('AccountingUiLabels', 
'AccountingInheritedValue', locale);)}">
+                (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;aggregatedPartyAcctgPreference!=
 null&amp;&amp;aggregatedPartyAcctgPreference.get('quoteIdPrefix')!=null)return
-                (UtilProperties.getMessage('AccountingUiLabels', 
'AccountingInheritedValue', locale);)}">
+                (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;aggregatedPartyAcctgPreference!=
 
null&amp;&amp;aggregatedPartyAcctgPreference.get('lastQuoteNumber')!=null)return
-                (UtilProperties.getMessage('AccountingUiLabels', 
'AccountingInheritedValue', locale);)}">
+                (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;aggregatedPartyAcctgPreference!=
 
null&amp;&amp;aggregatedPartyAcctgPreference.get('orderSequenceEnumId')!=null)return
-                (UtilProperties.getMessage('AccountingUiLabels', 
'AccountingInheritedValue', locale);)}">
+                (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;aggregatedPartyAcctgPreference!=
 null&amp;&amp;aggregatedPartyAcctgPreference.get('orderIdPrefix')!=null)return
-                (UtilProperties.getMessage('AccountingUiLabels', 
'AccountingInheritedValue', locale);)}">
+                (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;aggregatedPartyAcctgPreference!=
 
null&amp;&amp;aggregatedPartyAcctgPreference.get('lastOrderNumber')!=null)return
-                (UtilProperties.getMessage('AccountingUiLabels', 
'AccountingInheritedValue', locale);)}">
+                (UtilProperties.getMessage('AccountingUiLabels', 
'AccountingInheritedValue', locale))}">
             <display/>
         </field>
 
@@ -274,19 +274,19 @@ under the License.
         <field name="lastInvoiceNumber" tooltip="${groovy: import 
org.ofbiz.base.util.UtilProperties;
                 
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);)}">
+                    (UtilProperties.getMessage('AccountingUiLabels', 
'AccountingInheritedValue', locale))}">
             <display/>
         </field>
         <field name="lastInvoiceRestartDate" tooltip="${groovy: import 
org.ofbiz.base.util.UtilProperties;
                 
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);)}">
+                
(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;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);)}">
+                (UtilProperties.getMessage('AccountingUiLabels', 
'AccountingInheritedValue', locale))}">
             <drop-down>
                 <entity-options entity-name="PaymentMethod" 
description="${description}" key-field-name="paymentMethodId">
                     <entity-constraint name="partyId" operator="equals" 
env-name="organizationPartyId"/>


Reply via email to