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

Fix: Pb mise a jout note et libell d'une action

Browse Source
This commit is contained in:
Laurent Destailleur 2005-01-11 19:26:38 +00:00
parent c41d919909
commit 2290ff6380
4 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/actioncomm.class.php
View File

@ -91,8 +91,8 @@ class ActionComm
$this->priority = 0;
}
$sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm (datea, fk_action, fk_soc, fk_user_author, fk_user_action, fk_contact, percent, note,priority,propalrowid) ";
$sql .= " VALUES ('$this->date', $this->type, $this->societe, $author->id,";
$sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm (datea, label, fk_action, fk_soc, fk_user_author, fk_user_action, fk_contact, percent, note,priority,propalrowid) ";
$sql .= " VALUES ('$this->date', '$this->libelle', $this->type, $this->societe, $author->id,";
$sql .= $this->user->id . ", $this->contact, '$this->percent', '$this->note', $this->priority, $this->propalrowid);";
if ($this->db->query($sql) )

27
htdocs/comm/action/fiche.php
View File

@ -74,8 +74,13 @@ if ($_POST["action"] == 'add_action')
$actioncomm->type = $_POST["actionid"];
$actioncomm->priority = isset($_POST["priority"])?$_POST["priority"]:0;
$actioncomm->libelle = $_POST["label"];
if ($_POST["actionid"] == 5)
{
if ($contact->fullname) { $actioncomm->libelle = $langs->trans("TaskRDVWith",$contact->fullname); }
else { $actioncomm->libelle = $langs->trans("TaskRDV"); }
} else {
$actioncomm->libelle = $_POST["label"];
}
$actioncomm->date = $db->idate(mktime($_POST["heurehour"],
$_POST["heuremin"],
0,
@ -111,12 +116,12 @@ if ($_POST["action"] == 'add_action')
if ($_POST["actionid"] == 5)
{
$libelle = "Rendez-vous avec ".$contact->fullname;
$libelle .= "\n" . $actioncomm->libelle;
$libellecal = "Rendez-vous avec ".$contact->fullname;
$libellecal .= "\n" . $actioncomm->libelle;
}
else
{
$libelle = $actioncomm->libelle;
$libellecal = $actioncomm->libelle;
}
$webcal->date=mktime($_POST["heurehour"],
@ -126,7 +131,7 @@ if ($_POST["action"] == 'add_action')
$_POST["acday"],
$_POST["acyear"]);
$webcal->texte=$societe->nom;
$webcal->desc=$libelle;
$webcal->desc=$libellecal;
}
}
@ -262,7 +267,7 @@ if ($_GET["action"] == 'create')
add_row_for_webcal_link();
print '<tr><td valign="top">'.$langs->trans("Comment").'</td><td>';
print '<tr><td valign="top">'.$langs->trans("Description").'</td><td>';
print '<textarea cols="60" rows="6" name="note"></textarea></td></tr>';
print '<tr><td colspan="2" align="center"><input type="submit" value="'.$langs->trans("Add").'"></td></tr>';
print '</table>';
@ -292,7 +297,7 @@ if ($_GET["action"] == 'create')
}
print '</td></tr>';
print '<tr><td width="10%">'.$langs->trans("Label").'</td><td><input type="text" name="todo_label" size="30"></td></tr>';
print '<tr><td width="10%">'.$langs->trans("Label").'</td><td><input type="text" name="label" size="30"></td></tr>';
// Societe, contact
print '<tr><td width="10%">'.$langs->trans("ActionOnCompany").'</td><td width="40%">';
@ -418,6 +423,7 @@ if ($_GET["id"])
print '<table class="border" width="100%">';
print '<tr><td width="20%">'.$langs->trans("Type").'</td><td colspan="3">'.$act->type.'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("Label").'</td><td colspan="3">'.$act->libelle.'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("Company").'</td>';
print '<td width="30%"><a href="../fiche.php?socid='.$act->societe->id.'">'.$act->societe->nom.'</a></td>';
@ -435,7 +441,7 @@ if ($_GET["id"])
if ($act->note)
{
print '<tr><td valign="top">'.$langs->trans("Comment").'</td><td colspan="3">';
print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="3">';
print nl2br($act->note).'</td></tr>';
}
print '<tr><td align="center" colspan="4"><input type="submit" value="'.$langs->trans("Save").'"</td></tr>';
@ -446,6 +452,7 @@ if ($_GET["id"])
// Affichage fiche action en mode visu
print '<table class="border" width="100%"';
print '<tr><td width="20%">'.$langs->trans("Type").'</td><td colspan="3">'.$act->type.'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("Label").'</td><td colspan="3">'.$act->libelle.'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("Company").'</td>';
print '<td width="30%">'.$act->societe->nom_url.'</td>';
@ -462,7 +469,7 @@ if ($_GET["id"])
if ($act->note)
{
print '<tr><td valign="top">'.$langs->trans("Comment").'</td><td colspan="3">';
print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="3">';
print nl2br($act->note).'</td></tr>';
}
print '</table>';

2
htdocs/langs/en_US/commercial.lang
View File

@ -12,3 +12,5 @@ CardAction=Task card
PercentDone=Percentage done
ActionOnCompany=Task about company
ActionOnContact=Task about contact
TaskRDV=Rendez-vous
TaskRDVWith=Rendez-vous with %s

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

@ -12,3 +12,6 @@ CardAction=Fiche action
PercentDone=Pourcentage réalisé
ActionOnCompany=Action concernant la société
ActionOnContact=Action concernant le contact
TaskRDV=Rendez-vous
TaskRDVWith=Rendez-vous avec %s