2
0
forked from Wavyzz/dolibarr
Commit Graph

14 Commits

Author SHA1 Message Date
Laurent Destailleur
1e8b148e4b Work on tracking id into emails 2015-05-05 04:10:42 +02:00
Florian HENRY
3d8a7ee179 Start email template selector 2015-04-18 11:06:53 +02:00
Laurent Destailleur
8e9c1c4747 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/list.php
	htdocs/core/class/notify.class.php
	htdocs/core/login/functions_dolibarr.php
	htdocs/exports/export.php
	htdocs/langs/en_US/admin.lang
2015-04-01 16:33:39 +02:00
Laurent Destailleur
ad1e4134a9 Fix: bcc was lost if notif to bcc was also forced 2015-04-01 12:22:50 +02:00
Laurent Destailleur
6d1324b463 Work on expense report module 2015-02-21 16:15:54 +01:00
Laurent Destailleur
e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/comm/card.php
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/custom/.gitignore
	htdocs/expedition/card.php
	htdocs/fourn/card.php
	htdocs/product/fournisseurs.php
2015-01-18 18:44:22 +01:00
Marcos García de La Fuente
86100758ff Miscellaneous corrections 2014-12-28 20:13:15 +01:00
Laurent Destailleur
8b0a9d78bb Fix: CRLF 2014-11-18 19:03:02 +01:00
Laurent Destailleur
0a0dd81c9a Fix: When selecting a carbon copy fro select list, mail was not attached
to user.
2014-11-04 13:54:18 +01:00
Laurent Destailleur
5086450f35 Fix: Forging email content must use dol_concatdesc. 2014-11-02 12:32:38 +01:00
Laurent Destailleur
9436b1d046 New: Prepare to be able to defined a bcc for each type of email sent
from dolibarr.
2014-08-05 09:26:40 +02:00
Laurent Destailleur
ad4babb154 Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	.travis.yml
	htdocs/fichinter/fiche.php
2014-07-08 01:12:55 +02:00
Laurent Destailleur
db7bcfd748 Fix: Sending email from thirdparty must add event into agenda if option
is on.
2013-09-25 21:36:40 +02:00
Laurent Destailleur
cb04b05e85 New: Can send an email from thirdparty card. 2013-09-23 13:17:31 +02:00