Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some fix in contact's projects

Browse Source
This commit is contained in:
Laurent Destailleur 2010-01-13 13:32:09 +00:00
parent 1374e7eeab
commit b326033334
5 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -4,10 +4,13 @@ English Dolibarr ChangeLog
***** ChangeLog for 2.8 compared to 2.7 *****
For users:
- New: Can link contacts to projects
- New: Can removed attached file on email form if attachment was wrong.
- New: Add option to show your logo on top of left menu.
- New: task #9935: Can edit accountancy code.
- New: Add an option to make users email reuired.
- New: Module notification can send mail on order or proposal validation.
- New: Can use any antivirus on file upload.
- New: Add an option to make users email required.
- New: Module notification can send email on order or proposal validation.
- New: Can use any command line antivirus on file upload.
- New: A customer can also be a prospect.
- New: task #9802 : Can link an action to a project and use project to
filter agenda.

3
htdocs/langs/en_US/projects.lang
View File

@ -58,4 +58,5 @@ ConfirmValidateProject=Are you sure you want to validate this project ?
CloseAProject=Close project
ConfirmCloseAProject=Are you sure you want to close this project ?
ReOpenAProject=Open project
ConfirmReOpenAProject=Are you sure you want to re-open this project ?
ConfirmReOpenAProject=Are you sure you want to re-open this project ?
ProjectContact=Project contacts

3
htdocs/langs/fr_FR/projects.lang
View File

@ -58,4 +58,5 @@ ConfirmValidateProject=Etes-vous sur de vouloir valider ce projet ?
CloseAProject=Clore projet
ConfirmCloseAProject=Etes-vous sur de vouloir clore ce projet ?
ReOpenAProject=Réouvrir projet
ConfirmReOpenAProject=Etes-vous sur de vouloir rouvrir ce projet ?
ConfirmReOpenAProject=Etes-vous sur de vouloir rouvrir ce projet ?
ProjectContact=Contacts projet

23
htdocs/projet/contact.php
View File

@ -40,9 +40,10 @@ $result = restrictedArea($user, 'projet', $projectid);
/*
* Ajout d'un nouveau contact
* Actions
*/
// Add new contact
if ($_POST["action"] == 'addcontact' && $user->rights->projet->creer)
{
@ -166,12 +167,12 @@ $id = $_GET['id'];
$ref= $_GET['ref'];
if ($id > 0 || ! empty($ref))
{
$project = New Project($db);
$project = new Project($db);
if ( $project->fetch($id,$ref) > 0)
{
$soc = new Societe($db, $project->socid);
$soc->fetch($project->socid);
if ($project->societe->id > 0) $result=$project->societe->fetch($project->societe->id);
if ($project->user_resp_id > 0) $result=$project->fetch_user($project->user_resp_id);
$head = project_prepare_head($project);
@ -186,15 +187,19 @@ if ($id > 0 || ! empty($ref))
//$linkback="<a href=\"".$_SERVER["PHP_SELF"]."?page=$page&socid=$socid&viewstatut=$viewstatut&sortfield=$sortfield&$sortorder\">".$langs->trans("BackToList")."</a>";
// Ref
print '<tr><td width="25%">'.$langs->trans('Ref').'</td><td colspan="3">';
print '<tr><td width="30%">'.$langs->trans('Ref').'</td><td colspan="3">';
print $html->showrefnav($project,'ref',$linkback,1,'ref','ref','');
print '</td></tr>';
// Label
print '<tr><td>'.$langs->trans("Label").'</td><td>'.$project->title.'</td></tr>';
// Customer
if ( is_null($project->client) )
$project->fetch_client();
print "<tr><td>".$langs->trans("Company")."</td>";
print '<td colspan="3">'.$project->client->getNomUrl(1).'</td></tr>';
print '<td colspan="3">';
if ($project->societe->id > 0) print $project->societe->getNomUrl(1);
else print '&nbsp;';
print '</td></tr>';
print "</table>";

2
htdocs/projet/fiche.php
View File

@ -318,7 +318,7 @@ else
// Label
print '<tr><td>'.$langs->trans("Label").'</td><td><input size="30" name="title" value="'.$projet->title.'"></td></tr>';
// Client
// Customer
print '<tr><td>'.$langs->trans("Company").'</td><td>';
print $html->select_societes($projet->societe->id,'socid','',1,1);
print '</td></tr>';