diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php index 18a4ca0825f..f04bfd78abd 100644 --- a/htdocs/admin/pdf.php +++ b/htdocs/admin/pdf.php @@ -96,9 +96,9 @@ if ($action == 'update') { dolibarr_set_const($db, "MAIN_PDF_NO_RECIPENT_FRAME", GETPOST("MAIN_PDF_NO_RECIPENT_FRAME"), 'chaine', 0, '', $conf->entity); } - if (GETPOSTISSET('MAIN_PDF_HIDE_SENDER_NAME')) { + /*if (GETPOSTISSET('MAIN_PDF_HIDE_SENDER_NAME')) { dolibarr_set_const($db, "MAIN_PDF_HIDE_SENDER_NAME", GETPOST("MAIN_PDF_HIDE_SENDER_NAME"), 'chaine', 0, '', $conf->entity); - } + }*/ if (GETPOSTISSET('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT')) { dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT", GETPOST("MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT"), 'chaine', 0, '', $conf->entity); @@ -307,6 +307,18 @@ print '
'; print ''; print ''; +// Show sender name + +/* Set option as hidden because no need of this for 99.99% of users. +print ''; +*/ + // Hide VAT Intra on address print ''; - //Invert sender and recipient print ''; -print ''; - -print ''; - // Desc print ''; +// Swicth in Bold + +print ''; + +// Swicth in Bold + +print ''; + // SHOW_SUBPRODUCT_REF_IN_PDF - Option to show the detail of product ref for kits. print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$langs->trans("MAIN_PDF_HIDE_SENDER_NAME").''; +if ($conf->use_javascript_ajax) { + print ajax_constantonoff('MAIN_PDF_HIDE_SENDER_NAME'); +} else { + print $form->selectyesno('MAIN_PDF_HIDE_SENDER_NAME', (!empty($conf->global->MAIN_PDF_HIDE_SENDER_NAME)) ? $conf->global->MAIN_PDF_HIDE_SENDER_NAME : 0, 1); +} +print '
'.$langs->trans("ShowVATIntaInAddress").''; @@ -358,16 +370,6 @@ if ($conf->use_javascript_ajax) { print $form->selectarray("MAIN_PDF_NO_RECIPENT_FRAME", $arrval, $conf->global->MAIN_PDF_NO_RECIPENT_FRAME); } -// Show sender name - -print '
'.$langs->trans("MAIN_PDF_HIDE_SENDER_NAME").''; -if ($conf->use_javascript_ajax) { - print ajax_constantonoff('MAIN_PDF_HIDE_SENDER_NAME'); -} else { - print $form->selectyesno('MAIN_PDF_HIDE_SENDER_NAME', (!empty($conf->global->MAIN_PDF_HIDE_SENDER_NAME)) ? $conf->global->MAIN_PDF_HIDE_SENDER_NAME : 0, 1); -} -print '
'.$langs->trans("SwapSenderAndRecipientOnPDF").''; @@ -506,22 +508,6 @@ if ($conf->use_javascript_ajax) { } print '
'.$langs->trans("BoldLabelOnPDF").''; -if ($conf->use_javascript_ajax) { - print ajax_constantonoff('PDF_BOLD_PRODUCT_LABEL'); -} else { - print $form->selectyesno('PDF_BOLD_PRODUCT_LABEL', (!empty($conf->global->PDF_BOLD_PRODUCT_LABEL)) ? $conf->global->PDF_BOLD_PRODUCT_LABEL : 0, 1); -} -print '
'.$langs->trans("BoldRefAndPeriodOnPDF").''; -if ($conf->use_javascript_ajax) { - print ajax_constantonoff('PDF_BOLD_PRODUCT_REF_AND_PERIOD'); -} else { - print $form->selectyesno('PDF_BOLD_PRODUCT_REF_AND_PERIOD', (!empty($conf->global->PDF_BOLD_PRODUCT_REF_AND_PERIOD)) ? $conf->global->PDF_BOLD_PRODUCT_REF_AND_PERIOD : 0, 1); -} -print '
'.$langs->trans("HideDescOnPDF").''; @@ -542,6 +528,26 @@ if ($conf->use_javascript_ajax) { } print '
'.$langs->trans("BoldLabelOnPDF").''; +if ($conf->use_javascript_ajax) { + print ajax_constantonoff('PDF_BOLD_PRODUCT_LABEL'); +} else { + print $form->selectyesno('PDF_BOLD_PRODUCT_LABEL', (!empty($conf->global->PDF_BOLD_PRODUCT_LABEL)) ? $conf->global->PDF_BOLD_PRODUCT_LABEL : 0, 1); +} +print '
'.$langs->trans("BoldRefAndPeriodOnPDF").''; +if ($conf->use_javascript_ajax) { + print ajax_constantonoff('PDF_BOLD_PRODUCT_REF_AND_PERIOD'); +} else { + print $form->selectyesno('PDF_BOLD_PRODUCT_REF_AND_PERIOD', (!empty($conf->global->PDF_BOLD_PRODUCT_REF_AND_PERIOD)) ? $conf->global->PDF_BOLD_PRODUCT_REF_AND_PERIOD : 0, 1); +} +print '
'.$langs->trans("SHOW_SUBPRODUCT_REF_IN_PDF", $langs->transnoentitiesnoconv("AssociatedProductsAbility"), $langs->transnoentitiesnoconv("Products")).''; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 64c9cf5e0d7..e7f02cafc55 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - admin -BoldRefAndPeriodOnPDF=Bold reference and period in PDF -BoldLabelOnPDF=Bold label in PDF +BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF +BoldLabelOnPDF=Print label of product item in Bold in PDF Foundation=Foundation Version=Version Publisher=Publisher