Commit Graph

108063 Commits

Author SHA1 Message Date
Laurent Destailleur
137de338d2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-04-11 22:28:27 +02:00
lvessiller-opendsi
22244a9d84 FIX supplier price duplicate entry on update supplier product ref (#29290)
* FIX supplier price duplicate entry on update supplier product ref

* Add ref_fourn_price_id in fetch method
2024-04-09 20:16:10 +02:00
Laurent Destailleur
5a6c6b0509 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2024-04-04 17:50:54 +02:00
Laurent Destailleur
87bee3fb8c SEC Merge pull request #29231 from hregis/fix_14_security
FIX avoid to delete "lock" and "unlock" files
2024-04-04 17:50:47 +02:00
Laurent Destailleur
b0055c502e Merge pull request #29231 from hregis/fix_14_security
FIX avoid to delete "lock" and "unlock" files
2024-04-04 16:50:08 +02:00
Regis Houssin
cb9a93d97e FIX syntax error (but same result) :-) 2024-04-04 16:32:24 +02:00
Regis Houssin
9e638ccc12 FIX avoid to delete "lock" and "unlock" files 2024-04-04 16:22:31 +02:00
Laurent Destailleur
efc96c8cf4 Merge pull request #28781 from rycks/14_fix_default_commercial_on_create_thirdpart
fix default current user as commercial for the thirdparty
2024-03-15 00:29:59 +01:00
Laurent Destailleur
91c6940818 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-03-14 23:44:04 +01:00
Laurent Destailleur
7ecf1ac082 Merge 2024-03-14 23:43:25 +01:00
Laurent Destailleur
f61c837b41 Merge pull request #28833 from rycks/14_fix_login_autocorrect_on_smartphone
Fix autocorrect on login input field (smartphone)
2024-03-14 22:58:18 +01:00
Eric Seigne
1c9129497f autocomplete on 2024-03-14 12:36:01 +01:00
Eric Seigne
0903b4da87 disable auto correct login field on smartphone 2024-03-14 12:35:19 +01:00
Eric Seigne
71442efa03 remove check againts read access (and if that user create a thirdpart read access is implicit) 2024-03-13 12:19:01 +01:00
Eric Seigne
94dbde9cfd fix default current user as commercial for the thirdparty 2024-03-12 15:28:35 +01:00
Laurent Destailleur
2db58f09bc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-03-11 13:19:44 +01:00
ATM-NicolasV
4dcf98b9f7 fix entity in sql from RemoveFromGroup (#28682) 2024-03-07 15:55:07 +01:00
Laurent Destailleur
8c2a910a94 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-02-22 00:13:59 +01:00
Laurent Destailleur
f7e8725406 Clean code 2024-02-22 00:12:33 +01:00
Saami PERDRIX
52646ee9f5 fix aperçu/dl fichier quand il est dans {userid}/temp (#27211) 2024-02-22 00:10:04 +01:00
Eric
6defdcd018 better fix with this->entity thanks to regis (#28331)
* better fix with this->entity thanks to regis

* Update fichinter.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-02-21 17:06:05 +01:00
Eric
75ad2e82fd fix entity if interventions are shared between entities (#28317) 2024-02-20 23:01:16 +01:00
Laurent Destailleur
f9426f30a9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-02-18 17:02:55 +01:00
MaximilienR-easya
05cf98fae8 Fix lost POST data when redirection after drag_n_drop an event inside the agenda (#28212) 2024-02-18 16:38:46 +01:00
Regis Houssin
1ef91d3a21 FIX avoid Unknown column 'pfp.ref_fourn' (#28145) 2024-02-15 16:47:07 +01:00
Eric
280ceef46b outputlangs must not be a string as default value like others generateDocument functions (#28132) 2024-02-12 17:55:32 +01:00
Laurent Destailleur
48c3dfb9eb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-02-09 19:03:03 +01:00
Laurent Destailleur
f5df332d3e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-02-09 19:02:56 +01:00
thomas-Ngr
6a8be838be 14.0 fix CVE 2024 23817 (#28090)
* FIX CVE-2024-23817

* FIX syntax error

---------

Co-authored-by: Regis Houssin <regis.houssin@inodbox.com>
2024-02-09 11:37:55 +01:00
Regis Houssin
fb69347ea7 FIX CVE-2024-23817 (#28089)
* FIX CVE-2024-23817

* FIX syntax error
2024-02-09 11:24:57 +01:00
Laurent Destailleur
efa977bd21 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-02-01 12:11:39 +01:00
Laurent Destailleur
ab585b6efc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-02-01 12:11:25 +01:00
Laurent Destailleur
662ab45037 Merge pull request #27904 from rycks/14.0_fix_zero_could_be_a_value_into_conf_global_key
fix #27883 : zero could be a value stored
2024-02-01 10:59:11 +01:00
Laurent Destailleur
356bb80676 Merge pull request #27903 from rycks/14.0_fix_datehour_to_datetime_comment
fix comment about datehour -> datetime
2024-01-30 23:47:44 +01:00
Eric Seigne
1f21e1a945 fix #27883 : zero could be a value stored 2024-01-30 21:42:57 +01:00
Eric Seigne
8d9ddf4a51 fix comment about datehour -> datetime 2024-01-30 21:35:19 +01:00
Laurent Destailleur
2420794b94 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-01-29 01:10:46 +01:00
Laurent Destailleur
2f18dc1b9c Merge pull request #27834 from Easya-Solutions/14.0_takepos_display_errors_on_payment_error
Takepos : display errors on payment error
2024-01-28 12:44:37 +01:00
tnegre
9c638968ff Takepos : display errors on payment error 2024-01-26 16:23:24 +01:00
Laurent Destailleur
9778e4ad08 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-01-23 22:02:01 +01:00
Laurent Destailleur
18b896f034 Merge pull request #27740 from MaximilienR-easya/14.0_Fix_expedition_filter
Fix expedition list filter on product category
2024-01-23 17:14:03 +01:00
mrozniecki
951535a3d5 Fix expedition list filter on product category 2024-01-23 09:36:15 +01:00
Laurent Destailleur
7c0ccba344 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-01-18 15:58:19 +01:00
Laurent Destailleur
f3f6515c72 Merge pull request #27543 from rycks/14.0_end_fix_10417_custom_num_payment
end fix #10417 : custom payment number for supplier invoices
2024-01-15 19:36:08 +01:00
Eric Seigne
5a04b2393d end fix #10417 : custom payment number for supplier invoices 2024-01-15 18:43:17 +01:00
Laurent Destailleur
52508fbac7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-01-02 14:46:12 +01:00
Laurent Destailleur
0dffaa53dd Fix doc 2024-01-02 14:45:49 +01:00
Laurent Destailleur
0329bbc0cb Merge 2024-01-02 14:37:25 +01:00
Laurent Destailleur
086da9f73f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2024-01-02 14:34:34 +01:00
Laurent Destailleur
adf9fcb290 Merge pull request #27205 from rycks/13.0_fix_multiple_autoloader_collision_with_restler
next fix for  #17665 : autoloader collision
2023-12-27 14:41:33 +01:00