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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2023-01-20 19:14:10 +01:00
commit 9a5f19984b
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/admin/fckeditor.php
View File

@ -165,14 +165,14 @@ if (empty($conf->use_javascript_ajax)) {
$constante = 'FCKEDITOR_ENABLE_'.$const; $constante = 'FCKEDITOR_ENABLE_'.$const;
print '<!-- constant = '.$constante.' -->'."\n"; print '<!-- constant = '.$constante.' -->'."\n";
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td width="16">'.img_object("", $picto[$const]).'</td>'; print '<td class="width20">'.img_object("", $picto[$const]).'</td>';
print '<td>'; print '<td>';
print $langs->trans($desc); print $langs->trans($desc);
if ($const == 'DETAILS') { if ($const == 'DETAILS') {
print '<br><span class="warning">'.$langs->trans("FCKeditorForProductDetails2").'</span>'; print '<br><span class="warning">'.$langs->trans("FCKeditorForProductDetails2").'</span>';
} }
print '</td>'; print '</td>';
print '<td class="center centpercent">'; print '<td class="center centpercent width100">';
$value = (isset($conf->global->$constante) ? $conf->global->$constante : 0); $value = (isset($conf->global->$constante) ? $conf->global->$constante : 0);
if ($value == 0) { if ($value == 0) {
print '<a href="'.$_SERVER['PHP_SELF'].'?action=enable_'.strtolower($const).'&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>'; print '<a href="'.$_SERVER['PHP_SELF'].'?action=enable_'.strtolower($const).'&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';

4
htdocs/langs/el_GR/main.lang
View File

@ -7,10 +7,10 @@ DIRECTION=ltr
# To read Chinese pdf with Linux: sudo apt-get install poppler-data # To read Chinese pdf with Linux: sudo apt-get install poppler-data
# cid0jp is for Japanish # cid0jp is for Japanish
# cid0kr is for Korean # cid0kr is for Korean
# DejaVuSans is for some Eastern languages, some Asian languages and some Arabic languages # DejaVuSans is for some Eastern languages, greek, some Asian languages and some Arabic languages
# freemono is for ru_RU or uk_UA, uz_UZ # freemono is for ru_RU or uk_UA, uz_UZ
# freeserif is for Tamil # freeserif is for Tamil
FONTFORPDF=helvetica FONTFORPDF=DejaVuSans
FONTSIZEFORPDF=10 FONTSIZEFORPDF=10
SeparatorDecimal=, SeparatorDecimal=,
SeparatorThousand=. SeparatorThousand=.

4
htdocs/societe/class/societe.class.php
View File

@ -786,6 +786,10 @@ class Societe extends CommonObject
*/ */
public $multicurrency_code; public $multicurrency_code;
/**
* @var string Set if company email found into unsubscribe of emailing list table
*/
public $no_email;
// Fields loaded by fetchPartnerships() // Fields loaded by fetchPartnerships()