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

Fix: [ bug #1353 ] Email notifications, wrong URL

Browse Source
This commit is contained in:
Laurent Destailleur 2014-05-06 22:21:34 +02:00
parent 7a452519e7
commit 460b5296ba
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -16,6 +16,7 @@ Fix: [ bug #1357 ] Invoice creator state not printed in generated invoice docume
Fix: Suppliers invoice mask fails using {tttt} in numbering. Fix: Suppliers invoice mask fails using {tttt} in numbering.
Fix: pdf template name for typhon was not correctly et when enabling module. Fix: pdf template name for typhon was not correctly et when enabling module.
Fix: Navigation on notes for shipments was not working. Fix: Navigation on notes for shipments was not working.
Fix: [ bug #1353 ] Email notifications, wrong URL.
***** ChangeLog for 3.5.2 compared to 3.5.1 ***** ***** ChangeLog for 3.5.2 compared to 3.5.1 *****
Fix: Can't add user for a task. Fix: Can't add user for a task.

6
htdocs/core/class/notify.class.php
View File

@ -133,7 +133,7 @@ class Notify
$langs->load("other"); $langs->load("other");
dol_syslog("Notify::send action=$action, socid=$socid, texte=$texte, objet_type=$objet_type, objet_id=$objet_id, file=$file"); dol_syslog(get_class($this)."::send action=".$action.", socid=".$socid.", texte=".$texte.", objet_type=".$objet_type.", objet_id=".$objet_id.", file=".$file);
$sql = "SELECT s.nom, c.email, c.rowid as cid, c.lastname, c.firstname,"; $sql = "SELECT s.nom, c.email, c.rowid as cid, c.lastname, c.firstname,";
$sql.= " a.rowid as adid, a.label, a.code, n.rowid"; $sql.= " a.rowid as adid, a.label, a.code, n.rowid";
@ -185,10 +185,10 @@ class Notify
$link='/compta/facture.php?facid='.$objet_id; $link='/compta/facture.php?facid='.$objet_id;
break; break;
case 'order': case 'order':
$link='/commande/fiche.php?facid='.$objet_id; $link='/commande/fiche.php?id='.$objet_id;
break; break;
case 'order_supplier': case 'order_supplier':
$link='/fourn/commande/fiche.php?facid='.$objet_id; $link='/fourn/commande/fiche.php?id='.$objet_id;
break; break;
} }
// Define $urlwithroot // Define $urlwithroot