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

Dbut ajout cration de particulier

Browse Source
This commit is contained in:
Regis Houssin 2007-04-03 15:01:00 +00:00
parent 54583093cc
commit ef339b8f29
3 changed files with 166 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/includes/menus/barre_left/eldy_backoffice.php
View File

@ -208,7 +208,8 @@ class MenuLeft {
$langs->load("commercial"); $langs->load("commercial");
$newmenu->add(DOL_URL_ROOT."/comm/prospect/prospects.php?leftmenu=prospects", $langs->trans("Prospects"), 1, $user->rights->societe->lire); $newmenu->add(DOL_URL_ROOT."/comm/prospect/prospects.php?leftmenu=prospects", $langs->trans("Prospects"), 1, $user->rights->societe->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/soc.php?leftmenu=prospects&action=create&type=p", $langs->trans("MenuNewProspect"), 2, $user->rights->societe->creer); $newmenu->add_submenu(DOL_URL_ROOT."/soc.php?leftmenu=prospects&action=create&type=p", $langs->trans("MenuNewCompany"), 2, $user->rights->societe->creer);
$newmenu->add_submenu(DOL_URL_ROOT."/soc.php?leftmenu=prospects&action=create&type=p&private=1", $langs->trans("MenuNewPrivateIndividual"), 2, $user->rights->societe->creer);
$newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=customers&type=p", $langs->trans("Contacts"), 2, $user->rights->societe->lire); $newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=customers&type=p", $langs->trans("Contacts"), 2, $user->rights->societe->lire);
} }
@ -218,7 +219,8 @@ class MenuLeft {
$langs->load("commercial"); $langs->load("commercial");
$newmenu->add(DOL_URL_ROOT."/comm/clients.php?leftmenu=customers", $langs->trans("Customers"), 1, $user->rights->societe->lire); $newmenu->add(DOL_URL_ROOT."/comm/clients.php?leftmenu=customers", $langs->trans("Customers"), 1, $user->rights->societe->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/soc.php?leftmenu=customers&action=create&type=c", $langs->trans("MenuNewCustomer"), 2, $user->rights->societe->creer); $newmenu->add_submenu(DOL_URL_ROOT."/soc.php?leftmenu=customers&action=create&type=c", $langs->trans("MenuNewCompany"), 2, $user->rights->societe->creer);
$newmenu->add_submenu(DOL_URL_ROOT."/soc.php?leftmenu=customers&action=create&type=c&private=1", $langs->trans("MenuNewPrivateIndividual"), 2, $user->rights->societe->creer);
$newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=customers&type=c", $langs->trans("Contacts"), 2, $user->rights->societe->lire); $newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=customers&type=c", $langs->trans("Contacts"), 2, $user->rights->societe->lire);
} }

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

@ -9,6 +9,7 @@ MenuNewCompany=Nouvelle soci
MenuNewCustomer=Nouveau client MenuNewCustomer=Nouveau client
MenuNewProspect=Nouveau prospect MenuNewProspect=Nouveau prospect
MenuNewSupplier=Nouveau fournisseur MenuNewSupplier=Nouveau fournisseur
MenuNewPrivateIndividual=Nouveau particulier
MenuSocGroup=Groupes MenuSocGroup=Groupes
NewCompany=Nouvelle société (prospect, client, fournisseur) NewCompany=Nouvelle société (prospect, client, fournisseur)
NewThirdParty=Nouveau tiers (prospect, client, fournisseur) NewThirdParty=Nouveau tiers (prospect, client, fournisseur)

298
htdocs/soc.php
View File

