[OFBiz] SVN: r6937 - in trunk/applications/accounting: script/org/ofbiz/accounting/ledger servicedef

[sichen@svn.ofbiz.org]

Author: sichen
Date: 2006-03-07 11:47:27 -0600 (Tue, 07 Mar 2006)
New Revision: 6937

Modified:
   trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml
   trunk/applications/accounting/servicedef/services_ledger.xml
Log:
Create AcctgTransEntry now will lookup baseCurrencyUomId from PartyAcctgPreference

Modified: trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml
===================================================================
--- trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml	2006-03-07 17:45:27 UTC (rev 6936)
+++ trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml	2006-03-07 17:47:27 UTC (rev 6937)
@@ -34,7 +34,7 @@
         
         <set from-field="userLogin.userLoginId" field="newEntity.lastModifiedByUserLogin"/>
         <set from-field="userLogin.userLoginId" field="newEntity.createdByUserLogin"/>
-        
+
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateAcctgTrans" short-description="Update an AcctgTrans">
@@ -73,6 +73,14 @@
         <make-next-seq-id value-name="newEntity" seq-field-name="acctgTransEntrySeqId" numeric-padding="5"/>
         <field-to-result field-name="newEntity.acctgTransEntrySeqId" result-name="acctgTransEntrySeqId"/>
 
+        <!-- if not explicitly provided in the parameters, set the currency of the entry from PartyAcctgPreference -->
+        <if-empty field-name="parameters.currencyUomId">
+        	<entity-one entity-name="PartyAcctgPreference" value-name="partyAcctgPreference" use-cache="true">
+        		<field-map env-name="parameters.organizationPartyId" field-name="partyId"/>
+        	</entity-one>
+        	<set from-field="partyAcctgPreference.baseCurrencyUomId" field="newEntity.currencyUomId"/>
+        </if-empty>
+
         <!-- by default, set the reconciled status of this new entry to not reconciled -->
         <set value="AES_NOT_RECONCILED" field="newEntity.reconcileStatusId"/>
         <create-value value-name="newEntity"/>

Modified: trunk/applications/accounting/servicedef/services_ledger.xml
===================================================================
--- trunk/applications/accounting/servicedef/services_ledger.xml	2006-03-07 17:45:27 UTC (rev 6936)
+++ trunk/applications/accounting/servicedef/services_ledger.xml	2006-03-07 17:47:27 UTC (rev 6937)
@@ -181,7 +181,7 @@
     </service>
     <service name="createAcctgTrans" default-entity-name="AcctgTrans" engine="simple"
             location="org/ofbiz/accounting/ledger/AcctgTransServices.xml" invoke="createAcctgTrans" auth="true">
-        <description>Create a AcctgTrans record</description>
+        <description>Create a AcctgTrans record.  isPosted is forced to "N"</description>
         <implements service="interfaceAcctgTrans"/>
         <auto-attributes include="pk" mode="OUT" optional="false"/>
     </service>
@@ -209,7 +209,7 @@
     </service>
     <service name="createAcctgTransEntry" default-entity-name="AcctgTransEntry" engine="simple"
             location="org/ofbiz/accounting/ledger/AcctgTransServices.xml" invoke="createAcctgTransEntry" auth="true">
-        <description>Add an Entry to a AcctgTrans</description>
+        <description>Add an Entry to a AcctgTrans.  Will use baseCurrencyUomId in PartyAcctgPreference if no currencyUomId is in parameters.</description>
         <implements service="interfaceAcctgTransEntry"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <override name="acctgTransEntrySeqId" mode="OUT"/>