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 16.0

Browse Source
This commit is contained in:
Laurent Destailleur 2023-01-19 10:44:28 +01:00
commit e78f59c8b6
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2213,7 +2213,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).')';

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

@ -122,7 +122,7 @@ class mailing_contacts1 extends MailingTargets
*/ */
public function formFilter() public function formFilter()
{ {
global $langs; global $langs,$conf;
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array("commercial", "companies", "suppliers", "categories")); $langs->loadLangs(array("commercial", "companies", "suppliers", "categories"));
@ -307,11 +307,14 @@ class mailing_contacts1 extends MailingTargets
$s .= ajax_combobox("filter_category_supplier_contact"); $s .= ajax_combobox("filter_category_supplier_contact");
// Choose language // Choose language if multilangue active
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
$formadmin = new FormAdmin($this->db); if (@$conf->global->MAIN_MULTILANGS==1) {
$s .= '<span class="opacitymedium">'.$langs->trans("DefaultLang").':</span> '; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
$s .= $formadmin->select_language($langs->getDefaultLang(1), 'filter_lang', 0, 0, 1, 0, 0, '', 0, 0, 0, null, 1); $formadmin = new FormAdmin($this->db);
$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);
}
return $s; return $s;
} }
@ -409,7 +412,7 @@ class mailing_contacts1 extends MailingTargets
// Filter on language // Filter on language
if (!empty($filter_lang)) { if (!empty($filter_lang)) {
$sql .= " AND sp.default_lang = '".$this->db->escape($filter_lang)."'"; $sql .= " AND sp.default_lang LIKE '".$this->db->escape($filter_lang)."%'";
} }
// Filter on nature // Filter on nature

13
htdocs/core/modules/mailings/thirdparties.modules.php
View File

@ -316,12 +316,13 @@ class mailing_thirdparties extends MailingTargets
$s .= '</select>'; $s .= '</select>';
$s .= ajax_combobox("filter_status_thirdparties"); $s .= ajax_combobox("filter_status_thirdparties");
// Choose language // Choose language if multilangue active
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; if (@$conf->global->MAIN_MULTILANGS==1) {
$formadmin = new FormAdmin($this->db); require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
$s .= '<span class="opacitymedium">'.$langs->trans("DefaultLang").':</span> '; $formadmin = new FormAdmin($this->db);
$s .= $formadmin->select_language($langs->getDefaultLang(1), 'filter_lang_thirdparties', 0, null, 1, 0, 0, '', 0, 0, 0, null, 1); $s .= '<span class="opacitymedium">'.$langs->trans("DefaultLang").':</span> ';
$s .= $formadmin->select_language($langs->getDefaultLang(1), 'filter_lang_thirdparties', 0, null, 1, 0, 0, '', 0, 0, 0, null, 1);
}
return $s; return $s;
} }

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

@ -609,7 +609,7 @@ if ($object->id > 0) {
if ($permissiontoadd) { if ($permissiontoadd) {
// Link to launch scan tool // Link to launch scan tool
if (!empty($conf->barcode->enabled) || !empty($conf->productbatch->enabled)) { if (!empty($conf->barcode->enabled) || !empty($conf->productbatch->enabled)) {
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