svn commit: r805456 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.xml script/org/ofbiz/accounting/finaccount/FinAccountServices.xml

[apatel-2]

Author: apatel
Date: Tue Aug 18 15:36:06 2009
New Revision: 805456

URL: http://svn.apache.org/viewvc?rev=805456&view=rev
Log:
Adding check so user cannot add approved fin account transaction to GlReconciliation.

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=805456&r1=805455&r2=805456&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Tue Aug 18 15:36:06 2009
@@ -4540,6 +4540,9 @@
         <value xml:lang="it">Istanza del prodotto</value>
         <value xml:lang="zh">产品标识实例</value>
     </property>
+    <property key="AccountingInvalidGlReconciliationAssignment">
+        <value xml:lang="en">Invalid Gl Reconciliation Assignement: You can not assign FinAccountTrans in Approved or Cancel Status. FinAccount Transaction need to be in Created status only.</value>
+    </property>
     <property key="AccountingInventoryValuation">
         <value xml:lang="en">Inventory Valuation</value>
         <value xml:lang="hi_IN">वस्तु मूल्यांकन</value>

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml?rev=805456&r1=805455&r2=805456&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml Tue Aug 18 15:36:06 2009
@@ -906,7 +906,13 @@
 
     <simple-method method-name="assignGlRecToFinAccTrans" short-description="Assignment of Gl Reconciliation to Fin Account Trans">
         <entity-one entity-name="FinAccountTrans" value-field="finAccountTrans"/>
-        <set field="finAccountTrans.glReconciliationId" from-field="parameters.glReconciliationId"/>
-        <store-value value-field="finAccountTrans"/>
+        <if-compare field="finAccountTrans.statusId" operator="not-equals" value="FINACT_TRNS_CREATED">
+            <add-error><fail-property resource="AccountingUiLabels" property="AccountingInvalidGlReconciliationAssignment"/></add-error>
+            <check-errors/>
+        <else>
+            <set field="finAccountTrans.glReconciliationId" from-field="parameters.glReconciliationId"/>
+            <store-value value-field="finAccountTrans"/>
+        </else>
+        </if-compare>
     </simple-method>
 </simple-methods>