svn commit: r882535 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.xml webapp/accounting/images/costCenters.js webapp/accounting/ledger/CostCenters.ftl

[ashish-18]

Author: ashish
Date: Fri Nov 20 12:28:10 2009
New Revision: 882535

URL: http://svn.apache.org/viewvc?rev=882535&view=rev
Log:
Applied patch from Mukesh Marathe to remove the error message from costcenter page after short duration.

Steps to reproduce:
Go to - https://localhost:8443/accounting/control/CostCenters

-- Enter the values for cost center 1, 2 and 3 so that the total is not equals to 100.
-- The error appears on click submit, now correct the values in respective fields so total is equals to 100.
-- On click on submit the values save in the DB, but error still shows on the page - remove error message after short duration.

Thanks Mukesh for the contribution.

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/images/costCenters.js
    ofbiz/trunk/applications/accounting/webapp/accounting/ledger/CostCenters.ftl

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=882535&r1=882534&r2=882535&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Fri Nov 20 12:28:10 2009
@@ -8754,6 +8754,9 @@
         <value xml:lang="en">Total amountPercentage is not equal 100.</value>
         <value xml:lang="hi_IN">कुल amountPercentage बराबर 100 नहीं है</value>
     </property>
+    <property key="AccountingTotalCostCenterAmount">
+        <value xml:lang="en">Cost center amount percentage saved successfully</value>
+    </property>
     <property key="AccountingTotalCommissionAmount">
         <value xml:lang="en">Total Commission Amount</value>
         <value xml:lang="hi_IN">कुल दलाली राशी</value>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/images/costCenters.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/images/costCenters.js?rev=882535&r1=882534&r2=882535&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/images/costCenters.js (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/images/costCenters.js Fri Nov 20 12:28:10 2009
@@ -25,7 +25,11 @@
         onSuccess: function(transport) {
             if (transport.responseText == "") {
                 Effect.Appear('errorMessage', {duration: 0.0});
-            }
+                Effect.Fade('errorMessage', {duration: 0.0, delay: 3.0});
+            } else {
+                Effect.Appear('eventMessage', {duration: 0.0});
+                Effect.Fade('eventMessage', {duration: 0.0, delay: 3.0});
+            }
         }, parameters: $('costCenters').serialize(), requestHeaders: {Accept: 'application/json'}
     });
 }

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/ledger/CostCenters.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/ledger/CostCenters.ftl?rev=882535&r1=882534&r2=882535&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/ledger/CostCenters.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/ledger/CostCenters.ftl Fri Nov 20 12:28:10 2009
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -21,6 +20,7 @@
 
   <form id="costCenters" method="post" action="<@ofbizUrl>createUpdateCostCenter</@ofbizUrl>">
     <div id="errorMessage" class="errorMessage" style="display : none">${uiLabelMap.AccountingTotalAmountPercentageIsNotEqualOneHundred}</div>
+    <div id="eventMessage" class="eventMessage" style="display : none">${uiLabelMap.AccountingTotalCostCenterAmount}.</div>
     <input type="hidden" name="_useRowSubmit" value="Y">
     <table class="basic-table hover-bar" cellspacing="0">
       <tr class="header-row">