Commit graph

113035 commits

Author SHA1 Message Date
Laurent Destailleur
07d0093fbc Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-02-01 12:14:30 +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
43b37ead7c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-01-23 22:02:27 +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
387a06fdc5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-01-18 15:59:10 +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
369d0eb676
Merge pull request #27609 from vold-lu/fix-supplier-invoice-api
FIX: Fix supplier invoice security check
2024-01-18 15:45:35 +01:00
Laurent Destailleur
0412374568
Merge pull request #27608 from Thomas905/fix/editextrafieldsdoncard
FIX : add action update_extras to don card
2024-01-18 15:24:36 +01:00
Aloïs Micard
bc14550ded FIX: Fix supplier invoice security check 2024-01-18 14:55:45 +01:00
Thomas905
4c5d9f2742 add action update_extras to don card 2024-01-18 13:56:46 +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
13b9a65a9e Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-01-13 15:45:20 +01:00
Laurent Destailleur
2de0c09e8e Try a better fix for #27477 2024-01-13 15:44:37 +01:00
HENRY Florian
13ddcb9552
fix: filter on date lost on sort (#27467) 2024-01-12 18:04:00 +01:00
Laurent Destailleur
3fae1cc099 Fix doc 2024-01-02 14:47:18 +01:00
Laurent Destailleur
41cb100160 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-01-02 14:46:39 +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
29667900f6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-01-02 14:40:58 +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
1d36146768
Merge pull request #27263 from mdeweerd/fix/user-to-string
FIX #27262 Recurrent invoice - user to string conversion
2024-01-02 12:21:56 +01:00
MDW
b221ff35b2 FIX #27262 Recurrent invoice - user to string conversion 2023-12-31 17:16:53 +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
Laurent Destailleur
46dc264654
Update dolibarr_changes.txt 2023-12-27 14:40:16 +01:00
Laurent Destailleur
0181267b3c
Merge pull request #27169 from Thomas905/fix/searchthirdpartydon
FIX : search by thirdparty in don list
2023-12-22 11:25:02 +01:00
Eric Seigne
23e39cb8b3 update changes 2023-12-22 11:05:17 +01:00
Eric Seigne
40329db2b2 next fix for #17665 : autoloader collision 2023-12-21 18:20:05 +01:00
Thomas905
87695c931e fix 2023-12-19 17:14:41 +01:00
Laurent Destailleur
774af5c371
Merge pull request #27170 from Thomas905/fix/searchbyrefindonlist
FIX : search by ref & rowid in don list
2023-12-19 15:35:26 +01:00
Thomas905
11780b0f12 search by ref & rowid in don list 2023-12-19 08:58:02 +01:00
Thomas905
a571ed8dda search by thirdparty in don list 2023-12-19 08:51:02 +01:00
Laurent Destailleur
21b7d68f49 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/comm/action/list.php
	htdocs/compta/facture/list.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/stock/movement_list.php
	htdocs/product/stock/productlot_list.php
2023-12-17 21:49:08 +01:00
Laurent Destailleur
a534c8dbdb Fix phpcs 2023-12-14 10:56:25 +01:00
Laurent Destailleur
81156665f2
Merge pull request #27071 from FHenry/16_fix_search_product
FIX: 16.0 only, backport fix for SQL error on global search product
2023-12-14 01:37:46 +01:00
Laurent Destailleur
b5a1ebd01a
Merge pull request #27079 from atm-lena/16.0_FIX_AddContactToTask_FormConfirmGetTooLong
Add contact to project and tasks : formconfirm get url too long
2023-12-14 01:35:08 +01:00
atm-lena
ddf960e1c4 Add contact to project and tasks : formconfirm get url too long 2023-12-13 14:32:58 +01:00
Florian HENRY
b7defe95fc Merge branch '16.0' of https://github.com/Dolibarr/dolibarr into 16_fix_search_product 2023-12-13 08:57:33 +01:00
Florian HENRY
de7d7d8d66 FIX: backport SQL error on global search product 2023-12-13 08:50:33 +01:00