svn commit: r655033 - in /ofbiz/trunk/applications/accounting: config/ webapp/ap/WEB-INF/ widget/ap/ widget/ap/forms/ widget/ar/

[mor-2]

Author: mor
Date: Sat May 10 02:07:28 2008
New Revision: 655033

URL: http://svn.apache.org/viewvc?rev=655033&view=rev
Log:
Misc improvements in AR/AP webapp, part of Jira issue OFBIZ-1668. Thanks Sumit Pandit for this patch

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml
    ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
    ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml
    ofbiz/trunk/applications/accounting/widget/ap/Menus.xml
    ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml
    ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
    ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=655033&r1=655032&r2=655033&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Sat May 10 02:07:28 2008
@@ -450,6 +450,12 @@
     <property key="AccountingApCompanyName">
         <value xml:lang="en">OFBiz: AP Manager</value>
     </property>
+    <property key="AccountingApPageTitleFindVendors">
+        <value xml:lang="en">Find Vendors</value>
+    </property>
+    <property key="AccountingApPageTitleFindVendorResults">
+        <value xml:lang="en">Find Vendor Results</value>
+    </property>
     <property key="AccountingApPageTitleListVendors">
         <value xml:lang="en">List Vendors</value>
     </property>

Modified: ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml?rev=655033&r1=655032&r2=655033&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml Sat May 10 02:07:28 2008
@@ -36,10 +36,9 @@
         <response name="success" type="view" value="ListReports"/>
     </request-map>
     <!-- ================ Vendor requests ================ -->
-    <request-map uri="listVendors">
+    <request-map uri="findVendors">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="ListVendors"/>
-        <response name="error" type="view" value="ListVendors"/>
+        <response name="success" type="view" value="FindVendors"/>
     </request-map>
     <request-map uri="editVendor">
         <security https="true" auth="true"/>
@@ -49,21 +48,22 @@
     <request-map uri="createVendor">
         <security https="true" auth="true"/>
         <event type="service" invoke="createVendor"></event>
-        <response name="success" type="view" value="ListVendors"/>
-        <response name="error" type="view" value="ListVendors"/>
+        <response name="success" type="view" value="FindVendors"/>
+        <response name="error" type="view" value="FindVendors"/>
     </request-map>
     <request-map uri="updateVendor">
         <security https="true" auth="true"/>
         <event type="service" invoke="updateVendor"></event>
-        <response name="success" type="view" value="ListVendors"/>
-        <response name="error" type="view" value="ListVendors"/>
+        <response name="success" type="view" value="FindVendors"/>
+        <response name="error" type="view" value="FindVendors"/>
     </request-map>
+
     <!-- end of request mappings -->
 
     <!-- View Mappings -->
     <view-map name="main" type="screen" page="component://accounting/widget/ap/CommonScreens.xml#main"/>
     <view-map name="ListReports" type="screen" page="component://accounting/widget/ap/InvoiceScreens.xml#ListReports"/>
-    <!-- Vendor Mappings   -->
-    <view-map name="ListVendors" type="screen" page="component://accounting/widget/ap/CommonScreens.xml#ListVendors"/>
+    <!-- Vendor Mappings -->
+    <view-map name="FindVendors" type="screen" page="component://accounting/widget/ap/CommonScreens.xml#FindVendors"/>
     <view-map name="EditVendor" type="screen" page="component://accounting/widget/ap/CommonScreens.xml#EditVendor"/>
 </site-conf>
\ No newline at end of file

Modified: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=655033&r1=655032&r2=655033&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml Sat May 10 02:07:28 2008
@@ -156,59 +156,40 @@
         </section>
     </screen>
 
-    <screen name="ReportsDecorator">
-        <section>
-            <actions>
-                <set field="tabButtonItem" value="listReports"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameter.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <decorator-section-include name="body"/>
-                    </decorator-section>
-                </decorator-screen>    
-            </widgets>        
-        </section>
-    </screen>
-
-    <screen name="ListVendors">
+    <screen name="EditVendor">
         <section>
             <actions>
