Fix: Corrige inversion siren, siret

This commit is contained in:
Laurent Destailleur 2005-07-01 19:24:13 +00:00
parent e9a3b8037a
commit 7881c71225
2 changed files with 9 additions and 6 deletions

View File

@ -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 '<tr class="impair"><td width="50%">'.$langs->transcountry("ProfId1",$code_pays).'</td><td>';
print '<input name="siret" size="20" value="' . MAIN_INFO_SIRET . '"></td></tr>';
print '<input name="siren" size="20" value="' . MAIN_INFO_SIREN . '"></td></tr>';
}
if ($langs->transcountry("ProfId2",$code_pays) != '-')
{
print '<tr class="pair"><td width="50%">'.$langs->transcountry("ProfId2",$code_pays).'</td><td>';
print '<input name="siren" size="20" value="' . MAIN_INFO_SIREN . '"></td></tr>';
print '<input name="siret" size="20" value="' . MAIN_INFO_SIRET . '"></td></tr>';
}
if ($langs->transcountry("ProfId3",$code_pays) != '-')
@ -175,13 +175,13 @@ else
if ($langs->transcountry("ProfId1",$code_pays) != '-')
{
print '<tr class="impair"><td width="50%">'.$langs->transcountry("ProfId1",$code_pays).'</td><td>';
print MAIN_INFO_SIRET . '</td></tr>';
print MAIN_INFO_SIREN . '</td></tr>';
}
if ($langs->transcountry("ProfId2",$code_pays) != '-')
{
print '<tr class="pair"><td width="50%">'.$langs->transcountry("ProfId2",$code_pays).'</td><td>';
print MAIN_INFO_SIREN . '</td></tr>';
print MAIN_INFO_SIRET . '</td></tr>';
}
if ($langs->transcountry("ProfId3",$code_pays) != '-')

View File

@ -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;