Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	.github/workflows/pre-commit.yml
	ChangeLog
	dev/tools/codespell/codespell-lines-ignore.txt
	htdocs/comm/mailing/card.php
	htdocs/contact/card.php
	htdocs/langs/en_US/admin.lang
	htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
This commit is contained in:
Laurent Destailleur
2024-02-07 18:30:10 +01:00
parent 428a1758ad 097290fc38
commit eb4f53665d
48 changed files with 242 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/admin/receiptprinter.php
View File

@@ -392,11 +392,11 @@ if ($mode == 'config' && $user->admin) {
print img_picto($langs->trans("Delete"), 'delete', 'class="paddingright"');
print '</a>';
// test icon
print '<a class="marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=config&action=testprinter&token='.newToken().'&printerid='.$printer->listprinters[$line]['rowid'].'&printername='.urlencode($printer->listprinters[$line]['name']).'">';
print '<a class="marginrightonly nowraponall" href="'.$_SERVER['PHP_SELF'].'?mode=config&action=testprinter&token='.newToken().'&printerid='.$printer->listprinters[$line]['rowid'].'&printername='.urlencode($printer->listprinters[$line]['name']).'">';
print img_picto($langs->trans("TestPrinterDesc"), 'printer', 'class="paddingright paddingleft"').'TXT';
print '</a>';
// test icon
print '<a class="marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=config&action=testprinter2&token='.newToken().'&printerid='.$printer->listprinters[$line]['rowid'].'&printername='.urlencode($printer->listprinters[$line]['name']).'">';
print '<a class="marginrightonly nowraponall" href="'.$_SERVER['PHP_SELF'].'?mode=config&action=testprinter2&token='.newToken().'&printerid='.$printer->listprinters[$line]['rowid'].'&printername='.urlencode($printer->listprinters[$line]['name']).'">';
print img_picto($langs->trans("TestPrinterDesc2"), 'printer', 'class="paddingright paddingleft"').'IMG';
print '</a>';
print '</td>';