-                <set field="tabButtonItem" value="listVendors"/>
-                <set field="titleProperty" value="AccountingApPageTitleListVendors"/>
-                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
-                <entity-condition entity-name="Vendor" list-name="vendors">
-                    <condition-expr field-name="partyId" value="${parameters.partyId}"/>
-                </entity-condition>
+                <set field="partyId" from-field="parameters.partyId"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameter.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <section>
-                            <widgets>
-                                <container style="button-bar"><link target="editVendor" text="${uiLabelMap.CommonNew} ${uiLabelMap.PartyVendor}" style="buttontext"/></container>
-                                <screenlet title="${uiLabelMap.PartyVendor} ${uiLabelMap.CommonList}" navigation-form-name="ListVendors">
-                                    <include-form name="ListVendors" location="component://accounting/widget/ap/forms/VendorForms.xml"/>
-                                </screenlet>
-                            </widgets>
-                        </section>
+                        <screenlet title="${uiLabelMap.CommonEdit} ${uiLabelMap.PartyVendor}">
+                            <include-form name="EditVendor" location="component://accounting/widget/ap/forms/VendorForms.xml"/>
+                        </screenlet>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
     </screen>
 
-    <screen name="EditVendor">
-        <section>
+    <screen name="FindVendors">
+        <section>            
             <actions>
-                <set field="partyId" from-field="parameters.partyId"/>
-            </actions>
+                <set field="tabButtonItem" value="findVendors"></set>
+                <set field="titleProperty" value="AccountingApPageTitleFindVendors"/>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
+            </actions>                                                
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameter.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.CommonEdit} ${uiLabelMap.PartyVendor}">
-                            <include-form name="EditVendor" location="component://accounting/widget/ap/forms/VendorForms.xml"/>
+                        <container style="button-bar"><link target="editVendor" text="${uiLabelMap.CommonNew} ${uiLabelMap.PartyVendor}" style="buttontext"/></container>
+                        <screenlet name="findVendors" collapsible="true" title="${uiLabelMap.AccountingApPageTitleFindVendors}">
+                            <include-form name="FindVendors" location="component://accounting/widget/ap/forms/VendorForms.xml"/>
+                        </screenlet>
+                        <screenlet title="${uiLabelMap.AccountingApPageTitleFindVendorResults}" navigation-form-name="ListVendors">
+                            <include-form name="ListVendors" location="component://accounting/widget/ap/forms/VendorForms.xml"/>
                         </screenlet>
                     </decorator-section>
                 </decorator-screen>

Modified: ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml?rev=655033&r1=655032&r2=655033&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml Sat May 10 02:07:28 2008
@@ -24,13 +24,13 @@
     <screen name="ListReports">
         <section>
             <actions>
-                <set field="headerItem" value="Reports"/>
+                <set field="tabButtonItem" value="reports"/>
                 <set field="titleProperty" value="AccountingArPageTitleListReports"/>
-                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
             </actions>
             <widgets>
-                <decorator-screen name="ReportsDecorator" location="component://accounting/widget/ap/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://accounting/widget/ap/CommonScreens.xml">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.AccountingReports}" navigation-form-name="ListReports">
                             <include-form name="ListReports" location="component://accounting/widget/ap/forms/InvoiceForms.xml"/>

Modified: ofbiz/trunk/applications/accounting/widget/ap/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/Menus.xml?rev=655033&r1=655032&r2=655033&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/Menus.xml Sat May 10 02:07:28 2008
@@ -24,8 +24,8 @@
         <menu-item name="agreements" title="${uiLabelMap.AccountingAgreements}"><link target="FindAgreement"/></menu-item>
         <menu-item name="invoices" title="${uiLabelMap.AccountingInvoicesMenu}"><link target="findInvoices"/></menu-item>
         <menu-item name="payments" title="${uiLabelMap.AccountingPaymentsMenu}"><link target="findPayments"/></menu-item>
-        <menu-item name="listVendors" title="${uiLabelMap.PartyVendor} ${uiLabelMap.CommonList}"><link target="listVendors"/></menu-item>
-        <menu-item name="listReports" title="${uiLabelMap.AccountingReports}"><link target="listReports"/></menu-item>
+        <menu-item name="findVendors" title="${uiLabelMap.PartyVendor} ${uiLabelMap.CommonList}"><link target="findVendors"/></menu-item>
+        <menu-item name="reports" title="${uiLabelMap.AccountingReports}"><link target="listReports"/></menu-item>
         <menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="col-right" selected-style="selected">
             <condition><not><if-empty field-name="userLogin"/></not></condition>
             <link target="logout"/>
