Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-16 22:41:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix lang and erreur

Browse Source
This commit is contained in:
BB2A Anthony Berton
2022-01-26 18:46:51 +01:00
parent b9cd22c60a
commit fea897f323
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/admin/pdf.php
View File

@@ -548,13 +548,14 @@ if ($conf->use_javascript_ajax) {
} }
// Invert alias and name thirdparty // Invert alias and name thirdparty
if (!empty($conf->global->PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME)) {
print '<tr class="oddeven"><td>'.$langs->trans("PDF_INVERT_ALIAS_NAME_THIRDPARTY").'</td><td>'; print '<tr class="oddeven"><td>'.$langs->trans("PDF_INVERT_ALIAS_NAME_THIRDPARTY").'</td><td>';
if ($conf->use_javascript_ajax) { if ($conf->use_javascript_ajax) {
print ajax_constantonoff('PDF_INVERT_ALIAS_NAME_THIRDPARTY'); print ajax_constantonoff('PDF_INVERT_ALIAS_NAME_THIRDPARTY');
} else { } else {
$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes")); $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
print $form->selectarray("PDF_INVERT_ALIAS_NAME_THIRDPARTY", $arrval, $conf->global->PDF_INVERT_ALIAS_NAME_THIRDPARTY); print $form->selectarray("PDF_INVERT_ALIAS_NAME_THIRDPARTY", $arrval, $conf->global->PDF_INVERT_ALIAS_NAME_THIRDPARTY);
}
} }
// Show online payment link on invoices // Show online payment link on invoices

6
htdocs/core/lib/pdf.lib.php
View File

@@ -395,10 +395,8 @@ function pdfBuildThirdpartyName($thirdparty, Translate $outputlangs, $includeali
if (($includealias || !empty($conf->global->PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME)) && !empty($thirdparty->name_alias)) { if (($includealias || !empty($conf->global->PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME)) && !empty($thirdparty->name_alias)) {
$socname .= " - ".$thirdparty->name_alias; $socname .= " - ".$thirdparty->name_alias;
if ($conf->global->PDF_INVERT_ALIAS_NAME_THIRDPARTY) { if ($conf->global->PDF_INVERT_ALIAS_NAME_THIRDPARTY) {
$socname = $thirdparty->name_alias." - ".$socname; $socname = '';
if ($conf->global->PDF_INVERT_ALIAS_NAME_THIRDPARTY) { $socname = $thirdparty->name_alias." - ".$thirdparty->name;
$socname = $thirdparty->name_alias." - ".$socname;
}
} }
} }
} elseif ($thirdparty instanceof Contact) { } elseif ($thirdparty instanceof Contact) {

2
htdocs/langs/en_US/admin.lang
View File

@@ -2141,7 +2141,7 @@ EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
PDF_SHOW_PROJECT=Show project on document PDF_SHOW_PROJECT=Show project on document
ShowProjectLabel=Project Label ShowProjectLabel=Project Label
PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME = Include alias in thirdparty name PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME = Include alias in thirdparty name
PDF_INVERT_ALIAS_NAME_THIRDPARTY = Invet name and alias PDF_INVERT_ALIAS_NAME_THIRDPARTY = Invert name and alias
PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF. PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF
FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book. FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.