Commit Graph

95047 Commits

Author SHA1 Message Date
Frédéric FRANCE
ec1dd40a8a enhance caching 2021-02-20 15:52:45 +01:00
Frédéric FRANCE
99fa13cbad enhance caching 2021-02-20 15:41:57 +01:00
Frédéric FRANCE
a63daaa8e1 Merge remote-tracking branch 'upstream/develop' into countactioncomm 2021-02-19 23:31:09 +01:00
Frédéric FRANCE
3238dbec92 Merge remote-tracking branch 'upstream/develop' into countactioncomm 2021-02-19 23:24:53 +01:00
Frédéric FRANCE
fe1aedd825 restore file 2021-02-19 23:23:47 +01:00
Frédéric FRANCE
1e3ae8348a use cache 2021-02-19 23:16:56 +01:00
Laurent Destailleur
994dde91da Responsive 2021-02-19 22:22:09 +01:00
Laurent Destailleur
259a398f2d Remove hard coded link with getNomUrl 2021-02-19 22:19:23 +01:00
Laurent Destailleur
71f537e4c1 Responsive 2021-02-19 22:12:03 +01:00
Laurent Destailleur
581d137aa8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-19 22:06:56 +01:00
Laurent Destailleur
712c2f20df Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2021-02-19 22:06:48 +01:00
Laurent Destailleur
b167a4a0c7 FIX date selector when using reduced year (like on smartphone) 2021-02-19 22:00:44 +01:00
Laurent Destailleur
eeedbccc71 Merge pull request #16351 from aspangaro/14a16
NEW: Add option CONTRACT_ALLOW_EXTERNAL_DOWNLOAD
2021-02-19 18:20:17 +01:00
Laurent Destailleur
3d1dfccc1d More robust code 2021-02-19 18:12:15 +01:00
Laurent Destailleur
069cf46f16 Merge pull request #16347 from andreubisquerra/master
NEW Can use captcha on public page to create ticket
2021-02-19 18:07:25 +01:00
Laurent Destailleur
26134930b3 Update html.formticket.class.php 2021-02-19 18:05:12 +01:00
Laurent Destailleur
d88560c2ee changelog 2021-02-19 18:04:14 +01:00
daraelmin
52dce616b9 FIX 16165 Create customer discount without vat 2021-02-19 18:03:36 +01:00
Laurent Destailleur
5f0fd91463 Merge pull request #16340 from daraelmin/daraelmin-patch-1
FIX #16165 Create customer discount without vat
2021-02-19 18:03:09 +01:00
Laurent Destailleur
3a073c75e7 Too verbose 2021-02-19 18:01:47 +01:00
Florian HENRY
e46d4ee75d fix sample product import files 2021-02-19 18:01:36 +01:00
Florian HENRY
f111302a25 fix column count 2021-02-19 18:01:25 +01:00
Florian HENRY
32a360dd2a fix sample xls file 2021-02-19 18:01:16 +01:00
Florian HENRY
527c32d79e with new phpoffice col start at 1 not 0 2021-02-19 18:01:04 +01:00
Laurent Destailleur
7fb93f39b4 Code comment 2021-02-19 17:59:22 +01:00
Laurent Destailleur
db34481cf6 Merge pull request #16345 from FHenry/13_fix_column_excelfiles
FIX : Import Excel Failed and sample import file excel missing 1st column
2021-02-19 17:56:58 +01:00
Laurent Destailleur
fd0615b3fc Too verbose 2021-02-19 17:56:04 +01:00
Laurent Destailleur
0ede8c2b9c Merge pull request #16356 from atm-lena/develop_BankEntries_FIX_SearchUSerThirdparty_Reconstruct
Develop bank entries fix search user thirdparty reconstruct
2021-02-19 17:48:37 +01:00
Laurent Destailleur
0dabbcd7f5 Update bankentries_list.php 2021-02-19 17:48:15 +01:00
Laurent Destailleur
e8e6ecb42e Merge pull request #16352 from aspangaro/14a17
NEW: Update list of taxes by default for France
2021-02-19 17:35:19 +01:00
Laurent Destailleur
69eda9a5c3 Fix migration 2021-02-19 16:16:15 +01:00
Laurent Destailleur
3ab80469ae Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-19 16:11:36 +01:00
Laurent Destailleur
2be6992916 Fix include_once into include for inc.php file. See comment in #16338 2021-02-19 16:10:19 +01:00
Laurent Destailleur
574c0df427 Merge pull request #16338 from aspangaro/13p5
Fix module asset in development
2021-02-19 16:05:35 +01:00
Laurent Destailleur
c5be502fdb Update document.php 2021-02-19 16:04:46 +01:00
Laurent Destailleur
8e799162ec Merge pull request #16333 from FHenry/dev_new_field_product_export
NEW Add price min and price min tcc into product export
2021-02-19 15:59:58 +01:00
Laurent Destailleur
0f38b189df Fix test pages 2021-02-19 15:46:59 +01:00
Laurent Destailleur
e9f9c46cd6 Clean code. Fix nojs=1 2021-02-19 15:37:42 +01:00
Laurent Destailleur
efb32c7d0b Fix test pages 2021-02-19 15:06:36 +01:00
Laurent Destailleur
017b57f18c Code comment 2021-02-19 14:43:03 +01:00
Laurent Destailleur
33c81f3791 Limit DOS 2021-02-19 14:38:43 +01:00
Laurent Destailleur
75e9e1ff59 Add link to report vulnerabilities 2021-02-19 14:29:43 +01:00
Laurent Destailleur
3ff80ac1f8 FIX #16304 2021-02-19 14:15:58 +01:00
Laurent Destailleur
b6211a7990 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-19 14:12:00 +01:00
Laurent Destailleur
84af7a1247 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-19 14:11:17 +01:00
Laurent Destailleur
3285dd3199 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	ChangeLog
	htdocs/compta/bank/various_payment/list.php
2021-02-19 14:11:08 +01:00
Laurent Destailleur
45fda63a20 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-19 14:08:51 +01:00
Laurent Destailleur
d7c3cc4d18 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/compta/bank/various_payment/list.php
2021-02-19 14:08:36 +01:00
Laurent Destailleur
39237ca86e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-19 14:06:07 +01:00
Laurent Destailleur
8265f7a07e Code comment 2021-02-19 14:05:46 +01:00