Commit Graph

103730 Commits

Author SHA1 Message Date
Laurent Destailleur
e43b33028c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/card.php
2021-10-20 15:06:10 +02:00
Laurent Destailleur
34c61edcbd Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-20 15:01:01 +02:00
Laurent Destailleur
85fe1d6d1e fix sql injection reported by Mehdi Oudad 2021-10-20 15:00:49 +02:00
Laurent Destailleur
4a5293fc9c Rewrite getDictionaryValue (Use a cache file and consistent return code) 2021-10-20 14:41:40 +02:00
Laurent Destailleur
66437c472a
Merge pull request #19031 from hregis/fix_wrong_array_key_value
FIX wrong array key value
2021-10-20 13:46:07 +02:00
Regis Houssin
f38fca8174 FIX wrong array key value 2021-10-20 13:35:30 +02:00
Laurent Destailleur
766463a0b2
Merge pull request #18966 from aspangaro/14p22
Accountancy - Show message for admin if accountancy hidden options are activated to help to resolve some problems
2021-10-20 12:51:29 +02:00
Laurent Destailleur
e4d0bf7a91
Merge pull request #18967 from aspangaro/15a23
NEW Add sortorder on units list
2021-10-20 12:50:32 +02:00
Laurent Destailleur
2852e6ff9e
Merge pull request #19028 from aspangaro/14p24
PHP8
2021-10-20 12:45:13 +02:00
Laurent Destailleur
54c9a60fa3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-20 12:38:32 +02:00
Laurent Destailleur
53244c5f45 FIX missing permission check reported by me@lainwir3d.net on product api 2021-10-20 12:38:19 +02:00
Alexandre SPANGARO
632751cebc Use getDolGlobalInt() 2021-10-20 12:37:49 +02:00
Laurent Destailleur
136807645d
Merge pull request #19030 from atm-florianm/FIX_14.0_civility_field_with_in_private_thirdparty_creation_form
FIX 14.0 - civility field of private third party creation form has inadequate width
2021-10-20 11:30:55 +02:00
Laurent Destailleur
ae1da43225
Update card.php 2021-10-20 11:30:38 +02:00
Laurent Destailleur
f59f605bcc
Update card.php 2021-10-20 11:29:34 +02:00
Laurent Destailleur
562df7a27a
Merge pull request #19025 from daraelmin/daraelmin-patch-3
Fix wrong const in select MEMBER_ALLOW_CHANGE_OF_TYPE
2021-10-20 11:25:35 +02:00
atm-florian
417daa4289 FIX 14.0 - civility field width inadequate due to select2 calculating the width while the field has no width (display: none) 2021-10-20 11:15:02 +02:00
Laurent Destailleur
289f90fb1e Fix qty must not use html type "number" but "text" (need decimal values) 2021-10-20 11:05:40 +02:00
Laurent Destailleur
0371183ed9
Merge pull request #19029 from aspangaro/14p12
FIX Expense report - In edit mode, field qty doesn't accept decimal unlike the create mode
2021-10-20 11:02:05 +02:00
Alexandre SPANGARO
63fafdf120 FIX Expense report - In edit mode, field qty doesn't accept decimal unlike the create mode 2021-10-20 07:54:09 +02:00
Alexandre SPANGARO
bee6abd6fc Merge branch '14.0' into 14p24 2021-10-20 07:38:54 +02:00
Laurent Destailleur
b9540c3eb6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	ChangeLog
	htdocs/adherents/card.php
	htdocs/filefunc.inc.php
	htdocs/install/repair.php
2021-10-20 03:38:10 +02:00
daraelmin
f4743c7f1f
Fix wrong const in select MEMBER_ALLOW_CHANGE_OF_TYPE 2021-10-19 23:00:36 +02:00
Laurent Destailleur
c6ef6a162b NEW Can edit fields of proposal when proposal is not yet signed 2021-10-19 22:20:23 +02:00
Laurent Destailleur
f4b5d14a34
Merge pull request #17536 from bb2a/Edit_in_propal
[NEW] Add edit option in propal
2021-10-19 22:10:12 +02:00
Laurent Destailleur
421b692942 Clean last br for wysiwyg 2021-10-19 21:48:25 +02:00
Laurent Destailleur
12d211815b Debug v15 2021-10-19 21:38:36 +02:00
Laurent Destailleur
c038c1881a Merge 2021-10-19 21:04:19 +02:00
Laurent Destailleur
f5f8d2558c
Merge pull request #18244 from Hystepik/develop#3
Fix php debug bar for php 8.0
2021-10-19 20:59:19 +02:00
Laurent Destailleur
3c9d8d0d30 Show status of MO on referring page of product. 2021-10-19 20:44:03 +02:00
Laurent Destailleur
b1de75758f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-19 20:04:14 +02:00
Laurent Destailleur
265f3d0ab0 Fix css 2021-10-19 20:03:59 +02:00
Laurent Destailleur
885e70ff03 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-19 19:52:33 +02:00
Laurent Destailleur
9f9c1d2f7b css 2021-10-19 19:52:18 +02:00
Laurent Destailleur
99a939df57
Merge pull request #17518 from bb2a/add_option_pdf_global_with_picture
[NEW] PDF width picture option
2021-10-19 19:32:44 +02:00
Laurent Destailleur
3a14cd7a16
Update admin.lang 2021-10-19 19:32:28 +02:00
Laurent Destailleur
58941e9a95
Update pdf_other.php 2021-10-19 19:31:06 +02:00
Laurent Destailleur
b1e4e2699b
Merge pull request #18993 from atm-florianm/FIX_13.0_ticket_message_editing_requires_end_date
FIX 13.0: end date required to edit a ticket message
2021-10-19 19:05:36 +02:00
Laurent Destailleur
4764075cc7
Merge pull request #19016 from hregis/fix_possibility_to_bypass_main_antivirus_constants
FIX add possibility to bypass MAIN_ANTIVIRUS_* constants
2021-10-19 19:04:09 +02:00
Laurent Destailleur
121cb8f708
Merge pull request #19019 from Hystepik/develop#2
Fix: selectGroupTickets multilevel
2021-10-19 19:02:35 +02:00
Laurent Destailleur
bfdf88ca6c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-19 16:48:00 +02:00
Laurent Destailleur
0cae464bfa Debug v15 2021-10-19 16:47:43 +02:00
lmarcouiller
f5942300e0 fix CI bot error 2021-10-19 16:09:06 +02:00
lmarcouiller
d8cd6b6f55 Fix autoselect multilevel 2021-10-19 15:54:25 +02:00
Regis Houssin
db01fed447 FIX error when defining an already existing constant 2021-10-19 12:36:33 +02:00
Laurent Destailleur
6193e31eb4
Merge pull request #18999 from polkiko/payment_receipt
NEW Added linked files page and send mail possibility in payments
2021-10-19 12:25:37 +02:00
Regis Houssin
acbae5cafb FIX add possibility to bypass MAIN_ANTIVIRUS_* constants 2021-10-19 12:14:42 +02:00
Laurent Destailleur
572ed7db5b
Merge pull request #19001 from atm-gauthier/fix_hrm_list_filters
FIX : keyval filters on lists don't work
2021-10-19 11:10:19 +02:00
Laurent Destailleur
32ffd6f0f9
Merge pull request #19015 from Hystepik/develop#2
FIX: boxes php 8.0 errors and warnings
2021-10-19 11:09:44 +02:00
Laurent Destailleur
5e26e2a71a Trans 2021-10-19 10:54:09 +02:00