diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index 8c28f380b49..0c11ddaaf71 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -208,7 +208,8 @@ class MenuLeft { $langs->load("commercial"); $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); } @@ -218,7 +219,8 @@ class MenuLeft { $langs->load("commercial"); $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); } diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index 28f6baaa68b..aac66c4c22e 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -9,6 +9,7 @@ MenuNewCompany=Nouvelle soci MenuNewCustomer=Nouveau client MenuNewProspect=Nouveau prospect MenuNewSupplier=Nouveau fournisseur +MenuNewPrivateIndividual=Nouveau particulier MenuSocGroup=Groupes NewCompany=Nouvelle société (prospect, client, fournisseur) NewThirdParty=Nouveau tiers (prospect, client, fournisseur) diff --git a/htdocs/soc.php b/htdocs/soc.php index 3162f07705b..d53c8ab8671 100644 --- a/htdocs/soc.php +++ b/htdocs/soc.php @@ -249,6 +249,7 @@ if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] || if ($_GET["type"]=='f') { $soc->fournisseur=1; } if ($_GET["type"]=='c') { $soc->client=1; } if ($_GET["type"]=='p') { $soc->client=2; } + if ($_GET["private"]==1) { $soc->particulier=1; } if ($_POST["nom"]) { $soc->nom=$_POST["nom"]; @@ -316,6 +317,12 @@ if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] || print ''.$langs->trans('Name').''; print ''.$langs->trans('Prefix').''; + + if ($soc->particulier) + { + print ''.$langs->trans('FirstName').''; + print ' '; + } // Client / Prospect print ''.$langs->trans('ProspectCustomer').''; - print ''; - $s=$langs->trans("CustomerCodeDesc").'
'; - $s.=$langs->trans("ValidityControledByModule").': '.$modCodeClient->getNom($langs).'
'; - $s.=$langs->trans("RequiredIfCustomer").': '.yn(!$modCodeClient->code_null).'
'; - $s.=$langs->trans("Example").': '.$modCodeClient->getExample($langs).''; - print $form->textwithhelp('',$s,1); + print ''; + $s=$langs->trans("CustomerCodeDesc").'
'; + $s.=$langs->trans("ValidityControledByModule").': '.$modCodeClient->getNom($langs).'
'; + $s.=$langs->trans("RequiredIfCustomer").': '.yn(!$modCodeClient->code_null).'
'; + $s.=$langs->trans("Example").': '.$modCodeClient->getExample($langs).''; + print $form->textwithhelp('',$s,1); print ''; print ''; // Fournisseur - print ''; - print ''.$langs->trans('Supplier').''; - $form->selectyesnonum("fournisseur",$soc->fournisseur); - print ''; - print ''.$langs->trans('SupplierCode').''; + if (!$soc->particulier) + { + print ''; + print ''.$langs->trans('Supplier').''; + $form->selectyesnonum("fournisseur",$soc->fournisseur); + print ''; + print ''.$langs->trans('SupplierCode').''; - print '
'; - print ''; - print ''; - $s=$langs->trans("SupplierCodeDesc").'
'; - $s.=$langs->trans("ValidityControledByModule").': '.$modCodeFournisseur->getNom($langs).'
'; - $s.=$langs->trans("RequiredIfSupplier").': '.yn(!$modCodeFournisseur->code_null).'
'; - $s.=$langs->trans("Example").': '.$modCodeFournisseur->getExample($langs).''; - print $form->textwithhelp('',$s,1); - print '
'; + print '
'; + print ''; + print ''; + $s=$langs->trans("SupplierCodeDesc").'
'; + $s.=$langs->trans("ValidityControledByModule").': '.$modCodeFournisseur->getNom($langs).'
'; + $s.=$langs->trans("RequiredIfSupplier").': '.yn(!$modCodeFournisseur->code_null).'
'; + $s.=$langs->trans("Example").': '.$modCodeFournisseur->getExample($langs).''; + print $form->textwithhelp('',$s,1); + print '
'; - print ''; + print ''; - if ($soc->fournisseur) - { - $load = $soc->LoadSupplierCateg(); - if ( $load == 0) - { - if (sizeof($soc->SupplierCategories) > 0) - { - print ''; - print ''.$langs->trans('SupplierCategory').''; - $form->select_array("fournisseur_categorie",$soc->SupplierCategories); - print ''; - } - } - } + if ($soc->fournisseur) + { + $load = $soc->LoadSupplierCateg(); + if ( $load == 0) + { + if (sizeof($soc->SupplierCategories) > 0) + { + print ''; + print ''.$langs->trans('SupplierCategory').''; + $form->select_array("fournisseur_categorie",$soc->SupplierCategories); + print ''; + } + } + } + } print ''.$langs->trans('Address').'