svn commit: r797755 - in /ofbiz/trunk/applications/accounting: script/org/ofbiz/accounting/payment/PaymentServices.xml webapp/accounting/reports/DepositSlip.fo.ftl webapp/ar/payment/batchPayments.ftl widget/PaymentGroupForms.xml

[apatel-2]

Author: apatel
Date: Sat Jul 25 11:47:24 2009
New Revision: 797755

URL: http://svn.apache.org/viewvc?rev=797755&view=rev
Log:
Set Payment batch name to default value if not passed. Deposit slip is better formatted, Showing Payment information in list of PaymentGroupMember list.

Modified:
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl
    ofbiz/trunk/applications/accounting/webapp/ar/payment/batchPayments.ftl
    ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=797755&r1=797754&r2=797755&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Sat Jul 25 11:47:24 2009
@@ -588,6 +588,9 @@
             <now-timestamp field="parameters.fromDate"/>
         </if-empty>
         <set-service-fields service-name="createPaymentGroup" map="parameters" to-map="createPaymentGroupMap"/>
+        <if-empty field="parameters.paymentGroupName">
+            <set field="createPaymentGroupMap.paymentGroupName" value="Payment Group Name"/>
+        </if-empty>
         <call-service service-name="createPaymentGroup" in-map-name="createPaymentGroupMap">
             <result-to-field result-name="paymentGroupId"/>
             <result-to-result result-name="paymentGroupId"/>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl?rev=797755&r1=797754&r2=797755&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl Sat Jul 25 11:47:24 2009
@@ -28,11 +28,11 @@
     <fo:block><fo:leader/></fo:block>
     <fo:block space-after.optimum="10pt" font-size="10pt">
         <fo:table>
+            <fo:table-column column-width="75pt"/>
             <fo:table-column column-width="100pt"/>
-            <fo:table-column column-width="100pt"/>
-            <fo:table-column column-width="100pt"/>
-            <fo:table-column column-width="100pt"/>
-            <fo:table-column column-width="100pt"/>
+            <fo:table-column column-width="135pt"/>
+            <fo:table-column column-width="150pt"/>
+            <fo:table-column column-width="60pt"/>
             <fo:table-header>
                 <fo:table-row font-weight="bold">
                     <fo:table-cell padding="2pt" background-color="#D4D0C8" border="1pt solid" border-width=".1mm">
@@ -126,4 +126,4 @@
             </fo:table-body>
         </fo:table>
     </fo:block>
-</#escape>
\ No newline at end of file
+</#escape>

Modified: ofbiz/trunk/applications/accounting/webapp/ar/payment/batchPayments.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ar/payment/batchPayments.ftl?rev=797755&r1=797754&r2=797755&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ar/payment/batchPayments.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/ar/payment/batchPayments.ftl Sat Jul 25 11:47:24 2009
@@ -64,13 +64,6 @@
         $('showPaymentRunningTotal').update("");
     }
 }
-function enableSubmitButton() {
-    if ($('paymentGroupName').value == "") {
-        $('submitButton').disabled = true;
-    } else {
-        $('submitButton').disabled = false;
-    }
-}
 // -->
 
 </script>
@@ -80,7 +73,7 @@
             <#if paymentList?has_content>
                 <div>
                     <span class="label">${uiLabelMap.AccountingPayment} ${uiLabelMap.PartyPartyGroupName}</span>
-                    <input type="text" size='25' id="paymentGroupName" name='paymentGroupName' onchange="javascript:enableSubmitButton();">
+                    <input type="text" size='25' id="paymentGroupName" name='paymentGroupName'>
                     <input type="hidden" name='organizationPartyId' value="${organizationPartyId?if_exists}">
                     <input type="hidden" name='paymentGroupTypeId' value="BATCH_PAYMENT">
                 </div>
@@ -118,7 +111,7 @@
                         </tr>
                     </#list>
                     <div align="right">
-                        <input id="submitButton" type="submit" value="${uiLabelMap.AccountingCreateBatch}" disabled/>
+                        <input id="submitButton" type="submit" value="${uiLabelMap.AccountingCreateBatch}"/>
                     <div>
                 </table>
             <#else>

Modified: ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml?rev=797755&r1=797754&r2=797755&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml Sat Jul 25 11:47:24 2009
@@ -104,12 +104,21 @@
     </form>
     <form name="PaymentGroupMembers" type="list" list-name="paymentGroupMembers"
             odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <row-actions>
+            <entity-one entity-name="Payment" value-field="payment"/>
+            <set field="statusId" from-field="payment.statusId"/>
+            <set field="amount" from-field="payment.amount"/>
+            <set field="paymentTypeId" from-field="payment.paymentTypeId"/>
+        </row-actions>
         <field name="paymentId">
             <hyperlink target="paymentOverview" description="${paymentId}">
                 <parameter param-name="paymentId"/>
             </hyperlink>
         </field>
+        <field name="paymentTypeId"><display-entity entity-name="PaymentType" description="${description}"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem"/></field>
+        <field name="amount"><display also-hidden="false" type="currency" currency="${currencyUomId}"/></field>
         <field name="fromDate"><display/></field>
         <field name="thruDate"><display/></field>
     </form>
-</forms>
\ No newline at end of file
+</forms>