Commit Graph

191 Commits

Author SHA1 Message Date
Laurent Destailleur
6846ff7d21 Fix problem in some vars as reported in #8955 2018-07-16 09:57:45 +02:00
Philippe GRAND
9ae7e55fea fix: breaking link 2018-07-13 19:54:37 +02:00
Frédéric FRANCE
27bf5419d6
Merge branch 'develop' into swifmailer 2018-03-09 22:44:57 +01:00
Regis Houssin
093ea49cc6 Fix: use "multidir_output" instead "dir_output" 2018-02-26 11:35:30 +01:00
Laurent Destailleur
f57ea2682a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/notify.class.php
	htdocs/societe/class/societe.class.php
2018-02-03 19:33:24 +01:00
Laurent Destailleur
8102883356 Fix error when email list contains ', ,'
Fix output dir of notification
2018-01-29 20:36:40 +01:00
Frédéric FRANCE
a34b99f3ec
swiftmailer 2018-01-21 15:55:56 +01:00
Scrutinizer Auto-Fixer
328d39bc71 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-07 11:09:31 +00:00
KHELIFA
88ab3a9cab Add a new notification for the event that has successfully closed a proposal. 2017-10-06 16:15:40 +02:00
Laurent Destailleur
f9d9642340 FIX #6981 2017-10-06 14:07:28 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
17a1874e36 FIX Counter of notification of a thirdparty 2017-04-01 13:43:05 +02:00
Laurent Destailleur
b9a9997688 Page societe/soc.php and compta/facture.php was renamed into card.php
to match page naming conventions.
2017-03-20 21:29:22 +01:00
Laurent Destailleur
5c233a41b3 NEW Add hook "formatNotificationMessage" 2017-01-09 23:55:53 +01:00
Laurent Destailleur
decbda3e23 Fix inversion application name - company name 2017-01-09 23:26:31 +01:00
Laurent Destailleur
a9354e5f27 Fix generic text must be set before specific for notification 2017-01-09 21:07:54 +01:00
Laurent Destailleur
efb05fda6a Cleaner code to avoid to log when nothing is done 2016-09-12 19:58:43 +02:00
Laurent Destailleur
9ba1ca5acb Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14
Conflicts:
	htdocs/langs/en_US/companies.lang
2016-07-15 17:05:12 +02:00
abb
23c0a0a64e conflict solved Merge branch 'develop' into abb-14
Conflicts:
	htdocs/langs/en_US/companies.lang
2016-05-02 01:28:46 +01:00
Laurent Destailleur
b639849a47 Page for proposals must be called card.php (one of last architecture
change before the freeze)
2016-04-23 15:37:22 +02:00
Bahfir Abbes
a1ed41646e moved userid parameter to end of list in getNotificationArray function 2016-03-21 19:15:01 +01:00
abb
b6e39960b4 new:handle user notification in notification module
Conflicts:
	htdocs/core/lib/usergroups.lib.php
2016-03-13 20:08:27 +01:00
abb
d35f728fad added handle to trigger FICHINTER_ADD_CONTACT in notify module 2016-03-13 19:58:39 +01:00
Laurent Destailleur
945eb9f094 NEW Add the event BILL_PAYED to list of supported events for module
notification.
2016-02-22 12:52:01 +01:00
Laurent Destailleur
97cdc55839 NEW Module notification should details of emails into confirm box, not
only number.
2015-04-13 17:04:18 +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
293495467f Fix: Bad ref used into notification message 2015-04-01 11:30:48 +02:00
Laurent Destailleur
21b1f7cc26 Fix bad calculation of email for notifications 2015-03-25 14:51:12 +01:00
Laurent Destailleur
f44d91e153 NEW: The notification module accept keyword __SUPERVISOR__ to send
notification to supervisor of user.
2015-03-19 11:47:30 +01:00
Laurent Destailleur
6ceda02eaa NEW: Enhancement of module 'Notification by Email'. Show nb of
notifications set. Can set several emails. Can set a threshold on
amount for notifications. Add notification on supplier order validation.
2015-03-18 21:44:57 +01:00
Laurent Destailleur
a2676e5768 Fix: the type of notification sent was not filled 2015-03-18 21:06:55 +01:00
Juanjo Menent
6f9d283ddc Fix: Module notifications DB Error "unknown field type" into third tab
notifications
2014-11-06 11:20:47 +01:00
Laurent Destailleur
a1a03a8061 New: Module notification has been enhanced:
EMail use now language of target contact.
Can also define a fixed email for notifications.
Better error management
2014-10-25 01:20:59 +02:00
Laurent Destailleur
0fc1c85b34 New: Module notification has been enhanced:
EMail use now language of target contact.
Can also define a fixed email for notifications.
Better error management
2014-10-25 00:42:52 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
Laurent Destailleur
32fd2e03ce More log into notify class 2014-09-04 14:38:30 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Laurent Destailleur
9f795331f5 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/charges.php
	htdocs/core/db/mysql.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
