Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 19:41:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX dol_openinpopup for virtual card

Browse Source
This commit is contained in:
Laurent Destailleur
2024-10-16 11:42:54 +02:00
parent d527f05041
commit c36ddb0f43
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/main.inc.php
View File

@@ -1639,7 +1639,7 @@ if (!function_exists("llxHeader")) {
print '<body id="mainbody" class="'.$tmpcsstouse.'">'."\n"; print '<body id="mainbody" class="'.$tmpcsstouse.'">'."\n";
// top menu and left menu area // top menu and left menu area
if ((empty($conf->dol_hide_topmenu) || GETPOSTINT('dol_invisible_topmenu')) && !GETPOSTINT('dol_openinpopup')) { if ((empty($conf->dol_hide_topmenu) || GETPOSTINT('dol_invisible_topmenu')) && !GETPOST('dol_openinpopup', 'aZ09')) {
top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring, $help_url); top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring, $help_url);
} }
@@ -3647,7 +3647,7 @@ function main_area($title = '')
{ {
global $conf, $langs, $hookmanager; global $conf, $langs, $hookmanager;
if (empty($conf->dol_hide_leftmenu) && !GETPOST('dol_openinpopup')) { if (empty($conf->dol_hide_leftmenu) && !GETPOST('dol_openinpopup', 'aZ09')) {
print '<div id="id-right">'; print '<div id="id-right">';
} }
@@ -3902,7 +3902,7 @@ if (!function_exists("llxFooter")) {
print '</div> <!-- End div class="fiche" -->'."\n"; // End div fiche print '</div> <!-- End div class="fiche" -->'."\n"; // End div fiche
if (empty($conf->dol_hide_leftmenu) && !GETPOST('dol_openinpopup')) { if (empty($conf->dol_hide_leftmenu) && !GETPOST('dol_openinpopup', 'aZ09')) {
print '</div> <!-- End div id-right -->'."\n"; // End div id-right print '</div> <!-- End div id-right -->'."\n"; // End div id-right
} }

4
htdocs/user/virtualcard.php
View File

@@ -134,7 +134,9 @@ print '<div class="fichecenter">';
print '<br>'; print '<br>';
$param = '&id='.((int) $object->id); $param = '&id='.((int) $object->id);
$param .= '&dol_openinpopup=1'; if (GETPOSTISSET('dol_openinpopup')) {
$param .= '&dol_openinpopup='.urlencode(GETPOST('dol_openinpopup', 'aZ09'));
}
$enabledisablehtml = $langs->trans("EnablePublicVirtualCard").' '; $enabledisablehtml = $langs->trans("EnablePublicVirtualCard").' ';
if (!getDolUserInt('USER_ENABLE_PUBLIC', 0, $object)) { if (!getDolUserInt('USER_ENABLE_PUBLIC', 0, $object)) {