From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 6 May 2009 12:43:06 +0000 (+0000)
Subject: Die Felder "transdate" und "reqdate" in "fromdate" und "todate" umbenannt.
X-Git-Tag: release-2.6.0beta2~21
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=fa65335e3fad0e06a6552b2265e8c8aaffa68472;p=kivitendo-erp.git

Die Felder "transdate" und "reqdate" in "fromdate" und "todate" umbenannt.
---

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index c81281443..f14ea6685 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -2848,9 +2848,9 @@ sub show_am_history {
     }
   }
   $restriction .=
-      $form->{transdate} ne "" && $form->{reqdate} ne "" ? qq| AND st.itime::date >= '| . $form->{transdate} . qq|' AND st.itime::date <= '| . $form->{reqdate} . qq|'|
-    : $form->{transdate} ne "" && $form->{reqdate} eq "" ? qq| AND st.itime::date >= '| . $form->{transdate} . qq|'|
-    : $form->{transdate} eq "" && $form->{reqdate} ne "" ? qq| AND st.itime::date <= '| . $form->{reqdate} . qq|'|
+      $form->{fromdate} ne "" && $form->{todate} ne "" ? qq| AND st.itime::date >= '| . $form->{fromdate} . qq|' AND st.itime::date <= '| . $form->{todate} . qq|'|
+    : $form->{fromdate} ne "" && $form->{todate} eq "" ? qq| AND st.itime::date >= '| . $form->{fromdate} . qq|'|
+    : $form->{fromdate} eq "" && $form->{todate} ne "" ? qq| AND st.itime::date <= '| . $form->{todate} . qq|'|
     :                                                        ""
     ;
   $restriction .=
diff --git a/templates/webpages/common/search_history_de.html b/templates/webpages/common/search_history_de.html
index 8bc24a39a..8f8b130af 100644
--- a/templates/webpages/common/search_history_de.html
+++ b/templates/webpages/common/search_history_de.html
@@ -55,11 +55,11 @@
 					var jscalender = "<table valign=\"top\">"
 									+ "<tr><td colspan=\"2\"><b>Zeitraum:&nbsp;</b></td></tr>"
 									+ "<tr><td>von:&nbsp;"
-									+ "<input name=\"transdate\" id=\"transdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(transdate) %]\" onChange=\"document.getElementById(\'transdate_hidden\').value=this.value;\">"
-									+ "<input type=\"button\" name=\"transdate\" id=\"trigger1\" value=\"?\">"
+									+ "<input name=\"fromdate\" id=\"fromdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(fromdate) %]\" onChange=\"document.getElementById(\'fromdate_hidden\').value=this.value;\">"
+									+ "<input type=\"button\" name=\"fromdate\" id=\"trigger1\" value=\"?\">"
 									+ "&nbsp;</td><td>bis:&nbsp;"
-									+ "<input name=\"reqdate\" id=\"reqdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(reqdate) %]\" onChange=\"document.getElementById(\'reqdate_hidden\').value=this.value;\">"
-									+ "<input type=\"button\" name=\"reqdate\" id=\"trigger2\" value=\"?\"></td></tr></table>";
+									+ "<input name=\"todate\" id=\"todate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(todate) %]\" onChange=\"document.getElementById(\'todate_hidden\').value=this.value;\">"
+									+ "<input type=\"button\" name=\"todate\" id=\"trigger2\" value=\"?\"></td></tr></table>";
 					var mitarbeiter = "<table valign=\"top\">"
 									+ "<tr><td><b>Mitarbeiter:</b>&nbsp;</td>"
 									+ "<td><input type='text' name='mitarbeiter' id='mitarbeiter' onChange=\"document.getElementById(\'mitarbeiter_hidden\').value=this.value;\"></td>"
