From ce94eef99622fddf3b0f579ce5c5b0aad9bce51a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 19 Jan 2011 10:37:59 +0000
Subject: [PATCH] Fix: bug #30386 : Visualisation pour impression incorrect
 pour rapport TVA

---
 htdocs/compta/tva/clients.php       | 11 +++++--
 htdocs/compta/tva/quadri_detail.php |  9 +++++-
 htdocs/main.inc.php                 | 45 +++++++++++++++--------------
 3 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index 7c15b3fa2c8..3d7a0e584d1 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -89,11 +89,16 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
  */
 
 $html=new Form($db);
-
-llxHeader();
-
 $company_static=new Societe($db);
 
+$morequerystring='';
+$listofparams=array('date_startmonth','date_startyear','date_startday','date_endmonth','date_endyear','date_endday');
+foreach($listofparams as $param)
+{
+	if (GETPOST($param)!='') $morequerystring.=($morequerystring?'&':'').$param.'='.GETPOST($param);
+}
+
+llxHeader('','','','',0,0,'','',$morequerystring);
 
 $fsearch.='<br>';
 $fsearch.='  <input type="hidden" name="year" value="'.$year.'">';
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index ed2cee697c4..ae41e7dd2d5 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -95,7 +95,14 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
  * View
  */
 
-llxHeader();
+$morequerystring='';
+$listofparams=array('date_startmonth','date_startyear','date_startday','date_endmonth','date_endyear','date_endday');
+foreach($listofparams as $param)
+{
+	if (GETPOST($param)!='') $morequerystring.=($morequerystring?'&':'').$param.'='.GETPOST($param);
+}
+
+llxHeader('','','','',0,0,'','',$morequerystring);
 
 $html=new Form($db);
 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 05ada4a157b..3e97479ca3a 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -753,22 +753,23 @@ $heightforframes=48;
 
 
 /**
- *		\brief   	Show HTML header HTML + BODY + Top menu + left menu + DIV
- * 		\param   	head			Add optionnal head lines
- * 		\param   	title
- * 		\param      help_url
- * 		\param   	target
- * 		\param   	disablejs
- * 		\param   	disablehead
- * 		\param   	arrayofjs
- * 		\param   	arrayofcss
+ *	Show HTML header HTML + BODY + Top menu + left menu + DIV
+ * 	@param   	head			Add optionnal head lines
+ *  @param      title   		Title of web page
+ * 	@param      help_url		Url links to help page
+ *  @param      target  		Target to use in menu links
+ *	@param		disablejs		Do not output links to js (Ex: qd fonction utilisee par sous formulaire Ajax)
+ *	@param		disablehead		Do not output head section
+ *	@param		arrayofjs		Array of js files to add in header
+ *	@param		arrayofcss		Array of css files to add in header
+ *  @param		morequerystring Query string to add to the link "print" to get same parameters (use only if autodetect fails)
  */
 if (! function_exists("llxHeader"))
 {
-	function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='')
+	function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='')
 	{
 		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);	// Show html headers
-		top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
+		top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring);
 		left_menu('', $help_url, '', '', 1);
 		main_area();
 	}
@@ -932,16 +933,17 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
 
 
 /**
- *  \brief      Show an HTML header + a BODY + The top menu bar
- *  \param      head    	Lines in the HEAD
- *  \param      title   	Title of web page
- *  \param      target  	Target to use in menu links
- *	\param		disablejs	Do not output links to js (Ex: qd fonction utilisee par sous formulaire Ajax)
- *	\param		disablehead	Do not output head section
- *	\param		arrayofjs	Array of js files to add in header
- *	\param		arrayofcss	Array of css files to add in header
+ *  Show an HTML header + a BODY + The top menu bar
+ *  @param      head    		Lines in the HEAD
+ *  @param      title   		Title of web page
+ *  @param      target  		Target to use in menu links
+ *	@param		disablejs		Do not output links to js (Ex: qd fonction utilisee par sous formulaire Ajax)
+ *	@param		disablehead		Do not output head section
+ *	@param		arrayofjs		Array of js files to add in header
+ *	@param		arrayofcss		Array of css files to add in header
+ *  @param		morequerystring	Query string to add to the link "print" to get same parameters (use only if autodetect fails)
  */
-function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='')
+function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='')
 {
 	global $user, $conf, $langs, $db, $dolibarr_main_authentication;
 
@@ -1152,7 +1154,8 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 	// Link to print main content area
 	if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->browser->phone))
 	{
-		$text ='<a href="'.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].'&optioncss=print" target="_blank">';
+		$qs=$_SERVER["QUERY_STRING"].($_SERVER["QUERY_STRING"]?'&':'').$morequerystring;
+		$text ='<a href="'.$_SERVER["PHP_SELF"].'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank">';
 		$text.='<img class="printer" border="0" width="14" height="14" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/printer.png"';
 		$text.=' title="" alt="">';
 		$text.='</a>';