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

New: Price level can be defined also for prospects.

Browse Source
This commit is contained in:
Laurent Destailleur 2009-06-16 18:51:48 +00:00
parent 6d8e0b05d3
commit aaac14c8c0
4 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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.

3
htdocs/comm/fiche.php
View File

@ -179,6 +179,7 @@ if ($socid > 0)
print "<tr><td valign=\"top\">".$langs->trans('Address')."</td><td colspan=\"3\">".nl2br($objsoc->adresse)."</td></tr>";
// Zip / Town
print '<tr><td>'.$langs->trans('Zip').'</td><td>'.$objsoc->cp."</td>";
print '<td>'.$langs->trans('Town').'</td><td>'.$objsoc->ville."</td></tr>";
@ -280,7 +281,7 @@ if ($socid > 0)
print '</td>';
print '</tr>';
// Multiprix
// Multiprice level
if ($conf->global->PRODUIT_MULTIPRICES)
{
print '<tr><td nowrap>';

14
htdocs/comm/multiprix.php
View File

@ -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 '<form method="POST" action="multiprix.php?id='.$objsoc->id.'">';

22
htdocs/comm/prospect/fiche.php
View File

@ -102,7 +102,9 @@ if ($socid > 0)
print '<tr><td width="25%">'.$langs->trans("Name").'</td><td width="80%" colspan="3">'.$societe->nom.'</td></tr>';
print '<tr><td valign="top">'.$langs->trans("Address").'</td><td colspan="3">'.nl2br($societe->adresse)."</td></tr>";
print '<tr><td>'.$langs->trans('Zip').' / '.$langs->trans('Town').'</td><td colspan="3">'.$societe->cp." ".$societe->ville.'</td></tr>';
// Zip / Town
print '<tr><td>'.$langs->trans('Zip').'</td><td>'.$societe->cp.'</td>';
print '<td>'.$langs->trans('Town').'</td><td>'.$societe->ville.'</td></tr>';
// Country
print '<tr><td>'.$langs->trans("Country").'</td><td colspan="3">';
@ -115,7 +117,7 @@ if ($socid > 0)
print '<tr><td>'.$langs->trans('JuridicalStatus').'</td><td colspan="3">'.$societe->forme_juridique.'</td></tr>';
// Level
// Level of prospect
print '<tr><td nowrap>';
print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
print $langs->trans('ProspectLevelShort');
@ -135,6 +137,22 @@ if ($socid > 0)
print "</td>";
print '</tr>';
// Multiprice level
if ($conf->global->PRODUIT_MULTIPRICES)
{
print '<tr><td nowrap>';
print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
print $langs->trans("PriceLevel");
print '<td><td align="right">';
if ($user->rights->societe->creer)
{
print '<a href="'.DOL_URL_ROOT.'/comm/multiprix.php?id='.$societe->id.'">'.img_edit($langs->trans("Modify")).'</a>';
}
print '</td></tr></table>';
print '</td><td colspan="3">'.$societe->price_level."</td>";
print '</tr>';
}
// Status
print '<tr><td>'.$langs->trans("Status").'</td><td colspan="2">'.$societe->getLibStatut(4).'</td>';
print '<td>';