2
0
forked from Wavyzz/dolibarr
Commit Graph

230 Commits

Author SHA1 Message Date
sonikf
f2430b0d7f Fix space 2024-12-12 10:42:03 +02:00
Laurent Destailleur (aka Eldy)
6eb2fe4689 Fix trans 2024-12-03 10:31:41 +01:00
Laurent Destailleur
cf65b5346c Debug v21 2024-11-09 16:18:54 +01:00
Laurent Destailleur
7f9759aa81 Maxi debug of the email notification feature an dlook and feel v21 2024-10-15 20:28:05 +02:00
sonikf
8444883574 Fix translation (#31275)
* Fix translation

* Fix translation

* Fix translation

* Fix translation
2024-10-04 17:36:11 +02:00
Laurent Destailleur
e4227c6913 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-09-12 16:30:57 +02:00
Laurent Destailleur
94cdc284b3 Better log and fix search of contact for emailcollector 2024-09-12 12:32:33 +02:00
Laurent Destailleur
367cdd7ccc Fix emailcollector from tickets 2024-08-27 22:21:29 +02:00
Laurent Destailleur
1277c19a2d Fix emailcollector from tickets 2024-08-27 22:20:51 +02:00
Laurent Destailleur
d83ee1f20f Typo 2024-08-26 18:35:07 +02:00
Laurent Destailleur
fc248351fa Typo 2024-08-26 18:34:33 +02:00
Laurent Destailleur
f93f1b779e Fix typo 2024-08-26 18:21:51 +02:00
Lucas Marcouiller
52c40c9031 New massaction reset for mailing target (#30710)
* New massaction reset for mailing target

* Update mails.lang

---------

Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-08-21 15:28:23 +02:00
lamrani abdelwadoud
1bd3d1877e NEW Preview product list when we choose model layout Commerce (#30185)
* New update for templateMail by creating files

* New updating for get php content

* Update html.formmail.class.php

* Fix updating content news

* Fix CTI Errors

* NEW function for Preview In CKeditor products

* edit html file for news

* Add automaticaly subject value to editor

* Update html.formmail.class.php

* FIX name and path of file

* Fix path for files

* Fix errors variables

* replace file in ajax folder

* rename path

* Fix return function in product class

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-08-15 17:39:15 +02:00
Laurent Destailleur
87c7a7a7d7 WIP Page to setup email for reset password 2024-07-31 22:26:54 +02:00
lamrani abdelwadoud
31a560422d New Preview mai topic value on Ckeditor (#30195)
* New update for templateMail by creating files

* New updating for get php content

* Update html.formmail.class.php

* Fix updating content news

* Fix CTI Errors

* edit html file for news

* Add automaticaly subject value to editor

* Update html.formmail.class.php

* FIX name and path of file

* Fix path for files

* Fix errors variables

* replace file in ajax folder

* rename path

* update the news file

* fix phan errors

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-31 19:12:40 +02:00
Laurent Destailleur
940b946dfb Debug v20 2024-07-22 13:19:35 +02:00
Frédéric FRANCE
4040dd2462 add missing translation (#30072) 2024-06-18 18:32:04 +02:00
Frédéric FRANCE
7e97c6f46c Update mails.lang fix pre-commit (#29927) 2024-06-08 14:54:09 +02:00
Laurent Destailleur
f94d0cd907 Debug v20 2024-04-20 14:28:59 +02:00
Laurent Destailleur
1551d02449 Trans 2024-04-04 15:05:13 +02:00
Laurent Destailleur
e3c76ca86a Clean translation files 2024-03-20 15:25:47 +01:00
Laurent Destailleur
363a083c54 Look and feel v20 2024-03-19 15:34:47 +01:00
Laurent Destailleur
034ce8cb98 Fix trans key code 2024-03-18 14:44:18 +01:00
Lamrani Abdel
632ee1b81b NEW auto fill infos in template email 2024-03-18 04:36:25 +01:00
Laurent Destailleur
fa27adec1b Clean trans 2024-03-02 16:52:12 +01:00
Laurent Destailleur
16b2cf2880 Fix creation of emailing 2024-02-25 20:41:58 +01:00
MDW
7b54824d49 Fix #28071 - New branch to fix bad merge (#28083)
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

* Qual: Introduce getDataToShowPhoto to prepare generic code

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Fix missing trans

* Fix langs

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Remove useless files in web templates

* Clean code

* Fix duplicate translation key

* Fix duplicate translation key

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Fix duplicate key

* Fix $object

* Debug v19

* WIP SMSing

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* WIP EMAILINGS_SUPPORT_ALSO_SMS

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* WIP SMSing

* Debug the "validate" feature

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Clean code

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

* Enhance rector to fix empty($user->rights->modulex->perm1)

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

* Fix template to use v19 dev rules

* Fix use v19 dev rules

* Fix phpunit

* Debug v19

* Clean code

* Use rector to convert user->rights into user->hasRight

* Clean code

* Use rector to convert user->rights into user->hasRight

* Use rector to convert user->rights into user->hasRight

* Clean code

* Fix phpcs

* add editorconfig for sql files (#27999)

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* add model_pdf field in llx_ticket-ticket.sql (#27996)

* add model_pdf field in llx_ticket-ticket.sql

* Update 19.0.0-20.0.0.sql

* Update 19.0.0-20.0.0.sql

* Improve wording in README (#27994)

* fix phpstan (#27989)

* fix phpstan

* Update UserRightsToFunction.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Qual: Fix spelling/working in datapolicy translations (#28006)

# Qual: Fix spelling/wording in datapolicy translations

Fixed some spelling and wording in datapolicy translations.

* qual: phpstan for htdocs/ticket/class/ticketstats.class.php (#27986)

htdocs/ticket/class/ticketstats.class.php	98	Parameter #1 $year (string) of method TicketStats::getNbByMonth() should be compatible with parameter $year (int) of method Stats::getNbByMonth()

* Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop

* Fix user with readonly perm on email template must be able to read.

* Fix doc

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Better message

* Add missing fields in merge of thirdparty

* Debug v19 selection of ticket printer per terminal

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Use constant

* NEW: Adding a recipient on emails sent, change status to sent partialy.

* fix travis (#28052)

* fix travis

* Update partnership.class.php

* fix php doc (#28047)

* fix undefined array key (#28048)

* Add region and departament for Cuba (#28046)

* Update llx_10_c_regions.sql

Add Cuba Regions (id_country=77)

* Update llx_20_c_departements.sql

Add Provinces Cuba (id country=77)

* Find the typo (#28050)

* Find the typo

* clean code

* add last_main_doc field to product (#28045)

* add las_main_doc field to product

* add field fetch

* NEW Add Categorie filter for ActionComm (#28041)

* New Add Categorie filter for ActionComm

New Add Categorie filter for ActionComm

* Fix space errors

Fix space errors

* Fix space errors 2

Fix space errors 2

* Update cunits.class.php (#28056)

FIX: error SQL when creating a Cunit

* Update codespell-lines-ignore.txt to avoid PR merge conflict

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
Co-authored-by: Frédéric FRANCE <frederic34@users.noreply.github.com>
Co-authored-by: thibdrev <thibault.drevet@gmail.com>
Co-authored-by: sonikf <93765174+sonikf@users.noreply.github.com>
Co-authored-by: Ikarus <44511582+LeKarSol@users.noreply.github.com>
Co-authored-by: Anthony Damhet <73399671+EchoLoGeek@users.noreply.github.com>
Co-authored-by: Quentin-Seekness <72733832+Quentin-Seekness@users.noreply.github.com>
2024-02-09 15:58:49 +01:00
Laurent Destailleur
eb4f53665d Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	.github/workflows/pre-commit.yml
	ChangeLog
	dev/tools/codespell/codespell-lines-ignore.txt
	htdocs/comm/mailing/card.php
	htdocs/contact/card.php
	htdocs/langs/en_US/admin.lang
	htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
2024-02-07 18:30:10 +01:00
Laurent Destailleur
a3d0fbd279 Debug v19 2024-02-03 13:00:10 +01:00
Lamrani Abdel
3cc15d4163 New display for template email in boxes 2024-01-29 15:38:13 +01:00
MDW
ef95c56ecd Qual: Fix spelling.
# Qual: Fix some spelling
2024-01-21 13:37:53 +01:00
Lamrani Abdel
77389ed565 create input in emailForm for put instructions 2024-01-16 18:43:19 +01:00
MDW
9cb872c8d3 Fix spelling in base language (#26671) 2023-11-17 16:20:49 +01:00
Laurent Destailleur
99ba735327 Fix message 2023-04-26 22:49:33 +02:00
Laurent Destailleur
516232a190 Add info for opt out email 2023-04-08 19:17:14 +02:00
Laurent Destailleur
7e200e4506 WIP Add field include opt-outed emails into email screen 2023-04-08 13:29:30 +02:00
Laurent Destailleur
4ad90b36d0 NEW Setup emailcollector easier. Can also use ! for negative search. 2023-04-07 14:44:02 +02:00
Laurent Destailleur
8612a88a2f Sync transifex
Debug v17
2023-03-02 10:38:45 +01:00
Laurent Destailleur
7b7b8fda24 Fix sending emails with data:image inside 2023-02-25 04:05:18 +01:00
Laurent Destailleur
03319bd06e Fix trans 2023-02-25 02:44:43 +01:00
Laurent Destailleur
e71ad2e23b Maxi debug of OAuth module 2023-02-07 20:12:53 +01:00
Laurent Destailleur
7c4858fdc3 Add page with help for ingoing email setup 2023-02-07 11:05:09 +01:00
Laurent Destailleur
b1136f6115 NEW Save one click to select on delivery ack, on emails. 2022-09-19 21:10:07 +02:00
Laurent Destailleur
97acf949fc Clean message on email limit 2022-07-13 13:39:16 +02:00
Laurent Destailleur
e9ba9fc103 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
2021-10-26 13:52:00 +02:00
Laurent Destailleur
076bfd82a3 FIX option "Default value for field 'Refuse bulk emailings'" 2021-09-01 22:38:47 +02:00
Laurent Destailleur
bd35d86268 Debug v14 2021-07-31 17:20:48 +02:00
Laurent Destailleur
6c649089b8 Fix trans 2021-04-30 17:24:07 +02:00
Florian HENRY
8adfe54949 bulk email management 2021-01-07 17:33:57 +01:00