svn commit: r1744931 - in /ofbiz/branches/release14.12/specialpurpose/projectmgr: script/org/ofbiz/project/ProjectServices.xml widget/forms/ProjectForms.xml

[pranayp]

Author: pranayp
Date: Sat May 21 12:53:05 2016
New Revision: 1744931

URL: http://svn.apache.org/viewvc?rev=1744931&view=rev
Log:
Applied fix from trunk revision 1744929.
---------------------------------------------------------------------

[OFBIZ-7003] Applied patch from the ticket. Fixed error on console when 
accessing project manager.

Thanks James Yong for reporting the issue, thanks Montalbano Florian for review 
and comment and thanks Chandan Khandelwal for providing the patch.
---------------------------------------------------------------------

Modified:
    
ofbiz/branches/release14.12/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
    
ofbiz/branches/release14.12/specialpurpose/projectmgr/widget/forms/ProjectForms.xml

Modified: 
ofbiz/branches/release14.12/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=1744931&r1=1744930&r2=1744931&view=diff
==============================================================================
--- 
ofbiz/branches/release14.12/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
 (original)
+++ 
ofbiz/branches/release14.12/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
 Sat May 21 12:53:05 2016
@@ -1197,7 +1197,7 @@
                 </calcop>
             </calculate>
             <else>
-                <set field="actualNonBilledHours" 
from-field="totalOriginalHours" type="Double"/>
+                <set field="actualNonBilledHours" 
from-field="totalOriginalHours" default-value="0" type="Double"/>
             </else>
         </if-not-empty>
         <set field="highInfo.actualNonBilledHours" 
from-field="actualNonBilledHours" type="Double"/>

Modified: 
ofbiz/branches/release14.12/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=1744931&r1=1744930&r2=1744931&view=diff
==============================================================================
--- 
ofbiz/branches/release14.12/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
 (original)
+++ 
ofbiz/branches/release14.12/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
 Sat May 21 12:53:05 2016
@@ -206,7 +206,7 @@
         <field name="actualCompletionDate" 
title="${uiLabelMap.FormFieldTitle_actualCompletionDate}"><display 
type="date"/></field>
         <field name="plannedHours" 
title="${uiLabelMap.ProjectMgrPlannedHours}"><display/></field>
         <field name="actualHours" 
title="${uiLabelMap.ProjectMgrActualHours}"><display/></field>
-        <field name="actualNonBilledTotalHours" 
title="${uiLabelMap.ProjectMgrNonBilledActualHours}"><display 
description="${bsh:isBillable&amp;&amp;actualNonBilledTotalHours!=void?actualNonBilledTotalHours:&quot;&quot;}"/></field>
+        <field name="actualNonBilledHours" 
title="${uiLabelMap.ProjectMgrNonBilledActualHours}"><display 
description="${groovy:isBillable&amp;&amp;actualNonBilledHours!=void?actualNonBilledHours:&quot;&quot;}"/></field>
         <field name="createdStamp" 
title="${uiLabelMap.FormFieldTitle_createdDate}"><display type="date"/></field>
     </form>
     <form name="EditSubProjects" list-name="projects" type="list" 
target="RemoveSubProject"