You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/04/29 09:02:40 UTC
svn commit: r769688 - in /ofbiz/branches/release09.04: ./ mergefromtrunk.bat
specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
Author: jleroux
Date: Wed Apr 29 07:02:39 2009
New Revision: 769688
URL: http://svn.apache.org/viewvc?rev=769688&view=rev
Log:
Applied fix from trunk for revision: 768960 \n
Modified:
ofbiz/branches/release09.04/ (props changed)
ofbiz/branches/release09.04/mergefromtrunk.bat
ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 29 07:02:39 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
+/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
Modified: ofbiz/branches/release09.04/mergefromtrunk.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/mergefromtrunk.bat?rev=769688&r1=769687&r2=769688&view=diff
==============================================================================
--- ofbiz/branches/release09.04/mergefromtrunk.bat (original)
+++ ofbiz/branches/release09.04/mergefromtrunk.bat Wed Apr 29 07:02:39 2009
@@ -6,7 +6,10 @@
svn up
set /p version=version to merge :
set /a prevRev=%version% - 1
+svn log -r %version% > log.tmp
+set /p log = < log.tmp
echo on
svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/trunk
-svn commit -m "Applied fix from trunk for revision: %version%"
+svn commit -m "Applied fix from trunk for revision: %version% \n %log%"
pause
+del log.tmp
Modified: ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=769688&r1=769687&r2=769688&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Wed Apr 29 07:02:39 2009
@@ -112,7 +112,7 @@
</drop-down>
</field>
<field name="fromDate"><date-find/></field>
- <field name="${uiLabelMap.CommonFind}" title="${uiLabelMap.CommonFind}"><submit/></field>
+ <field name="find" title="${uiLabelMap.CommonFind}"><submit/></field>
</form>
<form name="ListFindTimeSheet" type="list" list-name="listIt" paginate-target="FindTimeSheet"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">