lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: bug #30386 : Visualisation pour impression incorrect pour rapport TVA

Browse Source
This commit is contained in:
Laurent Destailleur 2011-01-19 10:37:59 +00:00
parent b77879d920
commit ce94eef996
3 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/compta/tva/clients.php
View File

@ -89,11 +89,16 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
*/ */
$html=new Form($db); $html=new Form($db);
llxHeader();
$company_static=new Societe($db); $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.='<br>';
$fsearch.=' <input type="hidden" name="year" value="'.$year.'">'; $fsearch.=' <input type="hidden" name="year" value="'.$year.'">';

9
htdocs/compta/tva/quadri_detail.php
View File

@ -95,7 +95,14 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
* View * 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); $html=new Form($db);

45
htdocs/main.inc.php
View File

@ -753,22 +753,23 @@ $heightforframes=48;
/** /**
* \brief Show HTML header HTML + BODY + Top menu + left menu + DIV * Show HTML header HTML + BODY + Top menu + left menu + DIV
* \param head Add optionnal head lines * @param head Add optionnal head lines
* \param title * @param title Title of web page
* \param help_url * @param help_url Url links to help page
* \param target * @param target Target to use in menu links
* \param disablejs * @param disablejs Do not output links to js (Ex: qd fonction utilisee par sous formulaire Ajax)
* \param disablehead * @param disablehead Do not output head section
* \param arrayofjs * @param arrayofjs Array of js files to add in header
* \param arrayofcss * @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")) 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_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); left_menu('', $help_url, '', '', 1);
main_area(); 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 * Show an HTML header + a BODY + The top menu bar
* \param head Lines in the HEAD * @param head Lines in the HEAD
* \param title Title of web page * @param title Title of web page
* \param target Target to use in menu links * @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 disablejs Do not output links to js (Ex: qd fonction utilisee par sous formulaire Ajax)
* \param disablehead Do not output head section * @param disablehead Do not output head section
* \param arrayofjs Array of js files to add in header * @param arrayofjs Array of js files to add in header
* \param arrayofcss Array of css 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; 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 // Link to print main content area
if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->browser->phone)) 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.='<img class="printer" border="0" width="14" height="14" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/printer.png"';
$text.=' title="" alt="">'; $text.=' title="" alt="">';
$text.='</a>'; $text.='</a>';