diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index d59e2279435..90bb3f5bb1c 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -314,7 +314,7 @@ print load_fiche_titre($langs->trans("PDFAddressForging"), '', '');
print '
';
print '
';
-print '| '.$langs->trans("Parameter").' | '.$langs->trans("Value").' |
';
+print '| '.$langs->trans("Parameter").' | |
';
// Show sender name
@@ -378,6 +378,7 @@ if ($conf->use_javascript_ajax) {
$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
print $form->selectarray("MAIN_PDF_NO_RECIPENT_FRAME", $arrval, $conf->global->MAIN_PDF_NO_RECIPENT_FRAME);
}
+print '';
//Invert sender and recipient
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index fe4bdf42d79..79f6f578e5f 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -208,10 +208,16 @@ if (!defined('NOREQUIREDB') && !defined('NOREQUIRESOC')) {
$mysoc = new Societe($db);
$mysoc->setMysoc($conf);
- // For some countries, we need to invert our address with customer address
+ // We set some specific default values according to country
+
if ($mysoc->country_code == 'DE' && !isset($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+ // For DE, we need to invert our address with customer address
$conf->global->MAIN_INVERT_SENDER_RECIPIENT = 1;
}
+ if ($mysoc->country_code == 'FR' && !isset($conf->global->MAIN_PROFID1_IN_ADDRESS)) {
+ // For FR, default value of option to show profid SIRET is on by default
+ $conf->global->MAIN_PROFID1_IN_ADDRESS = 1;
+ }
}