lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed a too specific feature into a generic one.

Browse Source
This commit is contained in:
Laurent Destailleur 2011-06-24 19:57:45 +00:00
parent a8b129033c
commit f79413195b
4 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
htdocs/admin/company.php
View File

@ -23,7 +23,7 @@
* \file htdocs/admin/company.php
* \ingroup company
* \brief Setup page to configure company/foundation
* \version $Id$
* \version $Id: company.php,v 1.92 2011/06/24 19:57:45 eldy Exp $
*/
require("../main.inc.php");
@ -136,9 +136,10 @@ if ( (isset($_POST["action"]) && $_POST["action"] == 'update' && empty($_POST["c
dolibarr_set_const($db, "MAIN_INFO_SIRET",$_POST["siret"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_INFO_APE",$_POST["ape"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_INFO_RCS",$_POST["rcs"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_INFO_TVAINTRA",$_POST["tva"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_INFO_TRAINER",$_POST["trainer"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_INFO_TVAINTRA",$_POST["tva"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "SOCIETE_FISCAL_MONTH_START",$_POST["fiscalmonthstart"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "FACTURE_TVAOPTION",$_POST["optiontva"],'chaine',0,'',$conf->entity);
@ -471,6 +472,22 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit')
print '</td></tr>';
}
// ProfId5
if ($langs->transcountry("ProfId5",$pays_code) != '-')
{
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId5",$pays_code).'</td><td>';
if ($pays_code)
{
print '<input name="trainer" size="20" value="' . $conf->global->MAIN_INFO_TRAINER . '">';
}
else
{
print $countrynotdefined;
}
print '</td></tr>';
}
// TVA Intra
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("VATIntra").'</td><td>';
@ -478,12 +495,6 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit')
print '</td></tr>';
print '</table>';
// Trainer accreditation
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("TrainerId").'</td><td>';
print '<input name="trainer" size="20" value="' . $conf->global->MAIN_INFO_TRAINER . '">';
print '</td></tr>';
/*
@ -794,10 +805,18 @@ else
}
print '</td></tr>';
}
// Trainer accreditation
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("TrainerId").'</td><td>' . $conf->global->MAIN_INFO_TRAINER . '</td></tr>';
// ProfId5
if ($langs->transcountry("ProfId5",$pays_code) != '-')
{
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId5",$pays_code).'</td><td>';
if ($langs->transcountry("ProfId5",$pays_code) != '-')
{
print $conf->global->MAIN_INFO_TRAINER;
}
print '</td></tr>';
}
// TVA
$var=!$var;
@ -964,6 +983,6 @@ else
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/06/24 19:57:45 $ - $Revision: 1.92 $');
?>

3
htdocs/langs/ca_ES/companies.lang
View File

@ -93,11 +93,12 @@ ProfId1Short=Prof. id 1
ProfId2Short=Prof. id 2
ProfId3Short=Prof. id 3
ProfId4Short=Prof. id 4
ProfId5Short=Prof. id 5
ProfId1=ID profesional 1
ProfId2=ID profesional 2
ProfId3=ID profesional 3
ProfId4=ID profesional 4
TrainerId=Nº acreditació de formació
ProfId5=ID profesional 5
ProfId1AR=CUIT/CUIL
ProfId2AR=Ingressos bruts
ProfId3AR=-

3
htdocs/langs/es_ES/companies.lang
View File

@ -93,7 +93,7 @@ ProfId1Short=Prof. id 1
ProfId2Short=Prof. id 2
ProfId3Short=Prof. id 3
ProfId4Short=Prof. id 4
TrainerId=Nº acreditación de formación
ProfId5Short=Prof. id 5
ProfId1AR=CUIT/CUIL
ProfId2AR=Ingresos brutos
ProfId3AR=-
@ -102,6 +102,7 @@ ProfId1=ID profesional 1
ProfId2=ID profesional 2
ProfId3=ID profesional 3
ProfId4=ID profesional 4
ProfId5=ID profesional 5
ProfId1AU=ABN
ProfId2AU=-
ProfId3AU=-

4
htdocs/langs/fr_FR/companies.lang
View File

@ -93,11 +93,12 @@ ProfId1Short=Id prof. 1
ProfId2Short=Id prof. 2
ProfId3Short=Id prof. 3
ProfId4Short=Id prof. 4
ProfId5Short=Id prof. 5
ProfId1=Id professionnel 1
ProfId2=Id professionnel 2
ProfId3=Id professionnel 3
ProfId4=Id professionnel 4
TrainerId=N° d'accréditation formation
ProfId5=Id professionnel 5
ProfId1AR=Id prof. 1 (CUIT/CUIL)
ProfId2AR=Id prof. 2 (Revenu brutes)
ProfId3AR=-
@ -130,6 +131,7 @@ ProfId1FR=Id prof. 1 (SIREN)
ProfId2FR=Id prof. 2 (SIRET)
ProfId3FR=Id prof. 3 (NAF, ex APE)
ProfId4FR=Id prof. 4 (RCS/RM)
ProfId5FR=Id prof. 5
ProfId1GB=Id prof. 1 (Registration Number)
ProfId2GB=-
ProfId3GB=Id prof. 3 (SIC)