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

Fix setup of direct print with google docs driver

Browse Source
This commit is contained in:
Laurent Destailleur 2017-11-27 13:55:27 +01:00
parent 43c60ec224
commit 69725fe62f
6 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/oauth.php
View File

@ -86,7 +86,7 @@ print '<input type="hidden" name="action" value="update">';
$head = oauthadmin_prepare_head(); $head = oauthadmin_prepare_head();
dol_fiche_head($head, 'services', '', 0, 'technic'); dol_fiche_head($head, 'services', '', -1, 'technic');
print $langs->trans("ListOfSupportedOauthProviders").'<br><br>'; print $langs->trans("ListOfSupportedOauthProviders").'<br><br>';

2
htdocs/admin/oauthlogintokens.php
View File

@ -118,7 +118,7 @@ print load_fiche_titre($langs->trans('ConfigOAuth'),$linkback,'title_setup');
$head=oauthadmin_prepare_head($mode); $head=oauthadmin_prepare_head($mode);
dol_fiche_head($head, 'tokengeneration', '', 0, 'technic'); dol_fiche_head($head, 'tokengeneration', '', -1, 'technic');
if ($mode == 'setup' && $user->admin) if ($mode == 'setup' && $user->admin)

2
htdocs/core/actions_printing.inc.php
View File

@ -74,7 +74,7 @@ if ($action == 'print_file' and $user->rights->printing->read)
} }
} }
} }
if ($printerfound==0) setEventMessages($langs->trans("NoActivePrintingModuleFound"), null, 'warnings'); if ($printerfound==0) setEventMessages($langs->trans("NoActivePrintingModuleFound", $langs->transnoentities("Module64000Name")), null, 'warnings');
} else { } else {
setEventMessages($langs->trans("NoModuleFound"), null, 'warnings'); setEventMessages($langs->trans("NoModuleFound"), null, 'warnings');
} }

2
htdocs/langs/en_US/printing.lang
View File

@ -9,7 +9,7 @@ PrintingDriverDesc=Configuration variables for printing driver.
ListDrivers=List of drivers ListDrivers=List of drivers
PrintTestDesc=List of Printers. PrintTestDesc=List of Printers.
FileWasSentToPrinter=File %s was sent to printer FileWasSentToPrinter=File %s was sent to printer
NoActivePrintingModuleFound=No active module to print document NoActivePrintingModuleFound=No active driver to print document. Check setup of module %s.
PleaseSelectaDriverfromList=Please select a driver from list. PleaseSelectaDriverfromList=Please select a driver from list.
PleaseConfigureDriverfromList=Please configure the selected driver from list. PleaseConfigureDriverfromList=Please configure the selected driver from list.
SetupDriver=Driver setup SetupDriver=Driver setup

2
htdocs/langs/fr_FR/printing.lang
View File

@ -9,7 +9,7 @@ PrintingDriverDesc=Paramètres de configuration pour le driver d'impression
ListDrivers=Liste des drivers ListDrivers=Liste des drivers
PrintTestDesc=Liste des imprimantes PrintTestDesc=Liste des imprimantes
FileWasSentToPrinter=Le fichier %s a été envoyé à l'imprimante FileWasSentToPrinter=Le fichier %s a été envoyé à l'imprimante
NoActivePrintingModuleFound=Pas de module actif pour imprimer le document NoActivePrintingModuleFound=Pas de module actif pour imprimer le document. Vérifiez la configuration du module %s.
PleaseSelectaDriverfromList=Sélection un driver dans la liste PleaseSelectaDriverfromList=Sélection un driver dans la liste
PleaseConfigureDriverfromList=Configurez le driver sélectionné depuis la liste PleaseConfigureDriverfromList=Configurez le driver sélectionné depuis la liste
SetupDriver=Configuration du driver SetupDriver=Configuration du driver

10
htdocs/printing/admin/printing.php
View File

@ -38,7 +38,7 @@ if (! $user->admin) accessforbidden();
$action = GETPOST('action','alpha'); $action = GETPOST('action','alpha');
$mode = GETPOST('mode','alpha'); $mode = GETPOST('mode','alpha');
$value = GETPOST('value','alpha'); $value = GETPOST('value','alpha',0,null,null,1); // The value may be __google__docs so we force disable of replace
$varname = GETPOST('varname', 'alpha'); $varname = GETPOST('varname', 'alpha');
$driver = GETPOST('driver', 'alpha'); $driver = GETPOST('driver', 'alpha');
@ -123,7 +123,7 @@ if ($mode == 'setup' && $user->admin)
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="setconst">'; print '<input type="hidden" name="action" value="setconst">';
dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), 0, 'technic'); dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
print $langs->trans("PrintingDriverDesc".$driver)."<br><br>\n"; print $langs->trans("PrintingDriverDesc".$driver)."<br><br>\n";
@ -243,7 +243,7 @@ if ($mode == 'setup' && $user->admin)
} }
if ($mode == 'config' && $user->admin) if ($mode == 'config' && $user->admin)
{ {
dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), 0, 'technic'); dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
print $langs->trans("PrintingDesc")."<br><br>\n"; print $langs->trans("PrintingDesc")."<br><br>\n";
@ -296,7 +296,7 @@ if ($mode == 'config' && $user->admin)
if ($mode == 'test' && $user->admin) if ($mode == 'test' && $user->admin)
{ {
dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), 0, 'technic'); dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
print $langs->trans('PrintTestDesc'.$driver)."<br><br>\n"; print $langs->trans('PrintTestDesc'.$driver)."<br><br>\n";
@ -329,7 +329,7 @@ if ($mode == 'test' && $user->admin)
if ($mode == 'userconf' && $user->admin) if ($mode == 'userconf' && $user->admin)
{ {
dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), 0, 'technic'); dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
print $langs->trans('PrintUserConfDesc'.$driver)."<br><br>\n"; print $langs->trans('PrintUserConfDesc'.$driver)."<br><br>\n";