svn commit: r792951 - in /ofbiz/trunk/applications/accounting: webapp/accounting/WEB-INF/controller.xml webapp/accounting/lookup/FieldLookupForms.xml widget/LookupScreens.xml widget/PaymentGroupForms.xml

[ashish-18]

Author: ashish
Date: Fri Jul 10 13:44:55 2009
New Revision: 792951

URL: http://svn.apache.org/viewvc?rev=792951&view=rev
Log:
Applied patch from jira issue OFBIZ-2716 - Payment Group Member screen imporvement
Following things are covered in this patch:

1) at ListPaymentGroupMember form, make paymentId non editable (it is primary key).
2) at AddPaymentGroupMember form, provide a lookup to paymentId.
3) at AddPaymentGroupMember form, add fromDate field.
4) Provide a lookup LookupPaymentGroupMember, so that it can be used if require.

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml
    ofbiz/trunk/applications/accounting/widget/LookupScreens.xml
    ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=792951&r1=792950&r2=792951&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Fri Jul 10 13:44:55 2009
@@ -2014,6 +2014,7 @@
     <request-map uri="LookupShipment"><security auth="true" https="true"/><response name="success" type="view" value="LookupShipment"/></request-map>
     <request-map uri="LookupAgreement"><security https="true" auth="true"/><response name="success" type="view" value="LookupAgreement"/></request-map>
     <request-map uri="LookupAgreementItem"><security auth="true" https="true"/><response name="success" type="view" value="LookupAgreementItem"/></request-map>
+    <request-map uri="LookupPaymentGroupMember"><security auth="true" https="true"/><response name="success" type="view" value="LookupPaymentGroupMember"/></request-map>
 
 
     <request-map uri="viewprofile"><security https="true" auth="true"/><response name="success" type="view" value="viewprofile"/></request-map>
@@ -2384,6 +2385,7 @@
     <view-map name="LookupShipment" type="screen" page="component://product/widget/facility/LookupScreens.xml#LookupShipment"/>
     <view-map name="LookupAgreement" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupAgreement"/>
     <view-map name="LookupAgreementItem" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupAgreementItem"/>
+    <view-map name="LookupPaymentGroupMember" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupPaymentGroupMember"/>
 
     <!-- PDFs  -->
     <view-map name="InvoicePDF" type="screenfop" page="component://accounting/widget/AccountingPrintScreens.xml#InvoicePDF" content-type="application/pdf" encoding="none"/>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml?rev=792951&r1=792950&r2=792951&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml Fri Jul 10 13:44:55 2009
@@ -242,4 +242,29 @@
         <field name="agreementItemTypeId"><display/></field>
         <field name="currencyUomId"><display/></field>
     </form>
+
+    <form name="lookupPaymentGroupMember" target="LookupPaymentGroupMember" title="" type="single" header-row-style="header-row" default-table-style="basic-table">
+        <field name="paymentGroupId"><text-find/></field>
+        <field name="paymentId"><text-find/></field>
+        <field name="fromDate" title="${uiLabelMap.CommonFromDate}" position="1"><date-time/></field>
+        <field name="thruDate" title="${uiLabelMap.CommonThruDate}" position="2"><date-time/></field>
+        <field name="sequenceNum"><text-find/></field>
+        <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
+        <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="listPaymentGroupMember" list-name="listIt" title="" type="list" target="LookupPaymentGroupMember"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <actions>
+            <service service-name="performFind" result-map="result" result-map-list="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
+                <field-map field-name="entityName" value="PaymentGroupMember"/>
+            </service>
+        </actions>
+        <field name="paymentGroupId" widget-style="buttontext">
+            <hyperlink also-hidden="false" target-type="plain" description="${paymentGroupId}" target="javascript:set_value('${paymentGroupId}')"/>
+        </field>
+        <field name="paymentId"><display/></field>
+        <field name="sequenceNum"><display/></field>        
+    </form>
+
 </forms>
\ No newline at end of file

Modified: ofbiz/trunk/applications/accounting/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/LookupScreens.xml?rev=792951&r1=792950&r2=792951&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/LookupScreens.xml Fri Jul 10 13:44:55 2009
@@ -201,4 +201,30 @@
             </widgets>
         </section>
     </screen>
+    
+    <screen name="LookupPaymentGroupMember">
+        <section>
+            <condition>
+                <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+            </condition>
+            <actions>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <set field="title" value="${uiLabelMap.AccountingLookupPaymentGroupMember}"/>
+                <set field="queryString" from-field="result.queryString"/>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
+                    <decorator-section name="search-options">
+                        <include-form name="lookupPaymentGroupMember" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/>
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="listPaymentGroupMember" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
 </screens>

Modified: ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml?rev=792951&r1=792950&r2=792951&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml Fri Jul 10 13:44:55 2009
@@ -78,7 +78,7 @@
     <form name="ListPaymentGroupMember" type="list" list-name="paymentGroupMembers" target="updatePaymentGroupMember">
         <auto-fields-service service-name="updatePaymentGroupMember"/>
         <field name="paymentGroupId"><hidden/></field>
-        <field name="paymentId"><text size="20"/></field>
+        <field name="paymentId"><display/></field>
         <field name="fromDate"><display/></field>
         <field name="thruDate"><date-time/></field>
         <field name="deleteLink" title="" widget-style="buttontext">
@@ -94,7 +94,8 @@
     <form name="AddPaymentGroupMember" type="single" target="createPaymentGroupMember">
         <auto-fields-service service-name="createPaymentGroupMember"/>
         <field name="paymentGroupId"><hidden/></field>
-        <field name="paymentId"><text size="30"/></field>
+        <field name="paymentId"><lookup target-form-name="LookupPayment"/></field>
+        <field name="fromDate"/>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>
     <form name="PaymentGroupMembers" type="list" list-name="paymentGroupMembers"