diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php index 001ae9e051c..8dd44b0eb98 100644 --- a/htdocs/admin/index.php +++ b/htdocs/admin/index.php @@ -42,8 +42,8 @@ if (isset($_POST["action"]) && $_POST["action"] == 'update') dolibarr_set_const($db, "MAIN_MONNAIE",$_POST["currency"]); dolibarr_set_const($db, "MAIN_INFO_CAPITAL",$_POST["capital"]); - dolibarr_set_const($db, "MAIN_INFO_SIRET",$_POST["siret"]); dolibarr_set_const($db, "MAIN_INFO_SIREN",$_POST["siren"]); + dolibarr_set_const($db, "MAIN_INFO_SIRET",$_POST["siret"]); dolibarr_set_const($db, "MAIN_INFO_APE",$_POST["ape"]); dolibarr_set_const($db, "MAIN_INFO_TVAINTRA",$_POST["tva"]); @@ -108,13 +108,13 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') if ($langs->transcountry("ProfId1",$code_pays) != '-') { print ''.$langs->transcountry("ProfId1",$code_pays).''; - print ''; + print ''; } if ($langs->transcountry("ProfId2",$code_pays) != '-') { print ''.$langs->transcountry("ProfId2",$code_pays).''; - print ''; + print ''; } if ($langs->transcountry("ProfId3",$code_pays) != '-') @@ -175,13 +175,13 @@ else if ($langs->transcountry("ProfId1",$code_pays) != '-') { print ''.$langs->transcountry("ProfId1",$code_pays).''; - print MAIN_INFO_SIRET . ''; + print MAIN_INFO_SIREN . ''; } if ($langs->transcountry("ProfId2",$code_pays) != '-') { print ''.$langs->transcountry("ProfId2",$code_pays).''; - print MAIN_INFO_SIREN . ''; + print MAIN_INFO_SIRET . ''; } if ($langs->transcountry("ProfId3",$code_pays) != '-') diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index dda384bad37..7518a9d8572 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -717,7 +717,10 @@ class pdf_crabe extends ModelePDFFactures $ligne="SARL au Capital de " . MAIN_INFO_CAPITAL." ".$conf->monnaie; } if (defined('MAIN_INFO_SIREN') && MAIN_INFO_SIREN) { - $ligne.=($ligne?" - ":"").$langs->transcountry("ProfId2",$this->code_pays).": ".MAIN_INFO_SIREN; + $ligne.=($ligne?" - ":"").$langs->transcountry("ProfId1",$this->code_pays).": ".MAIN_INFO_SIREN; + } + if (defined('MAIN_INFO_SIRET') && MAIN_INFO_SIRET) { + $ligne.=($ligne?" - ":"").$langs->transcountry("ProfId2",$this->code_pays).": ".MAIN_INFO_SIRET; } if (defined('MAIN_INFO_RCS') && MAIN_INFO_RCS) { $ligne.=($ligne?" - ":"").$langs->transcountry("ProfId4",$this->code_pays).": ".MAIN_INFO_RCS;