Commit Graph

95023 Commits

Author SHA1 Message Date
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
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
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
Laurent Destailleur
f814c70a63
Merge pull request #16328 from ATM-Consulting/new/14.0_auto_close_project_when_all_tasks_done
FIX - possible warning in recently added feature (autoclose project when tasks done)
2021-02-19 13:52:06 +01:00
Laurent Destailleur
dc3377f0f0
Merge pull request #16348 from ptibogxiv/patch-416
Fix multientity in cash fence report
2021-02-19 13:51:44 +01:00
Laurent Destailleur
556651a3ae
Update report.php 2021-02-19 13:51:15 +01:00
Laurent Destailleur
4f8a03b6d2
Merge pull request #16297 from FHenry/dev_EventOrganisation_ProjectCardAndList
wip :  Event Organization module - PR-2 - project page #FoundationFunding
2021-02-19 13:37:17 +01:00
Laurent Destailleur
70e2d1dbbd
Merge branch 'develop' into dev_EventOrganisation_ProjectCardAndList 2021-02-19 12:54:38 +01:00
Laurent Destailleur
1aa418921a
Merge pull request #16331 from bb2a/UPPER_CONTACT_USER_ADH
setUpperOrLowerCase
2021-02-19 12:50:54 +01:00
Laurent Destailleur
95b859dfd5
Merge pull request #16247 from bafbes/abb120355
New : Hook selectForFormsListWhere
2021-02-19 12:49:42 +01:00
Laurent Destailleur
ceccf85919
Merge pull request #16342 from frederic34/patch-3
fix unknown variable
2021-02-19 12:40:54 +01:00
Laurent Destailleur
593b93ebc9
Merge pull request #16350 from ivanmestre/v13-fix-bank-account-filter-reset-payment-various
V13 FIX #16241 Bank Account filter resets on Miscellaneous Payments
2021-02-19 12:40:29 +01:00
Laurent Destailleur
efb9ee458a
Merge pull request #16349 from ivanmestre/v12-fix-bank-account-filter-reset-payment-various
V12 FIX #16241 Bank Account filter resets on Miscellaneous Payments
2021-02-19 12:39:33 +01:00
Laurent Destailleur
f35695074c
Merge pull request #16354 from frederic34/patch-4
remove unused code
2021-02-19 12:36:58 +01:00
Laurent Destailleur
5340c30db3 FIX missing security test on payment page
FIX sql error on group by on payment list
2021-02-19 12:35:26 +01:00
stickler-ci
af32ef266c Fixing style errors. 2021-02-19 09:05:04 +00:00
atm-lena
a6999a2be7 Clean code 2021-02-19 09:54:51 +01:00
atm-lena
12dce74a47 Merge branch 'BankEntries_FIX_SearchUSerThirdparty_Reconstruct' of github.com:atm-lena/dolibarr into develop_BankEntries_FIX_SearchUSerThirdparty_Reconstruct 2021-02-19 09:46:55 +01:00
atm-lena
687d0556aa Clean code 2021-02-19 09:39:06 +01:00
atm-lena
d7c59edd11 Clean code 2021-02-19 09:36:15 +01:00
atm-lena
a4d9e3b9d3 WIP final 2021-02-19 09:33:28 +01:00
Laurent Destailleur
485dd07f67 NEW Can show the holidays on the agenda view. 2021-02-18 23:13:55 +01:00
Frédéric FRANCE
75b378edd3
remove unused code 2021-02-18 22:47:41 +01:00