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

New: Ajout du RCS/RM dans la configuration gnral car info rglementaire requise sur les factures.

Browse Source
This commit is contained in:
Laurent Destailleur 2005-08-21 19:01:52 +00:00
parent 1180eff5e7
commit 3410c20160
5 changed files with 58 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
htdocs/admin/index.php
View File

@ -41,13 +41,14 @@ if ( (isset($_POST["action"]) && $_POST["action"] == 'update')
dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOM",$_POST["nom"]);
dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ADRESSE",$_POST["address"]);
dolibarr_set_const($db, "MAIN_INFO_SOCIETE_PAYS",$_POST["pays_id"]);
dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FORME_JURIDIQUE",$_POST["forme_juridique_code"]);
dolibarr_set_const($db, "MAIN_MONNAIE",$_POST["currency"]);
dolibarr_set_const($db, "MAIN_INFO_CAPITAL",$_POST["capital"]);
dolibarr_set_const($db, "MAIN_INFO_CAPITAL",$_POST["capital"]);
dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FORME_JURIDIQUE",$_POST["forme_juridique_code"]);
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_RCS",$_POST["rcs"]);
dolibarr_set_const($db, "MAIN_INFO_TVAINTRA",$_POST["tva"]);
if ($_POST['action'] != 'updateedit')
@ -93,7 +94,7 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit')
$var=true;
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("CompanyInfo").'</td></tr>';
print '<tr class="liste_titre"><td width="35%">'.$langs->trans("CompanyInfo").'</td><td>'.$langs->trans("Value").'</td></tr>';
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyName").'</td><td>';
@ -113,10 +114,6 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit')
$form->select_currency($conf->global->MAIN_MONNAIE,"currency");
print '</td></tr>';
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Capital").'</td><td>';
print '<input name="capital" size="20" value="' . $conf->global->MAIN_INFO_CAPITAL . '"></td></tr>';
print '</table>';
print '<br>';
@ -144,6 +141,11 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit')
}
}
// Capital
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Capital").'</td><td>';
print '<input name="capital" size="20" value="' . $conf->global->MAIN_INFO_CAPITAL . '"></td></tr>';
// Forme juridique
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("JuridicalStatus").'</td><td>';
@ -205,6 +207,22 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit')
}
print '</td></tr>';
// ProfId4
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId4",$code_pays).'</td><td>';
if ($conf->global->MAIN_INFO_SOCIETE_PAYS)
{
if ($langs->transcountry("ProfId4",$code_pays) != '-')
{
print '<input name="rcs" size="20" value="' . $conf->global->MAIN_INFO_RCS . '">';
}
}
else
{
print $countrynotdefined;
}
print '</td></tr>';
// TVA Intra
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("TVAIntra").'</td><td>';
@ -218,9 +236,9 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit')
}
else
{
/*
* Affichage des paramètres
*/
/*
* Affichage des paramètres
*/
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("CompanyInfo").'</td><td>'.$langs->trans("Value").'</td></tr>';
@ -242,10 +260,6 @@ else
print $form->currency_name($conf->global->MAIN_MONNAIE,1);
print '</td></tr>';
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Capital").'</td><td>';
print $conf->global->MAIN_INFO_CAPITAL . '</td></tr>';
print '</table>';
print '<br>';
@ -272,12 +286,18 @@ else
}
}
// Capital
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Capital").'</td><td>';
print $conf->global->MAIN_INFO_CAPITAL . '</td></tr>';
// Forme juridique
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("JuridicalStatus").'</td><td>';
print $form->forme_juridique_name($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE,1);
print '</td></tr>';
// ProfId1
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId1",$code_pays).'</td><td>';
if ($langs->transcountry("ProfId1",$code_pays) != '-')
@ -286,6 +306,7 @@ else
}
print '</td></tr>';
// ProfId2
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId2",$code_pays).'</td><td>';
if ($langs->transcountry("ProfId2",$code_pays) != '-')
@ -294,6 +315,7 @@ else
}
print '</td></tr>';
// ProfId3
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId3",$code_pays).'</td><td>';
if ($langs->transcountry("ProfId3",$code_pays) != '-')
@ -302,6 +324,16 @@ else
}
print '</td></tr>';
// ProfId4
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId4",$code_pays).'</td><td>';
if ($langs->transcountry("ProfId4",$code_pays) != '-')
{
print $conf->global->MAIN_INFO_RCS;
}
print '</td></tr>';
// TVA Intracommunautaire
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("TVAIntra").'</td><td>' . $conf->global->MAIN_INFO_TVAINTRA . '</td></tr>';

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

@ -32,15 +32,19 @@ Web=Web
ProfId1=Professional ID 1
ProfId2=Professional ID 2
ProfId3=Professional ID 3
ProfId4=Professional ID 4
ProfId1FR=SIREN
ProfId2FR=SIRET
ProfId3FR=NAF (Old APE)
ProfId4FR=RCS/RM
ProfId1BE=Professionnel number
ProfId2BE=-
ProfId3BE=-
ProfId4BE=-
ProfId1PT=NIPC
ProfId2PT=Social security number
ProfId3PT=Commercial Record number
ProfId4PT=Conservatory
TVAIntra=Intracommunautary VAT
VATIntraShort=Intra-communautary VAT code
ProspectCustomer=Prospect / Customer

2
htdocs/langs/fr_FR/admin.lang
View File

@ -247,7 +247,7 @@ DefaultLanguage=Langue par d
PermanentLeftSearchForm=Zone de recherche permanente du menu de gauche
SystemSuccessfulyUpdated=Votre système a été correctement mis à jour
CompanyInfo=Informations sur la société/association
CompanyIds=Identifiants de la société/association
CompanyIds=Identifiants réglementaires
CompanyName=Nom/Enseigne de la société/association
CompanyAddress=Adresse de la société/association
CompanyCurrency=Devise de la société/association

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

@ -92,4 +92,6 @@ DateEcheance=Date
ClassifyBill=Classer la facture
NoSupplierBillsUnpayed=Aucune facture fournisseur impayée
SupplierBillsToPay=Factures fournisseurs à payer
CustomerBillsUnpayed=Factures clients impayées
CustomerBillsUnpayed=Factures clients impayées
DispenseMontantLettres=Les factures rédigées par procédés mécanographiques sont dispensées de l'arrêté en lettres
NonPercuRecuperable=non perçu récupérable

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

@ -32,15 +32,19 @@ Web=Web
ProfId1=ID professionnel 1
ProfId2=ID professionnel 2
ProfId3=ID professionnel 3
ProfId3=ID professionnel 4
ProfId1FR=SIREN
ProfId2FR=SIRET
ProfId3FR=NAF (Ex APE)
ProfId4FR=RCS/RM
ProfId1BE=N° professionnel
ProfId2BE=-
ProfId3BE=-
ProfId4BE=-
ProfId1PT=NIPC
ProfId2PT=Social security number
ProfId3PT=Commercial Record number
ProfId4PT=Conservatory
TVAIntra=Numéro de TVA Intracommunautaire
VATIntraShort=Num TVA Intra-communautaire
ProspectCustomer=Prospect / Client