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

Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0

Browse Source
This commit is contained in:
Laurent Destailleur 2023-01-19 13:24:46 +01:00
commit 36fd6e6870
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/action/card.php
View File

@ -2425,7 +2425,7 @@ if ($id > 0) {
$tmpuserstatic = new User($db); $tmpuserstatic = new User($db);
foreach ($object->reminders as $actioncommreminderid => $actioncommreminder) { foreach ($object->reminders as $actioncommreminderid => $actioncommreminder) {
print $TRemindTypes[$actioncommreminder->typeremind]; print $TRemindTypes[$actioncommreminder->typeremind]['label'];
if ($actioncommreminder->fk_user > 0) { if ($actioncommreminder->fk_user > 0) {
$tmpuserstatic->fetch($actioncommreminder->fk_user); $tmpuserstatic->fetch($actioncommreminder->fk_user);
print ' ('.$tmpuserstatic->getNomUrl(0, '', 0, 0, 16).')'; print ' ('.$tmpuserstatic->getNomUrl(0, '', 0, 0, 16).')';

1
htdocs/core/modules/mailings/contacts1.modules.php
View File

@ -314,6 +314,7 @@ class mailing_contacts1 extends MailingTargets
$s .= '<span class="opacitymedium">'.$langs->trans("DefaultLang").':</span> '; $s .= '<span class="opacitymedium">'.$langs->trans("DefaultLang").':</span> ';
$s .= $formadmin->select_language($langs->getDefaultLang(1), 'filter_lang', 0, 0, 1, 0, 0, '', 0, 0, 0, null, 1); $s .= $formadmin->select_language($langs->getDefaultLang(1), 'filter_lang', 0, 0, 1, 0, 0, '', 0, 0, 0, null, 1);
} }
return $s; return $s;
} }

2
htdocs/product/inventory/inventory.php
View File

@ -603,7 +603,7 @@ if ($object->id > 0) {
if ($permissiontoadd) { if ($permissiontoadd) {
// Link to launch scan tool // Link to launch scan tool
if (isModEnabled('barcode') || isModEnabled('productbatch')) { if (isModEnabled('barcode') || isModEnabled('productbatch')) {
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=updatebyscaning" class="marginrightonly paddingright marginleftonly paddingleft">'.img_picto('', 'barcode', 'class="paddingrightonly"').$langs->trans("UpdateByScaning").'</a>'; print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=updatebyscaning&token='.currentToken().'" class="marginrightonly paddingright marginleftonly paddingleft">'.img_picto('', 'barcode', 'class="paddingrightonly"').$langs->trans("UpdateByScaning").'</a>';
} }
// Link to autofill // Link to autofill