Return-Path: 
 <ofbiz-commits-return-1505-apmail-incubator-ofbiz-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-ofbiz-commits-archive@locus.apache.org
Received: (qmail 39327 invoked from network); 20 Dec 2006 20:17:03 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 20 Dec 2006 20:17:03 -0000
Received: (qmail 68732 invoked by uid 500); 20 Dec 2006 20:17:11 -0000
Delivered-To: apmail-incubator-ofbiz-commits-archive@incubator.apache.org
Received: (qmail 68719 invoked by uid 500); 20 Dec 2006 20:17:10 -0000
Mailing-List: contact ofbiz-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:ofbiz-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:ofbiz-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:ofbiz-commits@incubator.apache.org>
List-Id: <ofbiz-commits.incubator.apache.org>
Reply-To: ofbiz-dev@incubator.apache.org
Delivered-To: mailing list ofbiz-commits@incubator.apache.org
Received: (qmail 68710 invoked by uid 99); 20 Dec 2006 20:17:10 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Dec 2006 12:17:10 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Dec 2006 12:17:02 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id BB9961A981A; Wed, 20 Dec 2006 12:16:13 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r489188 -
 /incubator/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
Date: Wed, 20 Dec 2006 20:16:13 -0000
To: ofbiz-commits@incubator.apache.org
From: sichen@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061220201613.BB9961A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: sichen
Date: Wed Dec 20 12:16:12 2006
New Revision: 489188

URL: http://svn.apache.org/viewvc?view=rev&rev=489188
Log:
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="&quot;${invoice.invoiceTypeId}&quot;.equals(&quot;COMMISSION_INVOICE&quot;)">
+           <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="&quot;${invoice.invoiceTypeId}&quot;.equals(&quot;COMMISSION_INVOICE&quot;)">
+            <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>