Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma
2019-02-03 19:27:16 +01:00
Laurent Destailleur
e309261140
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-03 18:19:58 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-03 14:29:45 +01:00
Laurent Destailleur
ebe30f7a0e
FIX error report not returned
2019-02-01 19:19:23 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged
2019-01-27 10:49:34 +01:00
Laurent Destailleur
300889f53a
# WARNING: head commit changed in the meantime
...
Fix
2019-01-19 13:22:38 +01:00
Laurent Destailleur
2bbaae88d6
Fix standardize 'createfromclone' param when cloning
2019-01-19 12:46:38 +01:00
Laurent Destailleur
b47e7b2267
Work on new unsubscribe process
2018-12-11 09:49:46 +01:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-24 23:04:26 +02:00
Laurent Destailleur
6c814b32bd
Standardize cod
2018-09-23 15:58:33 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-04 20:48:35 +02:00
Philippe GRAND
707f8b7312
fix merge
2018-09-04 14:49:56 +02:00
Frédéric FRANCE
03a5aba8a2
move phpcs:ignore
2018-09-02 18:49:23 +02:00
Frédéric FRANCE
4ea582ad4a
move phpcs:ignore
2018-09-02 11:12:07 +02:00
Frédéric FRANCE
47879d44bc
move phpcs:ignore
2018-09-02 09:57:19 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 13:52:51 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration
2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace
2018-08-29 21:25:22 +02:00
Frédéric FRANCE
cbdc669ba9
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-29 18:45:36 +02:00
Frédéric FRANCE
0e512cbc36
Merge remote-tracking branch 'upstream/develop' into trimtrailing2
2018-08-29 15:47:55 +02:00
Laurent Destailleur
ee204e2e64
Fix regression in php style
2018-08-29 15:37:35 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-28 09:34:53 +02:00
Frédéric FRANCE
1182f29864
trimtrailing
2018-08-28 08:33:02 +02:00
Laurent Destailleur
2306f8a7c2
Merge pull request #9265 from grandoc/new_branch_18_08_2018
...
Typo
2018-08-28 02:25:24 +02:00
Philippe GRAND
2fa82edd39
Standardize and update code
2018-08-23 17:07:27 +02:00
Philippe Grand
9b2e754b46
Update advtargetemailing.class.php
2018-08-22 22:41:22 +02:00
Philippe GRAND
449ef9c464
Update and standardize code
2018-08-22 18:12:44 +02:00
Philippe GRAND
6542dcf0bd
Update and standardize code
2018-08-22 12:04:50 +02:00
Philippe GRAND
e0462b975b
Update and standardize code
2018-08-22 11:48:26 +02:00
Philippe GRAND
0ffad50974
Update and standardize code
2018-08-22 11:24:31 +02:00
Philippe GRAND
29f15b4ae6
Update and standardize code
2018-08-22 10:51:55 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-21 20:57:58 +02:00
Laurent Destailleur
db3c17668e
Fix coding style
2018-08-21 19:08:11 +02:00
Laurent Destailleur
0799970804
Merge pull request #9248 from frederic34/FunctionDeclaration
...
function declaration
2018-08-21 13:41:56 +02:00
Philippe Grand
ccdae4c597
Update html.formadvtargetemailing.class.php
2018-08-18 19:15:25 +02:00
Philippe GRAND
c8c8af55a0
Typo
2018-08-18 15:56:23 +02:00
Philippe GRAND
da951e61f2
Update and standardize code
2018-08-17 22:29:21 +02:00
Philippe GRAND
c48211ad70
Update and standardize code
2018-08-17 19:31:22 +02:00
Frédéric FRANCE
7bb781eea8
function declaration
2018-08-15 14:28:34 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function
2018-08-13 17:26:32 +02:00
Laurent Destailleur
8693775fc5
Fix phpunit
2018-06-24 18:15:49 +02:00
Laurent Destailleur
459fe7189d
Fix phpunit
2018-06-24 17:55:03 +02:00
atm-quentin
d53aa71673
NEW advance target filtering can be used everywhere with tpl and fk_element
2018-06-22 10:54:00 +02:00
Laurent Destailleur
0a11d52d53
Fix info on email sent
2018-01-29 12:46:07 +01:00
Laurent Destailleur
ce32da6217
Fix debugs APIs
2017-12-01 15:39:18 +01:00
Laurent Destailleur
5e34b121dd
Add more robust php unit to detect not escaped sql. Fix not escaped sql
2017-09-15 15:41:07 +02:00
Laurent Destailleur
c52e593ea8
Fix this->db
2017-09-14 21:27:14 +02:00
Laurent Destailleur
939d33cce7
Fix bug reported by scrutinizer
2017-09-12 19:12:39 +02:00
Laurent Destailleur
03fe9d4e97
Escape all status
2017-09-08 13:23:12 +02:00
Laurent Destailleur
bdfb0b7561
FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes
2017-07-26 21:22:53 +02:00
florian HENRY
816283d1e5
fix SQL
2017-07-12 17:51:32 +02:00
florian HENRY
c85bf18f0e
Fix AdvtargetEmailing
2017-07-11 14:47:37 +02:00
Regis Houssin
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
Laurent Destailleur
553f5b990c
Fix scrutinizer errors
2017-05-13 18:50:55 +02:00
Laurent Destailleur
fa290c34fa
Fix against SQL injection. Add phpunit to detect missing escapement.
2017-05-12 16:55:11 +02:00
Laurent Destailleur
0c76db7973
FIX #6698 #6742
2017-05-04 13:41:37 +02:00
Laurent Destailleur
45263c85ec
Fix in emailing
2017-01-29 20:33:08 +01:00
florian HENRY
654fbc5dc7
fix travis
2016-12-10 11:36:43 +01:00
florian HENRY
a0e8b509db
Finish Advance target emailing feature (back from hashes since 3.7)
2016-12-09 19:06:59 +01:00
Laurent Destailleur
da387db166
NEW Error code of each email sent is visible in list of email targets
2016-11-11 14:03:57 +01:00
Laurent Destailleur
e4c4ced5a3
Complete work on usin dol_banner
2016-11-11 01:55:53 +01:00
Laurent Destailleur
8f809e403d
Uniformize code
2016-08-24 19:38:34 +02:00
Laurent Destailleur
d22ef4f371
Fix Do not show status
2016-07-06 22:35:12 +02:00
Laurent Destailleur
c8d98dbfdc
FIX error reported by scrutinizer
2016-05-08 11:33:46 +02:00
Juanjo Menent
ae6e233781
Merge pull request #5176 from Dolibarr/scrutinizer-patch-3
...
Scrutinizer Auto-Fixes
2016-05-07 00:49:57 +02:00
Laurent Destailleur
bf09e4a0b9
PHPdoc
2016-05-06 21:28:06 +02:00
Scrutinizer Auto-Fixer
9508d8a5c0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-05-06 19:10:59 +00:00
Laurent Destailleur
5a75f346ff
Debug advanced selector
2016-05-06 00:02:22 +02:00
Florian HENRY
b7a0ab784b
travis
2016-04-04 16:59:17 +02:00
Florian HENRY
c0c37c4992
travis
2016-04-04 16:36:39 +02:00
Florian HENRY
86c34a313e
travis
2016-04-04 15:28:25 +02:00
Florian HENRY
038b928ea4
fix travis
2016-04-01 17:09:03 +02:00
Florian HENRY
304aab957b
Start implement advance arget emalaing
2016-04-01 10:52:19 +02:00
aspangaro
45cc841b92
Correct travis
2016-02-13 08:10:13 +01:00
Laurent Destailleur
d0ab1db19b
NEW When emailing is not sent completely, show progression
2016-02-12 14:21:44 +01:00
Laurent Destailleur
3b595f0247
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/journal/bankjournal.php
htdocs/core/lib/date.lib.php
htdocs/core/lib/report.lib.php
htdocs/langs/en_US/accountancy.lang
2015-12-13 16:23:33 +01:00
Florian HENRY
955fad910d
FIX : Bug: $this is not accessible in static context in
...
Mailing::libStatutDest #4050
2015-12-04 17:32:17 +01:00
Laurent Destailleur
b47dbc7a5f
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/install/pgsql/functions/functions.sql
htdocs/projet/element.php
2015-11-26 01:32:21 +01:00
Marcos García de La Fuente
e31a8f25a2
FIX #4018 SQL error if trying to access the mailing/card.php page without an ID defined
2015-11-21 10:55:23 +01:00
Raphaël Doursenaud
67ddb6c94e
[Qual] Cleanup of inherited class properties
2015-09-24 20:12:55 +02:00
phf
0523f226cf
FIX : when mailing is deleted, the targets list was kept in database
2015-06-01 12:29:10 +02:00
Laurent Destailleur
41a74c62e2
Fix trigger to insert lines where called when inserting line but also
...
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
2015-02-26 13:03:17 +01:00
Marcos García de La Fuente
ec661d0c6c
Removed index.php and replaced them with blank index.html as it is more appropriate
2014-07-12 23:18:57 +02:00
Marcos García de La Fuente
7e1cf124b8
Merge branch 'develop' into syslog
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/product/class/product.class.php
htdocs/product/stock/lib/replenishment.lib.php
htdocs/societe/soc.php
2014-07-02 21:20:02 +02:00
Marcos García de La Fuente
56abf1cd72
Removed duplicated SQL error logging
2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +02:00
Florian HENRY
0de66e838c
camel case
2014-05-30 12:01:26 +02:00
Florian HENRY
c19eabf711
Better target emailing status mangement
2014-05-29 14:26:27 +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
Florian HENRY
dddbc37d35
Enable option clone target emailing
2014-04-28 17:18:11 +02:00
Laurent Destailleur
cafa61ef7d
Fix: Use correct syntax of date into sql requests (with quotes)
2014-03-15 23:12:00 +01:00
fhenry
44b5b98308
Fix [ bug #733 ]
2013-02-22 15:02:06 +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
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
Marcos García
706d79986c
Removed parenthesis from all require_once and replaced with single quotes
2012-08-22 23:11:24 +02:00
Regis Houssin
c6d703de54
Fix: convert lines delimiters
2012-06-15 11:20:09 +02:00
Regis Houssin
7644fa96dc
Fix: uniformize code and add specific rights
2012-06-13 21:48:59 +02:00
Regis Houssin
6246228544
New: add extraparams, hooks and extrafields for emailing card
2012-06-13 09:28:59 +02:00
Laurent Destailleur
34f433ee4b
Uniformize code
2012-05-09 17:14:46 +02:00
Regis Houssin
73487a6aec
Fix: replace mktime() by dol_now()
2012-04-30 15:01:25 +02:00
Laurent Destailleur
c77bc5adf5
Doxygen
2012-03-31 15:42:33 +02:00
Regis Houssin
ffc6812241
Fix: avoid php strict mode warning
2012-03-23 18:19:50 +01:00
Laurent Destailleur
ed41e03589
Qual: Fix a ton of CheckStyle errors
2012-03-18 19:23:01 +01:00
Laurent Destailleur
0a17345415
Doxygen
2012-02-16 18:39:22 +01:00
Laurent Destailleur
be6286c4b8
Qual: More POO.
...
Qual: Doxygen
2011-09-20 17:19:46 +00:00
Regis Houssin
2ecc03104c
Fix: remove obsolete tags (in progress)
2011-08-27 15:14:31 +00:00
Laurent Destailleur
f4606c2253
Fix: Avoid errors into rpm packages
2011-08-03 00:45:22 +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
10f86aa217
Reorganize class files.
2010-06-05 15:32:18 +00:00
