diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php index 77185996556..3ce1595a2e1 100644 --- a/htdocs/admin/index.php +++ b/htdocs/admin/index.php @@ -91,15 +91,38 @@ if ($_GET["action"] == 'edit') print ''.$langs->trans("CompanyIds").''.$langs->trans("Value").''; $langs->load("companies"); - print ''.$langs->trans("ProfIdSiret").''; - print ''; - print ''.$langs->trans("ProfIdSiren").''; - print ''; - - print ''.$langs->trans("ProfIdApe").''; - print ''; + // Recupere code pays + $code_pays=substr($langs->defaultlang,-2); // Par defaut, pays de la localisation + $sql = "SELECT code from ".MAIN_DB_PREFIX."c_pays"; + $sql .= " WHERE rowid = ".MAIN_INFO_SOCIETE_PAYS; + $result=$db->query($sql); + if ($result) { + $obj = $db->fetch_object(); + if ($obj->code) $code_pays=$obj->code; + } + else { + dolibarr_print_error($db); + } + + if ($langs->transcountry("ProfId1",$code_pays) != '-') + { + print ''.$langs->transcountry("ProfId1",$code_pays).''; + print ''; + } + + if ($langs->transcountry("ProfId2",$code_pays) != '-') + { + print ''.$langs->transcountry("ProfId2",$code_pays).''; + print ''; + } + if ($langs->transcountry("ProfId3",$code_pays) != '-') + { + print ''.$langs->transcountry("ProfId3",$code_pays).''; + print ''; + } + print ''.$langs->trans("TVAIntra").''; print ''; @@ -136,15 +159,37 @@ else print ''; print ''; - print ''; - - print ''; - - print ''; - + // Recupere code pays + $code_pays=substr($langs->defaultlang,-2); // Par defaut, pays de la localisation + $sql = "SELECT code from ".MAIN_DB_PREFIX."c_pays"; + $sql .= " WHERE rowid = ".MAIN_INFO_SOCIETE_PAYS; + $result=$db->query($sql); + if ($result) { + $obj = $db->fetch_object(); + if ($obj->code) $code_pays=$obj->code; + } + else { + dolibarr_print_error($db); + } + + if ($langs->transcountry("ProfId1",$code_pays) != '-') + { + print ''; + } + + if ($langs->transcountry("ProfId2",$code_pays) != '-') + { + print ''; + } + + if ($langs->transcountry("ProfId3",$code_pays) != '-') + { + print ''; + } + print ''; print '
'.$langs->trans("CompanyIds").''.$langs->trans("Value").'
'.$langs->trans("ProfIdSiret").''; - print MAIN_INFO_SIRET . '
'.$langs->trans("ProfIdSiren").''; - print MAIN_INFO_SIREN . '
'.$langs->trans("ProfIdApe").''; - print MAIN_INFO_APE . '
'.$langs->transcountry("ProfId1",$code_pays).''; + print MAIN_INFO_SIRET . '
'.$langs->transcountry("ProfId2",$code_pays).''; + print MAIN_INFO_SIREN . '
'.$langs->transcountry("ProfId3",$code_pays).''; + print MAIN_INFO_APE . '
'.$langs->trans("TVAIntra").'' . MAIN_INFO_TVAINTRA . '

'; diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index a835c121d49..15f94dc5b65 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -35,8 +35,8 @@ ProfId1FR=SIREN ProfId2FR=SIRET ProfId3FR=NAF (Old APE) ProfId1BE=Professionnel number -ProfId2BE= -ProfId3BE= +ProfId2BE=- +ProfId3BE=- TVAIntra=Intracommunautary VAT ProspectCustomer=Prospect / Customer Prospect=Prospect diff --git a/htdocs/langs/fr_BE/companies.lang b/htdocs/langs/fr_BE/companies.lang index 11fd7ab71b6..e53f3837754 100644 --- a/htdocs/langs/fr_BE/companies.lang +++ b/htdocs/langs/fr_BE/companies.lang @@ -35,8 +35,8 @@ ProfId1FR=SIREN ProfId2FR=SIRET ProfId3FR=NAF (Ex APE) ProfId1BE=No professionnel -ProfId2BE= -ProfId3BE= +ProfId2BE=- +ProfId3BE=- TVAIntra=Numéro de TVA Intracommunautaire ProspectCustomer=Prospect / Client Prospect=Prospect diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index 65295de5034..0cf1048a97f 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -35,8 +35,8 @@ ProfId1FR=SIREN ProfId2FR=SIRET ProfId3FR=NAF (Ex APE) ProfId1BE=No professionnel -ProfId2BE= -ProfId3BE= +ProfId2BE=- +ProfId3BE=- TVAIntra=Numéro de TVA Intracommunautaire ProspectCustomer=Prospect / Client Prospect=Prospect diff --git a/htdocs/langs/nl_BE/companies.lang b/htdocs/langs/nl_BE/companies.lang index 407b4b7ce0f..2345722b033 100644 --- a/htdocs/langs/nl_BE/companies.lang +++ b/htdocs/langs/nl_BE/companies.lang @@ -21,8 +21,8 @@ ProfId1FR=SIREN ProfId2FR=SIRET ProfId3FR=NAF (Old APE) ProfId1BE=Professionnel number -ProfId2BE= -ProfId3BE= +ProfId2BE=- +ProfId3BE=- TVAIntra=Intracommunautary VAT ProspectCustomer=Vooruitzicht / Klant Prospect=Vooruitzicht