Author: sichen
Date: Wed Dec 20 12:16:12 2006
New Revision: 489188
URL:
http://svn.apache.org/viewvc?view=rev&rev=489188Log:
Added support for selecting commission invoice item types for commission invoices.
Modified:
incubator/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
Modified: incubator/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml?view=diff&rev=489188&r1=489187&r2=489188==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml (original)
+++ incubator/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml Wed Dec 20 12:16:12 2006
@@ -266,6 +266,14 @@
</entity-options>
</drop-down>
</field>
+ <field name="invoiceItemTypeId" use-when=""${invoice.invoiceTypeId}".equals("COMMISSION_INVOICE")">
+ <drop-down allow-empty="false">
+ <entity-options description="${description}" entity-name="InvoiceItemType">
+ <entity-constraint name="invoiceItemTypeId" operator="like" value="COMM_INV_%"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
<!--field name="overrideGlAccountId"><text size="10"/></field-->
<field name="amount"><text size="7"/></field>
<field name="total" widget-area-style="tabletextright" widget-style="tabletext" use-when="uomId!=null"><display type="currency" currency="${uomId}"/></field> <!-- this should not look like something you can modify, hence "tabletext" -->
@@ -297,6 +305,14 @@
<drop-down allow-empty="false">
<entity-options description="${description}" entity-name="InvoiceItemType">
<entity-constraint name="invoiceItemTypeId" operator="like" value="INV_%"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field position="1" name="invoiceItemTypeId" use-when=""${invoice.invoiceTypeId}".equals("COMMISSION_INVOICE")">
+ <drop-down allow-empty="false">
+ <entity-options description="${description}" entity-name="InvoiceItemType">
+ <entity-constraint name="invoiceItemTypeId" operator="like" value="COMM_INV_%"/>
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>