Début ajout création de particulier

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

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);
} }

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)

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>';
@ -338,6 +345,8 @@ if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] ||
print '</td></tr>'; print '</td></tr>';
// Fournisseur // Fournisseur
if (!$soc->particulier)
{
print '<tr>'; print '<tr>';
print '<td>'.$langs->trans('Supplier').'</td><td>'; print '<td>'.$langs->trans('Supplier').'</td><td>';
$form->selectyesnonum("fournisseur",$soc->fournisseur); $form->selectyesnonum("fournisseur",$soc->fournisseur);
@ -370,6 +379,7 @@ if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] ||
} }
} }
} }
}
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,6 +414,8 @@ 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>';
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>'; 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')
@ -473,19 +485,30 @@ if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] ||
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'.$langs->trans("Type").'</td><td>'."\n"; print '<tr><td>'.$langs->trans("Type").'</td><td>'."\n";
$form->select_array("typent_id",$soc->typent_array(), $soc->typent_id, 0, 0, 0, 1); $form->select_array("typent_id",$soc->typent_array(), $soc->typent_id);
print '</td>'; print '</td>';
print '<td>'.$langs->trans("Staff").'</td><td>'; print '<td>'.$langs->trans("Staff").'</td><td>';
$form->select_array("effectif_id",$soc->effectif_array(), $soc->effectif_id); $form->select_array("effectif_id",$soc->effectif_array(), $soc->effectif_id);
print '</td></tr>'; print '</td></tr>';
}
// Assujeti TVA // Assujeti TVA
$html = new Form($db); $html = new Form($db);
print '<tr><td>'.$langs->trans('VATIsUsed').'</td><td>'; print '<tr><td>'.$langs->trans('VATIsUsed').'</td>';
if ($soc->particulier)
{
print '<td colspan="3">';
}
else
{
print '<td>';
}
$html->select_YesNo("1",'assujtva_value'); // Assujeti par défaut en creation $html->select_YesNo("1",'assujtva_value'); // Assujeti par défaut en creation
print '</td>'; print '</td>';
// Code TVA intra // Code TVA intra
if (!$soc->particulier)
{
if ($conf->use_javascript) if ($conf->use_javascript)
{ {
print "\n"; print "\n";
@ -511,6 +534,7 @@ if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] ||
print $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$soc->id_pays).'" target="_blank" alt="'.$langs->trans("VATIntraCheckableOnEUSite").'">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>'; 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 '</td>';
}
print '</tr>'; print '</tr>';
if ($user->rights->commercial->client->voir) if ($user->rights->commercial->client->voir)