svn commit: r774663 - in /ofbiz/branches/release09.04: ./ specialpurpose/projectmgr/widget/ProjectScreens.xml

[hansbak-2]

Author: hansbak
Date: Thu May 14 07:06:36 2009
New Revision: 774663

URL: http://svn.apache.org/viewvc?rev=774663&view=rev
Log:
Applied fix from trunk for revision: 774661
 resources not shown after project creation

Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/ProjectScreens.xml

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 14 07:06:36 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661

Modified: ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=774663&r1=774662&r2=774663&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/ProjectScreens.xml Thu May 14 07:06:36 2009
@@ -535,7 +535,7 @@
             <actions>
                 <entity-condition entity-name="WorkEffortPartyAssignView" list="clientAssigns" distinct="true" filter-by-date="true">
                     <condition-list combine="and">
-                        <condition-expr field-name="workEffortId" from-field="parameters.projectId" operator="equals"/>
+                        <condition-expr field-name="workEffortId" from-field="projectId" operator="equals"/>
                         <condition-expr field-name="roleTypeId" value="CLIENT%" operator="like"/>
                         <condition-expr field-name="roleTypeId" value="CLIENT_BILLING" operator="not-equals"/>
                     </condition-list>
@@ -551,7 +551,7 @@
                 </entity-condition>
                 <entity-condition entity-name="WorkEffortPartyAssignView" list="companyAssigns" distinct="true" filter-by-date="true">
                     <condition-list combine="and">
-                        <condition-expr field-name="workEffortId" from-field="parameters.projectId" operator="equals"/>
+                        <condition-expr field-name="workEffortId" from-field="projectId" operator="equals"/>
                         <condition-list combine="or">
                             <condition-expr field-name="roleTypeId" value="INTERNAL_ORGANIZATIO" operator="equals"/>
                             <condition-expr field-name="roleTypeId" value="CLIENT_BILLING" operator="equals"/>