svn commit: r1581386 - in /ofbiz/trunk: applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml specialpurpose/scrum/templates/CancelledBacklogNotification.ftl

[ja...@apache.org]

Author: jacopoc
Date: Tue Mar 25 15:53:20 2014
New Revision: 1581386

URL: http://svn.apache.org/r1581386
Log:
Fixed warning due to missing entity fields generated by imperfections in unit tests; thanks to Adrian Crum for the report OFBIZ-5168

Modified:
    ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml
    ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml
    ofbiz/trunk/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl

Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml?rev=1581386&r1=1581385&r2=1581386&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml (original)
+++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml Tue Mar 25 15:53:20 2014
@@ -996,7 +996,7 @@ under the License.
         </entity-condition>
         <first-from-list entry="productionRunHeader" list="workEfforts"/>
         <entity-and list="productionRunTasks" entity-name="WorkEffort">
-            <field-map field-name="workEffortParentId" from-field="productionRunHeader.productionRunId"/>
+            <field-map field-name="workEffortParentId" from-field="productionRunHeader.workEffortId"/>
         </entity-and>
         <first-from-list entry="productionRunTask" list="productionRunTasks"/>
 
@@ -1011,7 +1011,7 @@ under the License.
         </assert>
 
         <entity-and list="productionRunProducts" entity-name="WorkEffortGoodStandard">
-            <field-map field-name="workEffortId" from-field="productionRunId"/>
+            <field-map field-name="workEffortId" from-field="productionRunHeader.workEffortId"/>
         </entity-and>
         <first-from-list entry="productionRunProduct" list="productionRunProducts"/>
 

Modified: ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml?rev=1581386&r1=1581385&r2=1581386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml Tue Mar 25 15:53:20 2014
@@ -2617,7 +2617,6 @@
                     <set field="createCustRequestInMap.custRequestTypeId" value="RF_PARENT_BACKLOG"/>
                     <set field="createCustRequestInMap.statusId" value="CRQ_DRAFT"/>
                     <set field="createCustRequestInMap.fromPartyId" value="_NA_"/>
-                    <set field="createCustRequestInMap.requesterId" value="_NA_"/>
                     <set field="createCustRequestInMap.userLogin" from-field="userlogin"/>
                     <call-service service-name="createCustRequest" in-map-name="createCustRequestInMap">
                         <result-to-field result-name="custRequestId"/>

Modified: ofbiz/trunk/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl?rev=1581386&r1=1581385&r2=1581386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl (original)
+++ ofbiz/trunk/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl Tue Mar 25 15:53:20 2014
@@ -25,7 +25,6 @@ under the License.
         <p>Hello ${person.firstName?if_exists} ${person.lastName?if_exists},</p>
         <p>Your Customer Request <b>${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] </b> <#if informationMap.workEffortId?has_content>in sprint <b>${informationMap.workEffortName?if_exists} [${informationMap.workEffortId?if_exists}]</b></#if> 
             <#if informationMap.productId?has_content>of the product <b>${informationMap.internalName?if_exists} [${informationMap.productId?if_exists}]</#if></b> has been CANCELLED.
-        <p>Your Reference: ${custRequest.requesterId?if_exists}</p>
         <p>Reason for Cancellation: ${custRequest.reason?if_exists}</p>
         <br />
         <br />