diff --git a/ChangeLog b/ChangeLog index 363c8ecf0fe..36a52cdf2bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ English Dolibarr changelog ***** Changelog for 2.7 compared to 2.6 ***** For users: +- New: Price level can be defined also for prospects. - New: Add a help and support center. - New: Can export commercial proposals. - New: Can use a cache for xcal exports. diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 4fbbf23aad4..2e577b401df 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -179,6 +179,7 @@ if ($socid > 0) print "".$langs->trans('Address')."".nl2br($objsoc->adresse).""; + // Zip / Town print ''.$langs->trans('Zip').''.$objsoc->cp.""; print ''.$langs->trans('Town').''.$objsoc->ville.""; @@ -280,7 +281,7 @@ if ($socid > 0) print ''; print ''; - // Multiprix + // Multiprice level if ($conf->global->PRODUIT_MULTIPRICES) { print ''; diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php index 510a26ee481..3e15d794d7e 100644 --- a/htdocs/comm/multiprix.php +++ b/htdocs/comm/multiprix.php @@ -19,10 +19,10 @@ */ /** - \file htdocs/comm/multiprix.php - \ingroup commercial - \brief Onglet choix du niveau de prix - \version $Id$ + * \file htdocs/comm/multiprix.php + * \ingroup societe + * \brief Onglet choix du niveau de prix + * \version $Id$ */ require_once("./pre.inc.php"); @@ -82,7 +82,11 @@ if ($_socid > 0) $head = societe_prepare_head($objsoc); - dol_fiche_head($head, 'customer', $langs->trans("ThirdParty")); + $tabchoice=''; + if ($objsoc->client == 1) $tabchoice='customer'; + if ($objsoc->client == 2) $tabchoice='prospect'; + + dol_fiche_head($head, $tabchoice, $langs->trans("ThirdParty")); print '
'; diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php index 261e5325f2e..5e1329fab26 100644 --- a/htdocs/comm/prospect/fiche.php +++ b/htdocs/comm/prospect/fiche.php @@ -102,7 +102,9 @@ if ($socid > 0) print ''.$langs->trans("Name").''.$societe->nom.''; print ''.$langs->trans("Address").''.nl2br($societe->adresse).""; - print ''.$langs->trans('Zip').' / '.$langs->trans('Town').''.$societe->cp." ".$societe->ville.''; + // Zip / Town + print ''.$langs->trans('Zip').''.$societe->cp.''; + print ''.$langs->trans('Town').''.$societe->ville.''; // Country print ''.$langs->trans("Country").''; @@ -115,7 +117,7 @@ if ($socid > 0) print ''.$langs->trans('JuridicalStatus').''.$societe->forme_juridique.''; - // Level + // Level of prospect print ''; print '"; print ''; + // Multiprice level + if ($conf->global->PRODUIT_MULTIPRICES) + { + print '"; + print ''; + } + // Status print ''; print '
'; print $langs->trans('ProspectLevelShort'); @@ -135,6 +137,22 @@ if ($socid > 0) print "
'; + print '
'; + print $langs->trans("PriceLevel"); + print ''; + if ($user->rights->societe->creer) + { + print ''.img_edit($langs->trans("Modify")).''; + } + print '
'; + print '
'.$societe->price_level."
'.$langs->trans("Status").''.$societe->getLibStatut(4).'';