lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
121,269 Commits 43 Branches 150 Tags 886 MiB
add_rest_api_region
Commit Graph

988 Commits

Author SHA1 Message Date
Laurent Destailleur
40bc26a666 NEW Ad the target to select attendees of event for emailings 2022-11-23 21:29:15 +01:00
Laurent Destailleur
03e8e49465 Fix responsive 2022-11-23 20:31:26 +01:00
Laurent Destailleur
0a9381f2d1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-11-16 20:35:29 +01:00
Laurent Destailleur
5b49021bb4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-16 20:20:34 +01:00
Laurent Destailleur
23feae3ee2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-16 20:07:51 +01:00
VESSILLER
90191d6ce8 FIX stickler-ci 2022-11-16 12:23:17 +01:00
VESSILLER
3b3ebfa1c2 NEW triggers on mailing 2022-11-16 11:45:42 +01:00
VESSILLER
10154cc357 FIX remove not initialized variable 2022-11-16 11:05:39 +01:00
VESSILLER
6e33d1e2b1 FIX merge errors on mailing card 2022-11-16 10:48:25 +01:00
Laurent Destailleur
5b22eeab31 Fix support of inline src data 2022-10-23 20:45:27 +02:00
Laurent Destailleur
c9573510de css 2022-10-22 15:23:07 +02:00
Laurent Destailleur
3cd16d80f4 NEW Can edit label of an emailing even once sent 2022-10-22 14:43:22 +02:00
Laurent Destailleur
fee00a3655 Look and feel 2022-10-19 00:29:23 +02:00
Laurent Destailleur
be10cdee95 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-06 16:03:50 +02:00
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
Alexandre SPANGARO
9772bbeff3 Use isModEnabled 2022-09-25 21:58:40 +02:00
Laurent Destailleur
8771dc197b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-12 10:32:50 +02:00
Laurent Destailleur
8ac625f03b FIX reading of trackid in emailcollector (when on recipient suffix) 2022-09-12 10:26:20 +02:00
Laurent Destailleur
439bef8e0e NEW Add substitution key __SENDEREMAIL_SIGNATURE__ 2022-09-10 15:55:36 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Frédéric France
e71692e745 fix php8 warnings 2022-08-31 22:02:31 +02:00
Philippe GRAND
5f1d6b406f FIX php8 compatibility 2022-08-28 13:47:36 +02:00
Laurent Destailleur
5c3139974c css 2022-07-28 14:55:47 +02:00
Laurent Destailleur
dd29018987 Fix bad table name 2022-07-24 18:27:15 +02:00
Laurent Destailleur
71045cbe83 Fix popup message 2022-07-13 14:00:19 +02:00
Laurent Destailleur
97acf949fc Clean message on email limit 2022-07-13 13:39:16 +02:00
Laurent Destailleur
24dc936000 Revert "default to create on card.php if $action is empty" 
This reverts commit e0b664066b.
 2022-07-11 00:05:50 +02:00
Christian Foellmann
e0b664066b default to create on card.php if $action is empty 2022-07-11 00:01:42 +02:00
Laurent Destailleur
264f8ab4ce
Merge pull request #21342 from frederic34/useismodenabled 
Use getDolGlobalString
 2022-06-23 09:55:31 +02:00
Laurent Destailleur
55326331b9 Fix reposition 2022-06-22 22:14:08 +02:00
Frédéric France
287f868fbb use getDolGlobalString 2022-06-22 08:36:24 +02:00
Laurent Destailleur
8ee30e067f Rename var 2022-06-20 02:23:37 +02:00
Laurent Destailleur
e97f021380 Fix #yogosha11295 2022-06-19 19:02:16 +02:00
Laurent Destailleur
25ecbe3401 Debug v16 2022-06-15 03:26:27 +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
480452e291 FIX missing filters 2022-05-29 10:35:49 +02:00
Laurent Destailleur
f6ad688ddd FIX module for emailing target selection must use a condition on module 2022-05-28 20:50:24 +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
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
Regis Houssin
b70d3eb8eb FIX uniformize with element name "contact" 2022-03-18 12:05:59 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Frédéric FRANCE
c8640f329e
add missing global 2022-02-15 18:31:05 +01:00
Laurent Destailleur
44bc197d03 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-01 13:25:45 +01:00
Laurent Destailleur
d167e022eb Debug v15 2022-01-31 12:08:51 +01:00
Laurent Destailleur
d06f570c23 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-19 16:50:11 +01:00
Laurent Destailleur
60b90056c4 Fix #yogosha8450 2022-01-19 15:20:10 +01:00
Laurent Destailleur
fb6e5f03f9 Clean code and translation 2022-01-18 13:44:52 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
8e2f76ca66
Merge pull request #17577 from OGPayet/feature/addThirdpartyCustomerCodeToEmailingSubstitutionArray 
add thirdparty customer code to substitutionarray
 2022-01-11 13:31:32 +01:00
