svn commit: r494558 - /ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml

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

svn commit: r494558 - /ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml

sichen
Author: sichen
Date: Tue Jan  9 12:25:49 2007
New Revision: 494558

URL: http://svn.apache.org/viewvc?view=rev&rev=494558
Log:
revert the change from dropdown to lookup, as this one seems to have conditions associated with it

Modified:
    ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml

Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml?view=diff&rev=494558&r1=494557&r2=494558
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml Tue Jan  9 12:25:49 2007
@@ -218,7 +218,15 @@
             </drop-down>
         </field>
         <field name="productStoreId" title="${uiLabelMap.ProductStoreId}"><lookup size="10" target-form-name="LookupProductStore"/></field>
-        <field name="productCategoryId" title="${uiLabelMap.ProductCategory}"><lookup target-form-name="LookupProductCategory"></lookup></field>
+        <field name="productCategoryId" title="${uiLabelMap.ProductCategory}">
+            <drop-down allow-empty="false">
+                <entity-options entity-name="TaxAuthorityCategoryView" description="${description} [${productCategoryId}]">
+                    <entity-constraint name="taxAuthPartyId" env-name="taxAuthPartyId"/>
+                    <entity-constraint name="taxAuthGeoId" env-name="taxAuthGeoId"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
         <field name="titleTransferEnumId" title="${uiLabelMap.AccountingTitleTransfer}">
             <drop-down allow-empty="true">
                 <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description} [${enumCode}]">
@@ -249,7 +257,15 @@
             </drop-down>
         </field>
         <field name="productStoreId" title="${uiLabelMap.ProductStoreId}"><lookup size="10" target-form-name="LookupProductStore"/></field>
-        <field name="productCategoryId" title="${uiLabelMap.ProductCategory}"><lookup target-form-name="LookupProductCategory"></lookup></field>
+        <field name="productCategoryId" title="${uiLabelMap.ProductCategory}" tooltip="Use the Categories tab to add other category options">
+            <drop-down allow-empty="false">
+                <entity-options entity-name="TaxAuthorityCategoryView" description="${description} [${productCategoryId}]">
+                    <entity-constraint name="taxAuthPartyId" env-name="taxAuthPartyId"/>
+                    <entity-constraint name="taxAuthGeoId" env-name="taxAuthGeoId"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
         <field name="titleTransferEnumId" title="${uiLabelMap.AccountingTitleTransfer}">
             <drop-down allow-empty="true">
                 <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description} [${enumCode}]">