@ -249,6 +249,7 @@ if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] ||
if ($_GET["type"]=='f') { $soc->fournisseur=1; } if ($_GET["type"]=='f') { $soc->fournisseur=1; }
if ($_GET["type"]=='c') { $soc->client=1; } if ($_GET["type"]=='c') { $soc->client=1; }
if ($_GET["type"]=='p') { $soc->client=2; } if ($_GET["type"]=='p') { $soc->client=2; }
if ($_GET["private"]==1) { $soc->particulier=1; }
if ($_POST["nom"]) if ($_POST["nom"])
{ {
$soc->nom=$_POST["nom"]; $soc->nom=$_POST["nom"];
@ -317,6 +318,12 @@ if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] ||
print '<tr><td>'.$langs->trans('Name').'</td><td><input type="text" size="30" name="nom" value="'.$soc->nom.'"></td>'; print '<tr><td>'.$langs->trans('Name').'</td><td><input type="text" size="30" name="nom" value="'.$soc->nom.'"></td>';
print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" name="prefix_comm" value="'.$soc->prefix_comm.'"></td></tr>'; print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" name="prefix_comm" value="'.$soc->prefix_comm.'"></td></tr>';
if ($soc->particulier)
{
print '<tr><td>'.$langs->trans('FirstName').'</td><td><input type="text" size="30" name="nom" value="'.$soc->firstname.'"></td>';
print '<td colspan=2>&nbsp;</td></tr>';
}
// Client / Prospect // Client / Prospect
print '<tr><td width="25%">'.$langs->trans('ProspectCustomer').'</td><td width="25%"><select class="flat" name="client">'; print '<tr><td width="25%">'.$langs->trans('ProspectCustomer').'</td><td width="25%"><select class="flat" name="client">';
print '<option value="2"'.($soc->client==2?' selected="true"':'').'>'.$langs->trans('Prospect').'</option>'; print '<option value="2"'.($soc->client==2?' selected="true"':'').'>'.$langs->trans('Prospect').'</option>';
@ -327,49 +334,52 @@ if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] ||
print '<td width="25%">'.$langs->trans('CustomerCode').'</td><td width="25%">'; print '<td width="25%">'.$langs->trans('CustomerCode').'</td><td width="25%">';
print '<table class="nobordernopadding"><tr><td>'; print '<table class="nobordernopadding"><tr><td>';
print '<input type="text" name="code_client" size="16" value="'.$soc->code_client.'" maxlength="15">'; print '<input type="text" name="code_client" size="16" value="'.$soc->code_client.'" maxlength="15">';
print '</td><td>'; print '</td><td>';
$s=$langs->trans("CustomerCodeDesc").'<br>'; $s=$langs->trans("CustomerCodeDesc").'<br>';
$s.=$langs->trans("ValidityControledByModule").': <b>'.$modCodeClient->getNom($langs).'</b><br>'; $s.=$langs->trans("ValidityControledByModule").': <b>'.$modCodeClient->getNom($langs).'</b><br>';
$s.=$langs->trans("RequiredIfCustomer").': <b>'.yn(!$modCodeClient->code_null).'</b><br>'; $s.=$langs->trans("RequiredIfCustomer").': <b>'.yn(!$modCodeClient->code_null).'</b><br>';
$s.=$langs->trans("Example").': <b>'.$modCodeClient->getExample($langs).'</b>'; $s.=$langs->trans("Example").': <b>'.$modCodeClient->getExample($langs).'</b>';
print $form->textwithhelp('',$s,1); print $form->textwithhelp('',$s,1);
print '</td></tr></table>'; print '</td></tr></table>';
print '</td></tr>'; print '</td></tr>';
// Fournisseur // Fournisseur
print '<tr>'; if (!$soc->particulier)
print '<td>'.$langs->trans('Supplier').'</td><td>'; {
$form->selectyesnonum("fournisseur",$soc->fournisseur); print '<tr>';
print '</td>'; print '<td>'.$langs->trans('Supplier').'</td><td>';
print '<td>'.$langs->trans('SupplierCode').'</td><td>'; $form->selectyesnonum("fournisseur",$soc->fournisseur);
print '</td>';
print '<td>'.$langs->trans('SupplierCode').'</td><td>';
print '<table class="nobordernopadding"><tr><td>'; print '<table class="nobordernopadding"><tr><td>';
print '<input type="text" name="code_fournisseur" size="16" value="'.$soc->code_fournisseur.'" maxlength="15">'; print '<input type="text" name="code_fournisseur" size="16" value="'.$soc->code_fournisseur.'" maxlength="15">';
print '</td><td>'; print '</td><td>';
$s=$langs->trans("SupplierCodeDesc").'<br>'; $s=$langs->trans("SupplierCodeDesc").'<br>';
$s.=$langs->trans("ValidityControledByModule").': <b>'.$modCodeFournisseur->getNom($langs).'</b><br>'; $s.=$langs->trans("ValidityControledByModule").': <b>'.$modCodeFournisseur->getNom($langs).'</b><br>';
$s.=$langs->trans("RequiredIfSupplier").': <b>'.yn(!$modCodeFournisseur->code_null).'</b><br>'; $s.=$langs->trans("RequiredIfSupplier").': <b>'.yn(!$modCodeFournisseur->code_null).'</b><br>';
$s.=$langs->trans("Example").': <b>'.$modCodeFournisseur->getExample($langs).'</b>'; $s.=$langs->trans("Example").': <b>'.$modCodeFournisseur->getExample($langs).'</b>';
print $form->textwithhelp('',$s,1); print $form->textwithhelp('',$s,1);
print '</td></tr></table>'; print '</td></tr></table>';
print '</td></tr>'; print '</td></tr>';
if ($soc->fournisseur) if ($soc->fournisseur)
{ {
$load = $soc->LoadSupplierCateg(); $load = $soc->LoadSupplierCateg();
if ( $load == 0) if ( $load == 0)
{ {
if (sizeof($soc->SupplierCategories) > 0) if (sizeof($soc->SupplierCategories) > 0)
{ {
print '<tr>'; print '<tr>';
print '<td>'.$langs->trans('SupplierCategory').'</td><td colspan="3">'; print '<td>'.$langs->trans('SupplierCategory').'</td><td colspan="3">';
$form->select_array("fournisseur_categorie",$soc->SupplierCategories); $form->select_array("fournisseur_categorie",$soc->SupplierCategories);
print '</td></tr>'; print '</td></tr>';
} }
} }
} }
}
print '<tr><td>'.$langs->trans('Address').'</td><td colspan="3"><textarea name="adresse" cols="40" rows="3" wrap="soft">'; print '<tr><td>'.$langs->trans('Address').'</td><td colspan="3"><textarea name="adresse" cols="40" rows="3" wrap="soft">';
print $soc->adresse; print $soc->adresse;
@ -404,124 +414,138 @@ if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] ||
print '<tr><td>'.$langs->trans('EMail').'</td><td><input type="text" name="email" size="32" value="'.$soc->email.'"></td>'; print '<tr><td>'.$langs->trans('EMail').'</td><td><input type="text" name="email" size="32" value="'.$soc->email.'"></td>';
print '<td>'.$langs->trans('Web').'</td><td><input type="text" name="url" size="32" value="'.$soc->url.'"></td></tr>'; print '<td>'.$langs->trans('Web').'</td><td><input type="text" name="url" size="32" value="'.$soc->url.'"></td></tr>';
print '<tr><td>'.$langs->trans('Capital').'</td><td colspan="3"><input type="text" name="capital" size="10" value="'.$soc->capital.'"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; if (!$soc->particulier)
{
print '<tr><td>'.$langs->trans('Capital').'</td><td colspan="3"><input type="text" name="capital" size="10" value="'.$soc->capital.'"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
if ($soc->pays_code == 'FR') if ($soc->pays_code == 'FR')
{ {
$maxlength1=9; $maxlength1=9;
$maxlength2=14; $maxlength2=14;
$maxlength3=4; $maxlength3=4;
$maxlength4=12; $maxlength4=12;
} }
print '<tr><td>'.($langs->transcountry("ProfId1",$soc->pays_code) != '-'?$langs->transcountry('ProfId1',$soc->pays_code):'').'</td><td>'; print '<tr><td>'.($langs->transcountry("ProfId1",$soc->pays_code) != '-'?$langs->transcountry('ProfId1',$soc->pays_code):'').'</td><td>';
if ($soc->pays_id) if ($soc->pays_id)
{ {
if ($langs->transcountry("ProfId1",$soc->pays_code) != '-') print '<input type="text" name="idprof1" size="15" maxlength="'.$maxlength1.'" value="'.$soc->siren.'">'; if ($langs->transcountry("ProfId1",$soc->pays_code) != '-') print '<input type="text" name="idprof1" size="15" maxlength="'.$maxlength1.'" value="'.$soc->siren.'">';
else print '&nbsp;'; else print '&nbsp;';
} }
else else
{ {
print $countrynotdefined; print $countrynotdefined;
} }
print '</td>'; print '</td>';
print '<td>'.($langs->transcountry("ProfId2",$soc->pays_code) != '-'?$langs->transcountry('ProfId2',$soc->pays_code):'').'</td><td>'; print '<td>'.($langs->transcountry("ProfId2",$soc->pays_code) != '-'?$langs->transcountry('ProfId2',$soc->pays_code):'').'</td><td>';
if ($soc->pays_id) if ($soc->pays_id)
{ {
if ($langs->transcountry("ProfId2",$soc->pays_code) != '-') print '<input type="text" name="idprof2" size="15" maxlength="'.$maxlength2.'" value="'.$soc->siret.'">'; if ($langs->transcountry("ProfId2",$soc->pays_code) != '-') print '<input type="text" name="idprof2" size="15" maxlength="'.$maxlength2.'" value="'.$soc->siret.'">';
else print '&nbsp;'; else print '&nbsp;';
} }
else else
{ {
print $countrynotdefined; print $countrynotdefined;
} }
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'.($langs->transcountry("ProfId3",$soc->pays_code) != '-'?$langs->transcountry('ProfId3',$soc->pays_code):'').'</td><td>'; print '<tr><td>'.($langs->transcountry("ProfId3",$soc->pays_code) != '-'?$langs->transcountry('ProfId3',$soc->pays_code):'').'</td><td>';
if ($soc->pays_id) if ($soc->pays_id)
{ {
if ($langs->transcountry("ProfId3",$soc->pays_code) != '-') print '<input type="text" name="idprof3" size="15" maxlength="'.$maxlength3.'" value="'.$soc->ape.'">'; if ($langs->transcountry("ProfId3",$soc->pays_code) != '-') print '<input type="text" name="idprof3" size="15" maxlength="'.$maxlength3.'" value="'.$soc->ape.'">';
else print '&nbsp;'; else print '&nbsp;';
} }
else else
{ {
print $countrynotdefined; print $countrynotdefined;
} }
print '</td>'; print '</td>';
print '<td>'.($langs->transcountry("ProfId4",$soc->pays_code) != '-'?$langs->transcountry('ProfId4',$soc->pays_code):'').'</td><td>'; print '<td>'.($langs->transcountry("ProfId4",$soc->pays_code) != '-'?$langs->transcountry('ProfId4',$soc->pays_code):'').'</td><td>';
if ($soc->pays_id) if ($soc->pays_id)
{ {
if ($langs->transcountry("ProfId4",$soc->pays_code) != '-') print '<input type="text" name="idprof4" size="15" maxlength="'.$maxlength4.'" value="'.$soc->idprof4.'">'; if ($langs->transcountry("ProfId4",$soc->pays_code) != '-') print '<input type="text" name="idprof4" size="15" maxlength="'.$maxlength4.'" value="'.$soc->idprof4.'">';
else print '&nbsp;'; else print '&nbsp;';
} }
else else
{ {
print $countrynotdefined; print $countrynotdefined;
} }
print '</td></tr>'; print '</td></tr>';
// Forme juridique // Forme juridique
print '<tr><td>'.$langs->trans('JuridicalStatus').'</td>'; print '<tr><td>'.$langs->trans('JuridicalStatus').'</td>';
print '<td colspan="3">'; print '<td colspan="3">';
if ($soc->pays_id) if ($soc->pays_id)
{ {
$form->select_forme_juridique($soc->forme_juridique_code,$soc->pays_code); $form->select_forme_juridique($soc->forme_juridique_code,$soc->pays_code);
} }
else else
{ {
print $countrynotdefined; print $countrynotdefined;
}
print '</td></tr>';
print '<tr><td>'.$langs->trans("Type").'</td><td>'."\n";
$form->select_array("typent_id",$soc->typent_array(), $soc->typent_id);
print '</td>';
print '<td>'.$langs->trans("Staff").'</td><td>';
$form->select_array("effectif_id",$soc->effectif_array(), $soc->effectif_id);
print '</td></tr>';
} }
print '</td></tr>';
print '<tr><td>'.$langs->trans("Type").'</td><td>'."\n"; // Assujeti TVA
$form->select_array("typent_id",$soc->typent_array(), $soc->typent_id, 0, 0, 0, 1); $html = new Form($db);
print '</td>'; print '<tr><td>'.$langs->trans('VATIsUsed').'</td>';
print '<td>'.$langs->trans("Staff").'</td><td>'; if ($soc->particulier)
$form->select_array("effectif_id",$soc->effectif_array(), $soc->effectif_id); {
print '</td></tr>'; print '<td colspan="3">';
}
else
{
print '<td>';
}
$html->select_YesNo("1",'assujtva_value'); // Assujeti par défaut en creation
print '</td>';
// Assujeti TVA // Code TVA intra
$html = new Form($db); if (!$soc->particulier)
print '<tr><td>'.$langs->trans('VATIsUsed').'</td><td>'; {
$html->select_YesNo("1",'assujtva_value'); // Assujeti par défaut en creation if ($conf->use_javascript)
print '</td>'; {
print "\n";
// Code TVA intra print '<script language="JavaScript" type="text/javascript">';
if ($conf->use_javascript) print "function CheckVAT(a,b) {\n";
{ print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?countryCode='+a+'&vatNumber='+b,'".$langs->trans("VATIntraCheckableOnEUSite")."',500,230);\n";
print "\n"; print "}\n";
print '<script language="JavaScript" type="text/javascript">'; print '</script>';
print "function CheckVAT(a,b) {\n"; print "\n";
print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?countryCode='+a+'&vatNumber='+b,'".$langs->trans("VATIntraCheckableOnEUSite")."',500,230);\n"; }
print "}\n"; print '<td nowrap="nowrap">'.$langs->trans('VATIntraShort').'</td>';
print '</script>'; print '<td nowrap="nowrap">';
print "\n"; $s ='<input type="text" class="flat" name="tva_intra_code" size="1" maxlength="2" value="'.$soc->tva_intra_code.'">';
} $s.='<input type="text" class="flat" name="tva_intra_num" size="12" maxlength="18" value="'.$soc->tva_intra_num.'">';
print '<td nowrap="nowrap">'.$langs->trans('VATIntraShort').'</td>'; $s.=' ';
print '<td nowrap="nowrap">'; if ($conf->use_javascript)
$s ='<input type="text" class="flat" name="tva_intra_code" size="1" maxlength="2" value="'.$soc->tva_intra_code.'">'; {
$s.='<input type="text" class="flat" name="tva_intra_num" size="12" maxlength="18" value="'.$soc->tva_intra_num.'">'; $s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra_code.value,document.formsoc.tva_intra_num.value);" alt="'.$langs->trans("VATIntraCheckableOnEUSite").'">'.$langs->trans("VATIntraCheck").'</a>';
$s.=' '; print $form->textwithhelp($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
if ($conf->use_javascript) }
{ else
$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra_code.value,document.formsoc.tva_intra_num.value);" alt="'.$langs->trans("VATIntraCheckableOnEUSite").'">'.$langs->trans("VATIntraCheck").'</a>'; {
print $form->textwithhelp($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1); print $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$soc->id_pays).'" target="_blank" alt="'.$langs->trans("VATIntraCheckableOnEUSite").'">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
} }
else print '</td>';
{ }
print $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$soc->id_pays).'" target="_blank" alt="'.$langs->trans("VATIntraCheckableOnEUSite").'">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
}
print '</td>';
print '</tr>'; print '</tr>';
if ($user->rights->commercial->client->voir) if ($user->rights->commercial->client->voir)
{ {
//Affecter un commercial //Affecter un commercial
print '<tr>'; print '<tr>';
print '<td>'.$langs->trans("AllocateCommercial").'</td>'; print '<td>'.$langs->trans("AllocateCommercial").'</td>';
print '<td colspan="3">'; print '<td colspan="3">';
$form->select_users($soc->commercial_id,'commercial_id',1); $form->select_users($soc->commercial_id,'commercial_id',1);
print '</td></tr>'; print '</td></tr>';
} }