Commit Graph

6564 Commits

Author SHA1 Message Date
Laurent Destailleur
8432a2a0dd Fix phpcs 2020-10-17 19:05:08 +02:00
Laurent Destailleur
27698ab5c7 Protect page for module management with token even for GET action 2020-10-17 14:01:09 +02:00
Laurent Destailleur
20b6d3828e NEW Show image of user in the combo select of users 2020-10-17 13:27:39 +02:00
Laurent Destailleur
5df1218d9f Enhance page to setup email templates 2020-10-17 12:59:22 +02:00
Laurent Destailleur
e3552e7e02 Clean code 2020-10-16 20:17:54 +02:00
Laurent Destailleur
67785887fd Merge pull request #15035 from andreubisquerra/master
Change the tag char for security reasons in 'Receipt Printer' module
2020-10-16 17:20:04 +02:00
Laurent Destailleur
7504f92a41 Standardize code and look and feel 2020-10-16 13:30:20 +02:00
jove@bisquerra.com
f90b236e0f Change the tag char for security reasons in 'Receipt Printer' module 2020-10-15 23:44:13 +02:00
Laurent Destailleur
64b1a31e45 Merge pull request #15018 from FHenry/dev_add_dict_NatureOfProductType
NEW : Nature of product is now a dictionay
2020-10-15 21:07:42 +02:00
Laurent Destailleur
844c4dec4d css 2020-10-15 13:16:17 +02:00
Florian HENRY
bcb98d1d67 Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType 2020-10-14 18:16:34 +02:00
Laurent Destailleur
bb367a4489 Update dict.php 2020-10-14 17:40:27 +02:00
Laurent Destailleur
bfe760ffcb Merge pull request #15012 from bafbes/abb120349
fix:two fields with same ids
2020-10-14 17:15:24 +02:00
Florian HENRY
fd1fa1c777 Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType 2020-10-14 16:39:54 +02:00
Florian HENRY
7d09f22afa add correct import and dict edition 2020-10-14 16:39:42 +02:00
Laurent Destailleur
fe19eea540 Merge pull request #15007 from hregis/develop_bug2
FIX avoid spaces in file name
2020-10-14 14:45:40 +02:00
Laurent Destailleur
02fcee5d94 Fix make the default sender email mandatory into setup (if not defined,
no emails can be sent).
2020-10-14 12:21:31 +02:00
bahfir abbes
8b0a6d7f40 fix:two fields with same ids is incorrect html 2020-10-14 00:21:12 +01:00
Laurent Destailleur
85825a0104 Init page for security info 2020-10-14 00:57:39 +02:00
Regis Houssin
00ee1a7433 FIX compatibility with LF (Line Feed) 2020-10-13 15:08:43 +02:00
Regis Houssin
1348c03ca0 FIX avoid spaces in file name 2020-10-13 14:46:17 +02:00
Laurent Destailleur
75997bb8f5 Minor fixes 2020-10-12 14:01:15 +02:00
Laurent Destailleur
726fd1b631 Merge pull request #11227 from aspangaro/10.0_intracommreport
NEW module Intracomm report
2020-10-12 13:35:58 +02:00
Laurent Destailleur
920b31140b Fix exclude of backup files when path are for Windows 2020-10-11 13:32:50 +02:00
Laurent Destailleur
86c46bbb97 Fix backup - Exclude existing backup when path is uppercase. 2020-10-11 13:18:16 +02:00
Laurent Destailleur
ced91d049d Show admin star on audit page list 2020-10-10 16:43:15 +02:00
Alexandre SPANGARO
ca7ad35342 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-10-09 06:39:42 +02:00
Laurent Destailleur
66744658a2 Merge pull request #14966 from hregis/12_bug
FIX Multicompany compatibility (missing entity value)
2020-10-08 19:26:49 +02:00
Aurélien
b6283c1a5d Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery 2020-10-08 16:19:10 +02:00
Regis Houssin
09e7420936 FIX missing entity in href 2020-10-08 15:51:46 +02:00
Regis Houssin
aa84b76b6a FIX Multicompany compatibility (missing entity value) 2020-10-08 11:43:12 +02:00
Scrutinizer Auto-Fixer
1512521d91 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-07 13:01:28 +00:00
Laurent Destailleur
f16a58a62c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modSocialNetworks.class.php
2020-10-06 23:36:15 +02:00
Laurent Destailleur
b0d20f92dc FIX autofocus on first setup 2020-10-06 17:32:55 +02:00
AurelienBinard
39d538befc Merge branch 'develop' into translateModLivraison2ModDelivery 2020-10-06 16:20:25 +02:00
Aurélien
1af42b313c rename livraison pdf and dependencies #14697 2020-10-06 13:32:02 +02:00
Aurélien
af7c23b2ac rename folder admin/livraison.php and dependencies #14697 2020-10-06 12:05:24 +02:00
Aurélien
5571a166c6 change variable #14697 2020-10-06 11:37:55 +02:00
stickler-ci
0e7d429991 Fixing style errors. 2020-10-05 13:24:17 +00:00
Christian Foellmann
fb7ed3afc1 optimize mail templates edit screen 2020-10-05 15:20:27 +02:00
Laurent Destailleur
5c3b83b82e Show small image in setup page 2020-10-05 14:06:14 +02:00
Aurélien
bdd095f6bb translate livraison2delivery => change folder, filename and class ref into all dependencies #14697 2020-10-05 13:59:59 +02:00
Laurent Destailleur
cfc3c01815 Factorize code to know if a parameter is used to store a secret 2020-10-05 12:13:06 +02:00
Laurent Destailleur
62177edab1 NEW Can force the antivirus from conf file or autoprepend ini setup. 2020-10-05 05:00:59 +02:00
Laurent Destailleur
07e1646b3a Minor fixes 2020-10-04 19:09:25 +02:00
Laurent Destailleur
aeb895b1c6 CSS 2020-10-04 18:43:56 +02:00
Laurent Destailleur
c2fed95dc4 FIX #14877 2020-10-02 19:54:06 +02:00
Laurent Destailleur
03ede71989 Clean code 2020-10-02 16:15:24 +02:00
Frédéric FRANCE
16ff15b48c fix 2020-10-02 00:29:36 +02:00
Frédéric FRANCE
b78e506e39 add files 2020-10-02 00:25:44 +02:00