Author: jleroux
Date: Wed Dec 4 06:55:59 2013
New Revision: 1547717
URL: http://svn.apache.org/r1547717
Log:
Fixes an issue reported by Christian Carlow at "Invoice Item type drop down
empty when creating new invoice item"
https://issues.apache.org/jira/browse/OFBIZ-5415
jleroux: Rather than what proposed Christian I used the same best practice than
in r1527171
Modified:
ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml
ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml?rev=1547717&r1=1547716&r2=1547717&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml Wed Dec 4
06:55:59 2013
@@ -395,7 +395,7 @@ under the License.
<field name="invoiceId"><hidden/></field>
<field position="1" name="invoiceItemTypeId">
<drop-down allow-empty="false">
- <list-options list-name="invoiceItemTypes"
key-name="invoiceItemTypeId"
description="${groovy:uiLabelMap.get('InvoiceItemType.description.'+invoiceItemTypeId)}"/>
+ <entity-options entity-name="InvoiceItemType"
description="${description}" key-field-name="invoiceItemTypeId"/>
</drop-down>
</field>
<field position="1" name="description"><text size="80"/></field>
Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=1547717&r1=1547716&r2=1547717&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Wed Dec 4
06:55:59 2013
@@ -441,7 +441,7 @@ under the License.
<entity-condition entity-name="InvoiceItemType"
list="PayrolGroup">
<condition-expr field-name="parentTypeId" value="PAYROL"/>
</entity-condition>
- <entity-condition entity-name="InvoiceItemType"
list="PayrolList"></entity-condition>
+ <entity-condition entity-name="InvoiceItemType"
list="PayrolList"/>
</actions>
<widgets>
<decorator-screen name="CommonInvoiceDecorator"
location="${parameters.invoiceDecoratorLocation}">
