Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
101,928 Commits 36 Branches 189 Tags
51a4d7630f3ac38e57c800a94a9abc6d5a3967d6
Commit Graph

447 Commits

Author SHA1 Message Date
Laurent Destailleur
51a4d7630f Clean code 2021-08-28 00:56:37 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Florian HENRY
6f3080c67c send mail from ConfOrBooth list to attendees or santd company 2021-07-29 19:24:12 +02:00
Frédéric FRANCE
f58cf14ae9 Update html.formmail.class.php 2021-06-10 22:28:19 +02:00
Frédéric FRANCE
86f39795c0 fix warnings 2021-06-10 22:26:58 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
daraelmin
bfac47c84e Too much underscore 2021-05-07 17:16:58 +02:00
daraelmin
a75d6e9050 Add tooltip 2021-05-07 17:14:33 +02:00
daraelmin
729a5677ad Group tooltip by key type 2021-05-04 01:53:46 +02:00
daraelmin
9ab7f4ec01 Add tooltip for new substitution keys 2021-05-04 01:41:32 +02:00
Laurent Destailleur
d9108362ba War against $_POST 2021-03-25 16:59:47 +01:00
daraelmin
cb71936ccd #Fix #16767 unremovable attached file in mailmodel 
#Fix #16767 make default attached file of a mail model selected removable
 2021-03-20 14:10:56 +01:00
Laurent Destailleur
017120f017 Merge pull request #16697 from frederic34/patch-3 
fix syntax
 2021-03-16 10:42:49 +01:00
Frédéric FRANCE
e89cfc3753 decompose code 2021-03-15 20:17:01 +01:00
Frédéric FRANCE
910b4f1daf Update html.formmail.class.php 2021-03-15 18:58:35 +01:00
Frédéric FRANCE
dd4b8f2880 Update html.formmail.class.php 2021-03-15 18:22:50 +01:00
Laurent Destailleur
acb7b30eb0 Merge pull request #16507 from frederic34/add_rule 
Add rule
 2021-03-02 12:52:03 +01:00
Laurent Destailleur
a161edefb1 Look and feel v14 2021-03-02 12:33:55 +01:00
Frédéric FRANCE
a4e25359e7 add missing rule 2021-03-01 20:37:16 +01:00
Frédéric FRANCE
1b046f25cf add new rule 2021-03-01 00:19:52 +01:00
Laurent Destailleur
886cbc61c8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/boxes/box_factures_fourn.php
	htdocs/core/boxes/box_factures_fourn_imp.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/boxes/box_members.php
	htdocs/core/boxes/box_propales.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2021-02-28 13:37:45 +01:00
Laurent Destailleur
3a19cbb062 FIX #16420 #16423 #16488 #16477 2021-02-28 12:47:24 +01:00
Laurent Destailleur
f5406d487b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/product.lib.php
	htdocs/product/stock/productlot_card.php
	test/phpunit/SecurityTest.php
 2021-02-26 12:53:06 +01:00
Laurent Destailleur
e7ae2e65d7 Update html.formmail.class.php 2021-02-26 10:33:49 +01:00
Laurent Destailleur
e0785ac5ef Update html.formmail.class.php 2021-02-26 10:31:02 +01:00
Laurent Destailleur
69c974800c Update html.formmail.class.php 2021-02-26 10:30:30 +01:00
daraelmin
e079ceb9c3 Fix #16420 undefined $model_mail_selected_id 
Set $model_mail_selected_id to 0 when it is undefined
 2021-02-26 08:51:01 +01:00
daraelmin
5d31a93bf0 Fix #16420 - undefined $model_mail_selected_id 
Set $model_mail_selected_id to 0 when it is undefined
 2021-02-26 08:20:51 +01:00
Florian HENRY
b5055a5edb config pages ok 2021-02-14 16:41:57 +01:00
Laurent Destailleur
f301635681 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2021-02-03 21:02:32 +01:00
Laurent Destailleur
787e03a10d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2021-02-03 20:46:22 +01:00
Laurent Destailleur
4bba124c3f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-03 20:43:32 +01:00
lvessiller
3b050c3452 FIX select default mail template 2021-02-02 10:34:33 +01:00
Frédéric FRANCE
177b87da0d Merge remote-tracking branch 'upstream/develop' into codesyntax 2021-01-16 17:58:01 +01:00
Laurent Destailleur
cdcc6b7324 Merge pull request #15974 from frederic34/davadmin 
fix trans
 2021-01-16 17:13:37 +01:00
Frédéric FRANCE
2df0acd419 code syntax 2021-01-16 14:12:09 +01:00
Laurent Destailleur
4864808e4d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2021-01-16 13:45:34 +01:00
Laurent Destailleur
b3d7783a29 Fix multicompany compatibility of preview of file in email form 2021-01-16 13:41:27 +01:00
Frédéric FRANCE
40a45efb63 fix code 2021-01-13 16:23:54 +01:00
Frédéric FRANCE
dad329602a Update html.formmail.class.php 2021-01-12 23:46:29 +01:00
Florian HENRY
98eff62aff Merge branch '13_backport' into dev_fix_contact_bulk 2021-01-12 10:25:18 +01:00
Laurent Destailleur
3906acc951 Must use the generic version 2021-01-12 10:00:05 +01:00
Frédéric FRANCE
c468db5a7c doxygen 2021-01-04 23:41:20 +01:00
Frédéric FRANCE
eb937f82c8 doxygen 2021-01-02 16:58:05 +01:00
Frédéric FRANCE
5e692fa9db doxygen 2021-01-02 09:47:29 +01:00
Laurent Destailleur
00ad6df395 Fight against $_POST 2020-11-30 14:47:07 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel" 
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
 2020-11-23 15:12:52 +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
Laurent Destailleur
5df1218d9f Enhance page to setup email templates 2020-10-17 12:59:22 +02:00
Laurent Destailleur
1e176fad8f Fix GETPOST on array 2020-09-29 21:28:07 +02:00