@@ -39,7 +39,7 @@
         <menu-item name="findAgreement" title="${uiLabelMap.AccountingAgreementAvailable}"><link target="FindAgreement"></link></menu-item>
     </menu>
     <menu name="ApMainVendorMenu" type="simple" default-selected-style="tabButtonSelected">
-        <menu-item name="listVendors" title="${uiLabelMap.CommonShowAll} ${uiLabelMap.PartyVendor}"><link target="listVendors"></link></menu-item>
+        <menu-item name="listVendors" title="${uiLabelMap.CommonShowAll} ${uiLabelMap.PartyVendor}"><link target="findVendors"></link></menu-item>
     </menu>
     <menu name="ApMainReportMenu" type="simple" default-selected-style="tabButtonSelected">
         <menu-item name="listReport" title="${uiLabelMap.CommonShowAll} ${uiLabelMap.AccountingReports}"><link target="listReports"></link></menu-item>

Modified: ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml?rev=655033&r1=655032&r2=655033&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml Sat May 10 02:07:28 2008
@@ -20,9 +20,13 @@
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
-    <form name="ListVendors" type="list" list-name="listIt" paginate-target="listVendors" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+    <form name="ListVendors" type="list" list-name="listIt" paginate-target="findVendors" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <entity-condition entity-name="Vendor"><order-by field-name="partyId"/></entity-condition>
+            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" env-name="parameters"/>
+                <field-map field-name="entityName" value="Vendor"/>
+                <field-map field-name="orderBy" value="partyId"/>
+            </service>
         </actions>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${partyId}" target="editVendor?partyId=${partyId}"/>
@@ -51,4 +55,14 @@
         <field name="submitButton" use-when="partyId==null" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
         <field name="submitButton" use-when="partyId!=null&amp;&amp;vendor!=null" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
     </form>
+    <form name="FindVendors" type="single" target="findVendors" title="Find and List Vendors"
+        header-row-style="header-row" default-table-style="basic-table">
+        <field name="partyId" title="${uiLabelMap.PartyVendor} ${uiLabelMap.CommonId}" parameter-name="partyId"><text-find size="25" default-option="contains"></text-find></field>
+        <field name="manifestCompanyName" title="${uiLabelMap.PartyManifestCompanyName}" parameter-name="manifestCompanyName"><text-find size="25" default-option="contains"></text-find></field>
+        <field name="manifestCompanyTitle" title="${uiLabelMap.PartyManifestCompanyTitle}" parameter-name="manifestCompanyTitle"><text-find size="25" default-option="contains"></text-find></field>
+        <field name="manifestLogoUrl" title="${uiLabelMap.PartyManifestLogoUrl}" parameter-name="manifestLogoUrl"><text-find size="25" default-option="contains"></text-find></field>
+        <field name="manifestPolicies" title="${uiLabelMap.PartyManifestPolicies}" parameter-name="manifestPolicies"><text-find size="25" default-option="contains"></text-find></field>
+        <field name="noConditionFind"><hidden value="Y"/></field>
+        <field name="find" title="${uiLabelMap.CommonFind}"><submit/></field>
+    </form>
 </forms>
\ No newline at end of file

Modified: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=655033&r1=655032&r2=655033&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml Sat May 10 02:07:28 2008
@@ -72,21 +72,6 @@
         </section>
     </screen>
     
-    <screen name="ReportsDecorator">
-        <section>
-            <actions>
-                <set field="headerItem" value="${uiLabelMap.AccountingReports}"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <decorator-section-include name="body"/>
-                    </decorator-section>
-                </decorator-screen>    
-            </widgets>        
-        </section>
-    </screen>
-    
     <screen name="CommonPaymentDecorator">
         <section>
             <actions>

Modified: ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml?rev=655033&r1=655032&r2=655033&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml Sat May 10 02:07:28 2008
@@ -29,7 +29,7 @@
                 <set field="titleProperty" value="AccountingArPageTitleListReports"/>
             </actions>
             <widgets>
-                <decorator-screen name="ReportsDecorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.AccountingReports}">
                             <section>