svn commit: r892768 - in /ofbiz/trunk/applications/order/script/org/ofbiz/order: order/OrderServices.xml requirement/RequirementServices.xml

[jonesde]

Author: jonesde
Date: Mon Dec 21 11:24:20 2009
New Revision: 892768

URL: http://svn.apache.org/viewvc?rev=892768&view=rev
Log:
A few improvements to the createRequirement and createOrderHeader services to automatically fill in more of the available and commonly tracked information

Modified:
    ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=892768&r1=892767&r2=892768&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml Mon Dec 21 11:24:20 2009
@@ -523,6 +523,8 @@
     </simple-method>
 
     <simple-method method-name="createOrderHeader" short-description="Create OrderHeader">
+        <now-timestamp field="nowTimestamp"/>
+
         <set value="Create OrderHeader" field="operationName"/>
         <check-permission permission="ORDERMGR" action="_CREATE">
             <fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunCreateOrderShipment"/>
@@ -530,6 +532,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="OrderHeader"/>
+        
         <if-not-empty field="parameters.orderId">
             <set field="newEntity.orderId" from-field="parameters.orderId"/>
         <else>
@@ -537,8 +540,19 @@
         </else>
         </if-not-empty>
         <field-to-result field="newEntity.orderId" result-name="orderId"/>
+        
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
+        <if-empty field="newEntity.statusId">
+            <set field="newEntity.statusId" value="ORDER_CREATED"/>
+        </if-empty>
+        <if-empty field="newEntity.orderDate">
+            <set field="newEntity.orderDate" from-field="nowTimestamp"/>
+        </if-empty>
+        <if-empty field="newEntity.entryDate">
+            <set field="newEntity.entryDate" from-field="nowTimestamp"/>
+        </if-empty>
+        
         <create-value value-field="newEntity"/>
     </simple-method>
     <simple-method method-name="updateOrderHeader" short-description="Update OrderHeader">

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml?rev=892768&r1=892767&r2=892768&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml Mon Dec 21 11:24:20 2009
@@ -23,14 +23,16 @@
     <simple-method method-name="createRequirement" short-description="Create a new requirement">
         <make-value value-field="newEntity" entity-name="Requirement"/>
         <sequenced-id sequence-name="Requirement" field="requirementId"/>
-        <to-string field="requirementId"/>
-        <set from-field="requirementId" field="newEntity.requirementId"/>
+        <set field="newEntity.requirementId" from-field="requirementId"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="parameters.statusId">
             <set value="REQ_CREATED" field="newEntity.statusId"/>
         </if-empty>
         <now-timestamp field="nowTimestamp"/>
-        <set from-field="nowTimestamp" field="newEntity.createdDate"/>
+        <set field="newEntity.createdDate" from-field="nowTimestamp"/>
+        <set field="newEntity.lastModifiedDate" from-field="nowTimestamp"/>
+        <set field="newEntity.createdByUserLogin" from-field="userLogin.userLoginId"/>
+        <set field="newEntity.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/>
         <create-value value-field="newEntity"/>
         <field-to-result field="requirementId" result-name="requirementId"/>
     </simple-method>
@@ -42,6 +44,9 @@
         <clone-value value-field="lookedUpValue" new-value-field="savedValue"/>
         <field-to-result field="lookedUpValue.statusId" result-name="oldStatusId"/>
         <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
+        <now-timestamp field="nowTimestamp"/>
+        <set field="newEntity.lastModifiedDate" from-field="nowTimestamp"/>
+        <set field="newEntity.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/>
         <store-value value-field="lookedUpValue"/>
     </simple-method>