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
e82965090f
Merge pull request #17395 from Robin-Yann/13-fix-combo-prospect
...
13 fix combo prospect
2021-04-27 01:18:57 +02:00
Anthony Berton
6353084777
init
2021-04-27 00:22:39 +02:00
Laurent Destailleur
d1fd26356f
Merge pull request #17377 from gmilad/gmilad-scayt-210423
...
NEW : Update doleditor.class.php for easily activate SCAYT
2021-04-26 23:38:23 +02:00
Laurent Destailleur
062dc28850
Merge pull request #17388 from aspangaro/14a30
...
NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD
2021-04-26 21:18:48 +02:00
Laurent Destailleur
f66c506011
Merge pull request #17381 from atm-lena/12.0_FormAttachOptions_AddHookParameters_Options
...
Add parameter "option" to hook formattachOptions
2021-04-26 21:00:12 +02:00
Laurent Destailleur
c849ce79e9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-26 19:21:38 +02:00
Laurent Destailleur
d138e7410b
Clean code
2021-04-26 19:12:23 +02:00
kamel
9c46b234cf
FIX Supplier invoices (deposit, multicurency in lines)
2021-04-26 17:43:27 +02:00
lmarcouiller
080bd90c93
Fix #17219 : complement of PR 17161
2021-04-26 16:15:09 +02:00
stickler-ci
1a4e1b1ae9
Fixing style errors.
2021-04-26 13:46:37 +00:00
Laurent Destailleur
14baec95dc
Clean code
2021-04-26 15:44:24 +02:00
Alexandre SPANGARO
d95be3e08b
Merge remote-tracking branch 'upstream/develop' into 14a39
2021-04-26 13:53:16 +02:00
Laurent Destailleur
87393cee98
Clean code
2021-04-26 11:59:47 +02:00
Laurent Destailleur
c9d6bc70e8
Clean code
2021-04-26 10:22:28 +02:00
stickler-ci
ebd3b00016
Fixing style errors.
2021-04-26 07:24:00 +00:00
Robin-Yann
836b811449
Merge branch 'develop' into 13-fix-combo-prospect
2021-04-26 09:21:32 +02:00
Robin
04c97d2695
FIX combo Prospect / Customers / Supplier in society list
2021-04-26 09:05:47 +02:00
Laurent Destailleur
c3d3b79315
Fix test on Local url
2021-04-25 22:11:57 +02:00
Laurent Destailleur
fd2d317b4a
Fix #yogosha5881
2021-04-25 15:55:36 +02:00
Laurent Destailleur
2fd2c67139
Clean edit of user card
2021-04-25 15:21:31 +02:00
Laurent Destailleur
9f03054fc4
Fix #yogosha5877
2021-04-24 20:52:48 +02:00
Laurent Destailleur
d0cc64479d
Fix protect sql
2021-04-24 20:18:11 +02:00
Alexandre SPANGARO
f60df8964a
NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD
2021-04-24 08:05:00 +02:00
Givriz
a451fee68f
Compatibility phpv8
2021-04-23 18:01:11 +02:00
atm-lena
3d3fb17da3
Add parameter "option" to hook formattachOptions
2021-04-23 15:41:43 +02:00
Adrien Raze
c5775cc902
FIX : Add parameter to function price2num()
2021-04-23 12:31:45 +02:00
Adrien Raze
2ab17c44e9
FIX : Add function price2num for rounding values in productAlertStock box
2021-04-23 11:11:47 +02:00
Dorian Vabre
b441c600bb
fixing error introduced in a previous commit
2021-04-23 10:32:28 +02:00
gmilad
b9c33fc8b6
Update doleditor.class.php for
...
(English below)
Bonjour,
Voici une proposition d'ajout de fonctionnalité afin de pouvoir activer facilement le plugins SpellCheckAsYouType (SCAYT) de CKEditor, pour l'historique voir ce fils de discutions sur le forum Francophone de Dolibarr :
https://www.dolibarr.fr/forum/t/wysiwyg/28874/11?u=gmilad
Amicalement,
Gaëtan.
(English below)
Hello,
Here is a proposal to add functionality to easily activate the SpellCheckAsYouType (SCAYT) plugins of CKEditor, for the history see this thread on the Dolibarr forum:
https://www.dolibarr.fr/forum/t/wysiwyg/28874/11?u=gmilad
Kind regards,
Gaëtan.
2021-04-23 00:45:07 +02:00
Dorian Vabre
4c57a6c207
wip on mail, sending ok but no content
2021-04-20 17:28:18 +02:00
Dorian Vabre
a500d83c0b
linked invoice and attendee
2021-04-20 16:09:22 +02:00
Laurent Destailleur
1bd2bd3237
Fix php8 warning
2021-04-20 12:46:41 +02:00
Laurent Destailleur
14f009f550
Fix CURLOPT_CONNECT_TO
2021-04-20 12:19:46 +02:00
Laurent Destailleur
f1f63cd4e2
Enhance detection of update available
2021-04-20 11:56:26 +02:00
Laurent Destailleur
4fde184afb
Add the setup page of module accounting to not search where is setup
2021-04-20 11:40:43 +02:00
Alexandre SPANGARO
d27030df3f
Merge remote-tracking branch 'upstream/develop' into 14a39
2021-04-20 04:43:14 +02:00
Alexandre SPANGARO
d66540bf00
Revert "Split mod fournisseur"
...
This reverts commit 78dbf4f7ff
2021-04-20 04:42:51 +02:00
Laurent Destailleur
3aee28fb1b
Merge pull request #17263 from atm-adrien/NEW_add_userGroup_for_user_exports_develop
...
NEW : Add possibility to exports userGroups fields on user exports
2021-04-19 21:58:38 +02:00
Laurent Destailleur
18d87ae575
Merge pull request #17255 from Givriz/dev_1
...
Compatibility phpv8
2021-04-19 21:44:25 +02:00
Laurent Destailleur
e71e5d533d
Fix HTML5
2021-04-19 21:30:25 +02:00
Laurent Destailleur
c966914f67
Merge branch 'develop' into new/check_update_for_module
2021-04-19 21:26:01 +02:00
Laurent Destailleur
46ea1084f5
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/mailing/cibles.php
htdocs/core/extrafieldsinexport.inc.php
htdocs/product/stock/card.php
2021-04-19 20:59:10 +02:00
Laurent Destailleur
3df79dd3c8
Avoid error on PHP 5.6
2021-04-19 20:49:31 +02:00
NextGestion
7cab4dd19d
Manage partnership for members & code optimisation
2021-04-19 15:17:57 +01:00
Laurent Destailleur
a8187af8ef
Use MAIN_SECURITY_ANTI_SSRF_SERVER_IP as whitelist for local IP.
2021-04-19 15:16:00 +02:00
Laurent Destailleur
08ded970e2
NEW Add option MAIN_SECURITY_ANTI_SSRF_SERVER_IP
2021-04-19 15:01:36 +02:00
NextGestion
263e110ca3
Enhance module Member
2021-04-19 13:19:32 +01:00
Laurent Destailleur
0537fdd1c6
Add local ip into excluded IP for external URL download.
...
Fix #yogosha5861
2021-04-19 13:52:12 +02:00
Laurent Destailleur
61df76dd9a
Fix pb in date format %a %b when using a negative timezone
...
Enhance date management and unit tests.
2021-04-19 12:48:08 +02:00
