svn commit: r1650977 - in /ofbiz/trunk/applications/accounting: script/org/ofbiz/accounting/budget/BudgetServices.xml servicedef/secas.xml servicedef/services_budget.xml

[nmalin]

Author: nmalin
Date: Sun Jan 11 21:59:33 2015
New Revision: 1650977

URL: http://svn.apache.org/r1650977
Log:
finalize to convert BudgetRole service to entity-auto relative to OFBIZ-5900

Modified:
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/budget/BudgetServices.xml
    ofbiz/trunk/applications/accounting/servicedef/secas.xml
    ofbiz/trunk/applications/accounting/servicedef/services_budget.xml

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/budget/BudgetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/budget/BudgetServices.xml?rev=1650977&r1=1650976&r2=1650977&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/budget/BudgetServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/budget/BudgetServices.xml Sun Jan 11 21:59:33 2015
@@ -68,19 +68,5 @@ under the License.
         </if-not-empty>
     </simple-method>
 
-    <simple-method method-name="createBudgetRole" short-description="Create a Budget Role">
-        <entity-one value-field="partyRole" entity-name="PartyRole"/>
-        <if-empty field="partyRole">
-            <set field="createPartyRole.partyId" from-field="parameters.partyId"/>
-            <set field="createPartyRole.roleTypeId" from-field="parameters.roleTypeId"/>
-            <call-service service-name="createPartyRole" in-map-name="createPartyRole"/>
-            <check-errors/>
-        </if-empty>
-        <make-value value-field="newEntity" entity-name="BudgetRole"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-
 </simple-methods>
 

Modified: ofbiz/trunk/applications/accounting/servicedef/secas.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/secas.xml?rev=1650977&r1=1650976&r2=1650977&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/secas.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/secas.xml Sun Jan 11 21:59:33 2015
@@ -104,6 +104,11 @@ under the License.
         <action service="sendOrderPayRetryNotification" mode="async" persist="true"/>
     </eca>
 
+    <!-- budget role ecas -->
+    <eca service="createBudgetRole" event="invoke">
+        <action service="ensurePartyRole" mode="sync" run-as-user="system"/>
+    </eca>
+
     <!-- financial account role ecas -->
     <eca service="createFinAccountRole" event="invoke">
         <action service="ensurePartyRole" mode="sync" run-as-user="system"/>
@@ -128,7 +133,7 @@ under the License.
         <condition field-name="replenishPaymentId" operator="is-not-empty"/>
         <action service="finAccountReplenish" mode="sync" run-as-user="system"/>
     </eca>
-    
+
     <eca service="createFinAccountTrans" event="commit">
         <condition field-name="glAccountId" operator="is-not-empty"/>
         <action service="postFinAccountTransToGl" mode="sync"/>

Modified: ofbiz/trunk/applications/accounting/servicedef/services_budget.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_budget.xml?rev=1650977&r1=1650976&r2=1650977&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_budget.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_budget.xml Sun Jan 11 21:59:33 2015
@@ -60,8 +60,7 @@ under the License.
         <auto-attributes mode="IN" include="pk" optional="false"/>
     </service>
 
-    <service name="createBudgetRole" default-entity-name="BudgetRole" engine="simple"
-        location="component://accounting/script/org/ofbiz/accounting/budget/BudgetServices.xml" invoke="createBudgetRole">
+    <service name="createBudgetRole" default-entity-name="BudgetRole" engine="entity-auto" invoke="create" auth="true">
         <description>Create a new Budget Role Record</description>
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>