Laurent Destailleur
1a14c19cd2
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2024-02-18 17:03:18 +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
027e0334a2
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2024-02-09 19:03:33 +01:00
Laurent Destailleur
e22dabe59a
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2024-02-09 19:03:26 +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
noec764
2c07bd764d
FIX: Bar code verification should be done by entity because generation does ( #28087 )
...
* FIX: Bar code verification should be done by entity because generation does
* FIX: handle Entities shared tables
* FIX: Remove unused global
---------
Co-authored-by: Noé <noe@scopen.fr>
2024-02-09 14:07:04 +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
Frédéric FRANCE
b92b8c443d
fix cunits.class.php (backport) ( #28068 )
2024-02-08 13:09:39 +01:00
Laurent Destailleur
a2f58f1d3d
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
...
Conflicts:
htdocs/takepos/invoice.php
2024-02-07 17:47:23 +01:00
Laurent Destailleur
5a756ffc4c
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
...
Conflicts:
htdocs/takepos/invoice.php
2024-02-07 17:44:39 +01:00
Laurent Destailleur
5f24f79b4d
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2024-02-01 12:14:50 +01:00
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
bbf765c535
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
...
Conflicts:
htdocs/takepos/invoice.php
2024-01-29 01:25:12 +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
dacea0db8a
Merge pull request #27809 from atm-quentin/FIX_generation_multicompany_crabe
...
FIX : crabe PDF is generating in conf->entity instead of object->entity
2024-01-26 00:35:52 +01:00
Quentin VIAL-GOUTEYRON
bb2f13aed4
FIX : crabe PDF is generating in conf->entity instead of object->entity
2024-01-25 14:40:11 +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
