svn commit: r1746465 - in /ofbiz/branches/release15.12: applications/order/webapp/ordermgr/quote/ specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ specialpurpose/projectmgr/widget/forms/

[pranayp]

Author: pranayp
Date: Wed Jun  1 13:37:22 2016
New Revision: 1746465

URL: http://svn.apache.org/viewvc?rev=1746465&view=rev
Log:
Manually applied fix from trunk revision 1746460.
---------------------------------------------------------------------

[OFBIZ-7146] Applied patch from the ticket to fix error in rendering Quote PDF which is not having terms associated to it.

Thanks Amardeep Singh Jhajj for reporting the issue and providing patch.
---------------------------------------------------------------------

Modified:
    ofbiz/branches/release15.12/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl
    ofbiz/branches/release15.12/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy
    ofbiz/branches/release15.12/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml

Modified: ofbiz/branches/release15.12/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl?rev=1746465&r1=1746464&r2=1746465&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl (original)
+++ ofbiz/branches/release15.12/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl Wed Jun  1 13:37:22 2016
@@ -74,9 +74,9 @@ under the License.
                     <fo:table-cell><fo:block>${(quote.validThruDate.toString())!}</fo:block></fo:table-cell>
                 </fo:table-row>
                 <fo:table-row>
+                    <fo:table-cell><fo:block>${uiLabelMap.CommonQuoteTerms}:</fo:block></fo:table-cell>
                     <#assign quoteLevelTerms = Static["org.ofbiz.entity.util.EntityUtil"].filterByAnd(quoteTerms, {"quoteItemSeqId": "_NA_"})!>
                     <#if quoteLevelTerms?has_content && quoteLevelTerms.size() gt 0>
-                        <fo:table-cell><fo:block>${uiLabelMap.CommonQuoteTerms}:</fo:block></fo:table-cell>
                         <fo:table-cell>
                             <#list quoteLevelTerms as quoteLevelTerm>
                                 <fo:block>

Modified: ofbiz/branches/release15.12/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy?rev=1746465&r1=1746464&r2=1746465&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy (original)
+++ ofbiz/branches/release15.12/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy Wed Jun  1 13:37:22 2016
@@ -78,6 +78,7 @@ day0Total = 0.00; day1Total=0.00; day2To
 pHours = 0.00;
 timeEntry = null;
 lastTimeEntry = null;
+workEffortId = null;
 
 // retrieve work effort data when the workeffortId has changed.
 void retrieveWorkEffortData() {
@@ -206,3 +207,4 @@ timesheetsDb.each { timesheetDb ->
     timesheets.add(timesheet);
 }
 context.timesheets = timesheets;
+context.workEffortId = workEffortId;
\ No newline at end of file

Modified: ofbiz/branches/release15.12/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=1746465&r1=1746464&r2=1746465&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Wed Jun  1 13:37:22 2016
@@ -206,9 +206,7 @@
     <form name="QuickCreateTimeEntry" target="createQuickTimeEntry" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
         <actions>
-            <entity-one entity-name="WorkEffort">
-                <field-map field-name="workEffortId" from-field=""/>
-            </entity-one>
+            <entity-one entity-name="WorkEffort" value-field="workEffortId"/>
         </actions>
         <field name="timesheetId" map-name="currentTimesheet"><hidden/></field>
         <field name="partyId" map-name="userLogin"><hidden/></field>