diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php index 7bd46ac9684..f75bf57a972 100644 --- a/htdocs/admin/pdf.php +++ b/htdocs/admin/pdf.php @@ -135,6 +135,12 @@ if ($action == 'edit') // Edit print ''; print ''; + // Hide VAT Intra on address + $var=!$var; + print ''; + // Show prof id 1 in address into pdf $var=!$var; if (! $noCountryCode) @@ -223,12 +229,6 @@ if ($action == 'edit') // Edit print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))?$conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT:0,1); print ''; - // Hide Tva Intra on adress - $var=!$var; - print ''; - //Desc $var=!$var; print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$langs->trans("ShowVATIntaInAddress").''; + print $form->selectyesno('MAIN_TVAINTRA_NOT_IN_ADDRESS',(! empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))?$conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS:0,1); + print '
'.$langs->trans("ShowVATIntaInAddress").''; - print $form->selectyesno('MAIN_TVAINTRA_NOT_IN_ADDRESS',(! empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))?$conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS:0,1); - print '
'.$langs->trans("HideDescOnPDF").''; @@ -303,6 +303,12 @@ else // Show print ''; print ''; + // Hide Intra VAT on address + $var=!$var; + print ''; + // Show prof id 1 in address into pdf $var=!$var; if (! $noCountryCode) @@ -386,13 +392,6 @@ else // Show print ''; - // Hide any PDF informations - $var=!$var; - print ''; - - // Encrypt and protect PDF $var=!$var; print ""; @@ -421,11 +420,11 @@ else // Show print ""; print ''; - // Hide Tva Intra on adress - $var=!$var; - print ''; + // Hide any PDF informations + $var=!$var; + print ''; //Desc $var=!$var;
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$langs->trans("ShowVATIntaInAddress").''; + print yn($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS,1); + print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$langs->trans("HideAnyVATInformationOnPDF").''; - print yn($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT,1); - print '
'.$langs->trans("ShowVATIntaInAddress").''; - print yn($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS,1); - print '
'.$langs->trans("HideAnyVATInformationOnPDF").''; + print yn($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT,1); + print '