Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
119,231 Commits 36 Branches 189 Tags
8b7eaf360e58693a9365544cb1520f28ced7e626
Commit Graph

214 Commits

Author SHA1 Message Date
Florian HENRY
83fa90eef7 travais 2022-10-03 13:41:07 +02:00
Florian HENRY
7ac0168397 travais 2022-10-03 13:40:33 +02:00
Florian HENRY
3777b7dffe fix: [AdvTargetEmailling] bad table from select and use of dict for prospect status 2022-10-03 13:38:15 +02:00
Laurent Destailleur
dd29018987 Fix bad table name 2022-07-24 18:27:15 +02:00
Laurent Destailleur
87230795cc Fix warning 2022-06-03 14:23:37 +02:00
Laurent Destailleur
3751fc92ca Clean code 2022-06-01 20:47:14 +02:00
Laurent Destailleur
e271616bea Scrutinizer 2022-05-23 00:22:26 +02:00
Laurent Destailleur
4b996f79a9 Debug v16 2022-05-19 13:52:29 +02:00
Regis Houssin
b70d3eb8eb FIX uniformize with element name "contact" 2022-03-18 12:05:59 +01:00
Frédéric FRANCE
c8640f329e add missing global 2022-02-15 18:31:05 +01:00
Laurent Destailleur
fb6e5f03f9 Clean code and translation 2022-01-18 13:44:52 +01:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Laurent Destailleur
3dff7e29cc Fix #yogosha6567 2021-07-06 01:44:05 +02:00
Laurent Destailleur
ceaa2a9c5e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/ticket/class/actions_ticket.class.php
 2021-06-17 22:06:26 +02:00
Laurent Destailleur
5063f29532 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/mailing/class/mailing.class.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/product/stock/replenish.php
 2021-06-17 21:35:31 +02:00
atm-lena
9769e33eab notigger parameter 2021-06-17 10:41:55 +02:00
atm-lena
5b8a6f1d71 Add Trigger "MAILING_DELETE" 2021-06-17 10:41:03 +02:00
Laurent Destailleur
5a1f2db024 Clean sql 2021-04-30 10:57:21 +02:00
Laurent Destailleur
d6cdfcdd8c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/public/members/new.php
 2021-04-27 02:07:48 +02:00
Laurent Destailleur
48a50f3b10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
 2021-04-27 01:58:19 +02:00
Laurent Destailleur
804eac55e9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-04-27 01:46:04 +02:00
Laurent Destailleur
e9b8e81773 Update advtargetemailing.class.php 2021-04-27 01:45:10 +02:00
stickler-ci
318a783237 Fixing style errors. 2021-04-19 07:19:45 +00:00
Gauthier PC portable 024
8c428081ab FIX : test on link type 2021-04-19 09:17:33 +02:00
Gauthier PC portable 024
ff8aae1209 Merge branch 'fix_adv_target_emailing_extrafields_link' of github.com:atm-gauthier/dolibarr into fix_adv_target_emailing_extrafields_link 2021-04-19 09:16:06 +02:00
Gauthier PC portable 024
5b6439ca5e FIX : cast int 2021-04-19 09:15:47 +02:00
Laurent Destailleur
4bc0c5b0b6 Fix cast 2021-04-16 20:43:04 +02:00
stickler-ci
37f44f4a07 Fixing style errors. 2021-04-16 14:58:57 +00:00
Gauthier PC portable 024
f8fcf7c16b FIX : type link extrafield case for advanced target emailing 2021-04-16 16:55:19 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +02:00
Laurent Destailleur
a1366da130 FIX #yogosha5715 2021-03-23 03:45:17 +01:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00
Laurent Destailleur
cc10106a21 Fix protection on int 2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +01:00
Frédéric FRANCE
5931051c88 code syntax comm directory 2021-02-23 18:59:19 +01:00
Laurent Destailleur
cefd66c18f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-29 16:56:39 +01:00
Laurent Destailleur
7c3688c66f Fix var not defined 2020-12-28 12:36:36 +01:00
Frédéric FRANCE
12f4a74a74 Merge remote-tracking branch 'upstream/develop' into mailingcard 2020-12-27 14:04:04 +01:00
Laurent Destailleur
58cd7c97a5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/mailing/card.php
	htdocs/comm/mailing/cibles.php
	htdocs/comm/mailing/class/mailing.class.php
 2020-12-24 13:05:17 +01:00
Laurent Destailleur
360a85cbbc FIX add autofix of count of email target when data is corrupted 2020-12-24 12:32:34 +01:00
Frédéric FRANCE
cb77d9f175 Merge remote-tracking branch 'upstream/develop' into mailingcard 2020-12-09 08:55:46 +01:00
Frédéric FRANCE
4e18f46f28 doxygen 2020-12-05 23:53:55 +01:00
Frédéric FRANCE
391e643eb7 doxygen 2020-11-27 20:33:40 +01:00
Frédéric FRANCE
fa6d02fb3f doxygen 2020-11-27 00:25:45 +01:00
Frédéric FRANCE
bb09c84417 doxygen 2020-11-27 00:23:03 +01:00
Frédéric FRANCE
446997d0ba doxygen 2020-11-27 00:15:07 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00