Laurent Destailleur
54cf91eda4
Update card.php 2022-01-11 13:31:16 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed 
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
 2021-11-29 15:09:18 +01:00
Laurent Destailleur
441af6b6fb Fix add rel="noopener noreferrer" 2021-11-22 02:35:55 +01:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
 2021-10-16 13:01:03 +02:00
lvessiller
be4a00213c FIX optional visibility on create card 2021-10-08 15:58:08 +02:00
Laurent Destailleur
ff56415c00
Merge pull request #18903 from aspangaro/15a21 
HTML5 - <font> tag is deprecated, replace by <span>
 2021-10-05 16:51:41 +02:00
Alexandre SPANGARO
c57aea1ead HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:10:37 +02:00
Laurent Destailleur
b3cb56f2ef Clean css 2021-10-04 04:14:31 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Christian Foellmann
08b395e127 another set of cleanup for action buttons 2021-09-22 08:43:30 +02:00
Laurent Destailleur
1d597e8a72 Fix add unset* action as sensible GET actions 2021-09-19 18:03:38 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
8193e792b5 Fix responsive 2021-09-01 22:39:01 +02:00
Laurent Destailleur
1bce356efa Fix responsive 2021-09-01 21:34:59 +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
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Laurent Destailleur
bd35d86268 Debug v14 2021-07-31 17:20:48 +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
c4e8866727 Clean code 2021-06-16 21:20:27 +02:00
Laurent Destailleur
5a3d7663d1
Merge pull request #17764 from Hystepik/develop#3 
Fix of a bug on mass mailing
 2021-06-04 12:32:48 +02:00
lmarcouiller
c77dee0922 changes to fetch after send 2021-06-04 12:27:50 +02:00
Laurent Destailleur
e73dad30bb Warning 2021-06-04 11:53:12 +02:00
lmarcouiller
05a966b93e Fix of a bug on mass mailing 2021-05-28 10:29:46 +02:00
Laurent Destailleur
a09db63c7b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/contrat/list.php
	htdocs/don/class/api_donations.class.php
	htdocs/societe/class/societe.class.php
 2021-05-25 20:17:54 +02:00
Laurent Destailleur
1b5f7b78b5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-25 20:12:34 +02:00
Adrien Raze
90d159fbc3 FIX : Missing hook in cibles.php (for mailing) 2021-05-18 14:58:46 +02:00
Laurent Destailleur
a4f4cca895
Prefix length may have different length and be at a different place so i remove this tag. Must be replaced by a generic method to substring a substitution variable. 2021-05-17 08:36:49 +02:00
lmarcouiller
06c1817930 Update mailing-send script and mailling card 2021-05-12 09:21:28 +02:00
lmarcouiller
cd4583a841 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-12 09:08:19 +02:00
Laurent Destailleur
91312f0411 Fix url for emailing unsubscribe 2021-05-11 21:13:52 +02:00
Laurent Destailleur
dc2c5aa0a8 Add substitution __UNSUBSCRIBE_URL__ for link to unsubscribe 
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop

Conflicts:
	htdocs/theme/eldy/global.inc.php
	htdocs/theme/eldy/info-box.inc.php
 2021-05-11 21:02:27 +02:00
Pierre Payet
4ce81ee535 set new outside the loop, add fetch result check 2021-05-11 20:30:57 +02:00
Pierre Payet
ff178667a3 add thirdparty customer code to substitutionarray 2021-05-11 12:33:35 +02:00
daraelmin
22d9c4c166
Update card.php 2021-05-08 09:35:41 +02:00
daraelmin
2e1158934b
Copyright 2021-05-08 09:20:59 +02:00
daraelmin
33d68db9a1
add entity in new subst publiclink_newmemberform 2021-05-08 09:18:41 +02:00
daraelmin
7c27e9f931
too much underscore 2021-05-07 17:19:33 +02:00
daraelmin
0173d8db5f
Add substitution key for membernewform url in mailing 2021-05-07 17:09:59 +02:00
lmarcouiller
b41a87ff70 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-07 12:06:46 +02:00