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

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

Browse Source 
Conflicts:
	htdocs/public/notice.php
This commit is contained in:
Laurent Destailleur
2020-06-19 00:45:06 +02:00
parent a607ff4c1a 623a9db4e7
commit 01914980d9
6 changed files with 86 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/barcode/codeinit.php
View File

@@ -184,7 +184,7 @@ llxHeader('', $langs->trans("MassBarcodeInit"));
print load_fiche_titre($langs->trans("MassBarcodeInit"), '', 'title_setup.png');
print '<br>';
print $langs->trans("MassBarcodeInitDesc").'<br>';
print '<span class="opacitymedium">'.$langs->trans("MassBarcodeInitDesc").'</span><br>';
print '<br>';
//print img_picto('','puce').' '.$langs->trans("PrintsheetForOneBarCode").'<br>';
@@ -302,6 +302,12 @@ if ($conf->product->enabled || $conf->product->service)
}
print load_fiche_titre($langs->trans("BarCodePrintsheet"), '', 'generic');
print '<br>'."\n";
print $langs->trans("ClickHereToGoTo").' : <a href="'.DOL_URL_ROOT.'/barcode/printsheet.php">'.$langs->trans("BarCodePrintsheet").'</a>';
print '</form>';
print '<br>';