svn commit: r1129029 - in /ofbiz/trunk/applications/accounting/webapp: accounting/WEB-INF/controller.xml ap/WEB-INF/controller.xml ap/invoices/CommissionRun.ftl

[hansbak-2]

Author: hansbak
Date: Mon May 30 07:35:56 2011
New Revision: 1129029

URL: http://svn.apache.org/viewvc?rev=1129029&view=rev
Log:
move the commission run rquest to the accounting controller (AP still works) and fix submit button which did not work with jquery

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
    ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml
    ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionRun.ftl

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=1129029&r1=1129028&r2=1129029&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Mon May 30 07:35:56 2011
@@ -2489,6 +2489,12 @@ under the License.
         <security https="true" auth="true"/>
         <response name="success" type="view" value="CommissionRun"/>
     </request-map>
+    
+    <request-map uri="processCommissionRun">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createCommissionInvoices"/>
+        <response name="success" type="view" value="CommissionRun"/>
+    </request-map>
 
     <!--Add Tax Settings -->
     <request-map uri="addtax">

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=1129029&r1=1129028&r2=1129029&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml Mon May 30 07:35:56 2011
@@ -48,11 +48,6 @@ under the License.
         <response name="success" type="request" value="PaymentGroupOverview"/>
         <response name="error" type="view" value="FindPurchaseInvoices"/>
     </request-map>
-    <request-map uri="processCommissionRun">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="createCommissionInvoices"/>
-        <response name="success" type="view" value="CommissionRun"/>
-    </request-map>
     <request-map uri="findInvoices">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="FindApInvoices"/>

Modified: ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionRun.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionRun.ftl?rev=1129029&r1=1129028&r2=1129029&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionRun.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionRun.ftl Mon May 30 07:35:56 2011
@@ -65,10 +65,11 @@ function enableSubmitButton() {
     } else {
         jQuery('#checkAllInvoices').attr('checked', false);
     }
-    if (!isSingle && jQuery('#serviceName').val() != "")
-        jQuery('#submitButton').attr('disabled', '');
-    else
+    if (!isSingle && jQuery('#serviceName').val() != "") {
+        jQuery('#submitButton').removeAttr("disabled");
+    } else {
         jQuery('#submitButton').attr('disabled', 'disabled');
+    }
 }
 
 -->