2014-05-06 23:58:17 +02:00
Laurent Destailleur
460b5296ba Fix: [ bug #1353 ] Email notifications, wrong URL 2014-05-06 22:21:34 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
cafa61ef7d Fix: Use correct syntax of date into sql requests (with quotes) 2014-03-15 23:12:00 +01:00
Laurent Destailleur
746e005726 Fix: Fix ton of regression due to field name change 2013-03-09 20:34:38 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Laurent Destailleur
bdb112c820 Fix: Using bad root url. 2012-12-12 14:46:13 +01:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Marcos García
5a73c32f46 Migrated ClassName to __construct() function
Changed $DB to $db
lower-cased "Class"
2012-07-30 17:17:33 +02:00
Laurent Destailleur
50944a71db Checkstyle 2012-05-06 00:45:15 +02:00
Regis Houssin
73487a6aec Fix: replace mktime() by dol_now() 2012-04-30 15:01:25 +02:00
Laurent Destailleur
f71073c3b5 Doxygen 2012-02-21 00:18:48 +01:00
Regis Houssin
4431510ce4 Fix: use entity field of object 2012-02-01 11:32:55 +01:00
Laurent Destailleur
ec0650e92b Doxygen 2012-01-27 16:12:11 +01:00
Regis Houssin
9549c0c608 Fix: entity filter 2011-11-08 06:56:02 +08:00
Laurent Destailleur
8d46ae1d35 Qual: Better error managment on numbering setup 2011-11-06 15:12:18 +01:00
Laurent Destailleur
699f759843 Fix: Bad sql request 2011-11-06 14:23:09 +01:00
Regis Houssin
56d6cbe56f [task #216] Move lib in core directory 2011-10-24 12:59:44 +02:00
Regis Houssin
30c5f4b214 Move all core class in htdocs/core/class 2011-10-24 09:29:17 +02:00
Regis Houssin
ac2d7aab7c Fix: Space found before comma 2011-09-20 09:59:08 +00:00
Regis Houssin
2c1b3722f2 Fix: replace sizeof() by count() 2011-09-17 19:49:50 +00:00
Laurent Destailleur
b75d19c264 Qual: Uniformize constructors 2011-09-11 18:35:38 +00:00
Laurent Destailleur
351a2974dd Doxygen 2011-09-03 00:14:27 +00:00
Laurent Destailleur
044879c838 Doxygen 2011-09-02 23:57:26 +00:00
Laurent Destailleur
0e2946cec7 Doxygen 2011-09-03 00:19:56 +00:00
Laurent Destailleur
e5988ad241 Fix: Error management when adding notification 2011-09-02 23:41:55 +00:00
Laurent Destailleur
2d89e6609e Doxygen 2011-09-03 00:14:27 +00:00
Laurent Destailleur
5be5852cf4 Fix: Third party emails must not be visible into notification page 2011-09-02 23:07:47 +00:00
Laurent Destailleur
42c86ce1ac Work on rpm package 2011-09-03 01:46:33 +00:00
Juanjo Menent
cac55067fb Qual: Uniformize code 2011-09-02 22:33:28 +00:00
Laurent Destailleur
55c5c5f9f5 Work on rpm package 2011-09-03 01:27:00 +00:00
Laurent Destailleur
f5f37fa8dc Qual: Uniformize code 2011-09-02 16:33:11 +00:00
Laurent Destailleur
d53b179102 Fix: Fix GNU address
Doxygen
2011-09-03 01:24:09 +00:00
Laurent Destailleur
f39c932b2e Qual: Uniformize code 2011-09-02 16:25:07 +00:00
Laurent Destailleur
26badd59f4 Doxygen 2011-09-03 00:27:02 +00:00
Juanjo Menent
116e215323 Uniformize code 2011-09-02 15:41:35 +00:00
Laurent Destailleur
1ca46d8ec4 Doxygen 2011-09-03 00:19:56 +00:00
Juanjo Menent
8f19ee66e4 Uniformize code 2011-09-02 14:31:53 +00:00
Laurent Destailleur
d1d145620d Doxygen 2011-09-03 00:14:27 +00:00
Regis Houssin
2ecc03104c Fix: remove obsolete tags (in progress) 2011-08-27 15:14:31 +00:00
Laurent Destailleur
be771c9d44 Fix: Avoid errors into rpm packages 2011-07-31 23:45:11 +00:00
Regis Houssin
8369e7fbe2 Fix: bad url 2011-06-20 12:35:25 +00:00
Laurent Destailleur
a00d389ea0 Doxygen 2011-06-19 14:35:16 +00:00
Regis Houssin
994d41aad1 New: unified action and event with trigger name 2011-06-04 18:49:45 +00:00
Regis Houssin
3b4ea76538 Fix: compatibility with pgsql, replace all addslashes by $this->db->escape in class 2011-02-24 18:11:12 +00:00
Laurent Destailleur
3fb07a3922 Doxygen 2010-11-22 09:18:53 +00:00
Laurent Destailleur
c1b0318222 Fix: Maxi debug of project permissions 2010-09-18 13:38:43 +00:00
Laurent Destailleur
374cb9b863 Fix: Missing sentence in notification email 2010-09-04 23:57:05 +00:00
Philippe Grand
fb06c15330 task #6689, strlen problem
replace  strlen with dol_strlen
2010-08-24 14:42:18 +00:00
Laurent Destailleur
fb4173673a Fix: Fix on PHPUnit tests 2010-07-14 23:10:56 +00:00
Laurent Destailleur
7e3791d847 Doxygen 2010-06-07 23:52:43 +00:00
Laurent Destailleur
3eb7bd2ed0 Add better message for notifications 2010-06-02 22:50:49 +00:00
Philippe Grand
24725ce2a6 according to new tree directory 2010-04-28 10:11:41 +00:00