@@ -79,7 +79,7 @@
 
 							Calendar.setup(
       			    		{
-		                      inputField : "transdate",
+		                      inputField : "fromdate",
         		              ifFormat :"%d.%m.%Y",
                 		      align : "BL",
 		                      button : "trigger1"
@@ -87,7 +87,7 @@
 
 		        		    Calendar.setup(
 		          			{
-        		              inputField : "reqdate",
+        		              inputField : "todate",
                 		  	  ifFormat :"%d.%m.%Y",
 		                  	  align : "BL",
         		          	  button : "trigger2"
@@ -172,8 +172,8 @@
 					</tr>
 					<tr>
 						<td colspan="6">
-              <input type="hidden" value="" id="transdate_hidden">
-              <input type="hidden" value="" id="reqdate_hidden">
+              <input type="hidden" value="" id="fromdate_hidden">
+              <input type="hidden" value="" id="todate_hidden">
               <input type="hidden" value="" id="mitarbeiter_hidden">
 							<input type="button" value="abschicken" onClick="javascript:set_history_uri();">
 							<input type="reset" value="zurücksetzen" onClick="javascript:resetAll();">
diff --git a/templates/webpages/common/search_history_master.html b/templates/webpages/common/search_history_master.html
index 6aa176fbb..2bcd7601c 100644
--- a/templates/webpages/common/search_history_master.html
+++ b/templates/webpages/common/search_history_master.html
@@ -55,11 +55,11 @@
 					var jscalender = "<table valign=\"top\">"
 									+ "<tr><td colspan=\"2\"><b><translate>Period</translate>:&nbsp;</b></td></tr>"
 									+ "<tr><td><translate>from (time)</translate>:&nbsp;"
-									+ "<input name=\"transdate\" id=\"transdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(transdate) %]\" onChange=\"document.getElementById(\'transdate_hidden\').value=this.value;\">"
-									+ "<input type=\"button\" name=\"transdate\" id=\"trigger1\" value=\"?\">"
+									+ "<input name=\"fromdate\" id=\"fromdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(fromdate) %]\" onChange=\"document.getElementById(\'fromdate_hidden\').value=this.value;\">"
+									+ "<input type=\"button\" name=\"fromdate\" id=\"trigger1\" value=\"?\">"
 									+ "&nbsp;</td><td><translate>to (time)</translate>:&nbsp;"
-									+ "<input name=\"reqdate\" id=\"reqdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(reqdate) %]\" onChange=\"document.getElementById(\'reqdate_hidden\').value=this.value;\">"
-									+ "<input type=\"button\" name=\"reqdate\" id=\"trigger2\" value=\"?\"></td></tr></table>";
+									+ "<input name=\"todate\" id=\"todate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(todate) %]\" onChange=\"document.getElementById(\'todate_hidden\').value=this.value;\">"
+									+ "<input type=\"button\" name=\"todate\" id=\"trigger2\" value=\"?\"></td></tr></table>";
 					var mitarbeiter = "<table valign=\"top\">"
 									+ "<tr><td><b>Mitarbeiter:</b>&nbsp;</td>"
 									+ "<td><input type='text' name='mitarbeiter' id='mitarbeiter' onChange=\"document.getElementById(\'mitarbeiter_hidden\').value=this.value;\"></td>"
@@ -79,7 +79,7 @@
 
 							Calendar.setup(
       			    		{
-		                      inputField : "transdate",
+		                      inputField : "fromdate",
         		              ifFormat :"%d.%m.%Y",
                 		      align : "BL",
 		                      button : "trigger1"
@@ -87,7 +87,7 @@
 
 		        		    Calendar.setup(
 		          			{
-        		              inputField : "reqdate",
+        		              inputField : "todate",
                 		  	  ifFormat :"%d.%m.%Y",
 		                  	  align : "BL",
         		          	  button : "trigger2"
@@ -172,8 +172,8 @@
 					</tr>
 					<tr>
 						<td colspan="6">
-              <input type="hidden" value="" id="transdate_hidden">
-              <input type="hidden" value="" id="reqdate_hidden">
+              <input type="hidden" value="" id="fromdate_hidden">
+              <input type="hidden" value="" id="todate_hidden">
               <input type="hidden" value="" id="mitarbeiter_hidden">
 							<input type="button" value="<translate>submit</translate>" onClick="javascript:set_history_uri();">
 							<input type="reset" value="<translate>reset</translate>" onClick="javascript:resetAll();">