Commit graph

125074 commits

Author SHA1 Message Date
Laurent Destailleur
18bbbf579d
Merge pull request #23171 from Easya-Solutions/new-inventory-without-kit
NEW inventory without virtual products (kits)
2023-09-28 00:35:12 +02:00
Laurent Destailleur
9e55289894
Merge pull request #26053 from carmelchas/develop
Update ticket.class.php - SQL Syntax Error
2023-09-28 00:30:11 +02:00
Charles
8377b8f3f0
Update ticket.class.php - SQL Syntax Error
Function "loadCacheCategoriesTickets" query had two WHERE clauses.  Change the second "WHERE" to "AND".
2023-09-27 14:14:03 -05:00
Laurent Destailleur
12bfe76d39 Save the warehouse_id in shipment distribution of lot/serial 2023-09-27 20:03:51 +02:00
Laurent Destailleur
2cfd929cdf FIX Debug the dispatch page to work on corrupted data 2023-09-27 19:50:23 +02:00
Laurent Destailleur
db9bd4326a css 2023-09-27 17:39:27 +02:00
Laurent Destailleur
992726e424 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-27 17:20:18 +02:00
Laurent Destailleur
7bbc3bab05 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-27 17:17:41 +02:00
Laurent Destailleur
9de68944f5
Merge pull request #26048 from solution-libre/fix-notnull-key-missing
Fix notnull key missing
2023-09-27 15:46:06 +02:00
Laurent Destailleur
be8051a14b
Merge pull request #26040 from aspangaro/19a6
NEW FontAwesome - Add possibility to select another version
2023-09-27 15:44:40 +02:00
Laurent Destailleur
45cf4c40fb
Merge pull request #26042 from aspangaro/19a8
Review ticket admin page
2023-09-27 15:40:17 +02:00
Laurent Destailleur
5411a18e1b Fix warning 2023-09-27 12:53:58 +02:00
Florent Poinsaut
2992fc280c
Merge branch 'develop' into fix-notnull-key-missing 2023-09-27 11:45:01 +02:00
Florent Poinsaut
a661570aec Fix notnull key missing 2023-09-27 11:43:21 +02:00
Laurent Destailleur
cdfa7c901a
Merge pull request #25532 from lamrani002/formAddPropertyMB
NEW Form for add object's property on moduleBuilder
2023-09-27 11:34:07 +02:00
Alexandre SPANGARO
e1c1042d42 Review ticket admin page 2023-09-27 06:16:37 +02:00
Laurent Destailleur
73f1ebe5db
Merge pull request #26001 from hregis/fix_multicompany18_compatibility
FIX missing entity filter to customize ticket dictionaries by entity
2023-09-27 01:23:27 +02:00
Laurent Destailleur
fd55f3c34b
Merge pull request #26025 from OPEN-DSI/18.0_fix_stock_at_date_hooks_position
FIX: fix the wrong position of the hook 'printFieldListTitle' and 'printFieldListValue' in the stock at date page
2023-09-27 01:14:54 +02:00
Laurent Destailleur
b9336c024a
Merge pull request #25566 from hansemschnokeloch/rest-extra
Add filter to restrict the data returned
2023-09-27 00:56:51 +02:00
Laurent Destailleur
9d38e14c30 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-27 00:43:05 +02:00
Laurent Destailleur
cc0a07d433 Better cyclomatic complexity 2023-09-27 00:42:54 +02:00
Laurent Destailleur
9e3ad1cf24
Merge pull request #25656 from hansemschnokeloch/develop-1
FIX Add substitution variables from project into propal
2023-09-27 00:12:48 +02:00
Regis Houssin
be9adbec41 FIX uniformize getEntity sql request 2023-09-27 00:05:36 +02:00
Laurent Destailleur
73464757a3
Merge pull request #25944 from DoliGreece/sonikf-fix-translation
fix translation
2023-09-27 00:04:48 +02:00
Laurent Destailleur
7846947f0c Fix ref_supplier must be null if not defined 2023-09-26 23:24:14 +02:00
Laurent Destailleur
42f4bfe8a3
Merge pull request #26024 from frederic34/patch-8
phpstan
2023-09-26 22:53:55 +02:00
Alexandre SPANGARO
0fd8123606 NEW FontAwesome - Add possibility to select another version 2023-09-26 21:49:15 +02:00
Laurent Destailleur
e1217a8911 Fix phpcs 2023-09-26 21:11:23 +02:00
Laurent Destailleur
3c48cbaac0 Doc 2023-09-26 21:07:20 +02:00
Laurent Destailleur
266dea3b7e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-26 21:04:04 +02:00
Laurent Destailleur
8021eb0b5d
Merge pull request #26029 from fappels/develop_fix_link_index
Fix Error on the uk_links index of the llx_links table #25926
2023-09-26 21:03:52 +02:00
Laurent Destailleur
b21a24aa97 Add AssetModel in AllTest 2023-09-26 20:52:49 +02:00
Laurent Destailleur
5733b9f558 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-26 20:45:04 +02:00
Laurent Destailleur
dc2bd648d5
Merge pull request #26028 from Hystepik/assetModel-test-file
New asset model phpunit test
2023-09-26 20:42:44 +02:00
Laurent Destailleur
9761a11acd
Merge pull request #26030 from frederic34/patch-6
phpstan
2023-09-26 20:42:21 +02:00
Laurent Destailleur
26da51e1c4
Merge pull request #26031 from Quentin-Seekness/patch-11
Update card.php line desc
2023-09-26 20:42:00 +02:00
pascal
80f060c771 fix tab indentation 2023-09-26 18:43:25 +02:00
pascal
871f896962 implementation of properties filter 2023-09-26 18:04:48 +02:00
Quentin-Seekness
70ecf5a123
Update card.php line desc
We don't need the label to be the description if there was not any in origin line.
2023-09-26 10:27:59 +02:00
Frédéric FRANCE
97cc6a48ec
phpstan 2023-09-26 09:58:51 +02:00
Frédéric FRANCE
419332718a
phpstan 2023-09-26 09:57:55 +02:00
Frédéric FRANCE
0298fb3b40
phpstan 2023-09-26 09:54:51 +02:00
Laurent Destailleur
bd5c111f1a Better error message 2023-09-26 00:56:52 +02:00
Pascal Hubrecht
9835385f58
Merge branch 'Dolibarr:develop' into rest-extra 2023-09-25 20:59:57 +02:00
pascal
19a528bed4 mv fetch_project to card.php 2023-09-25 20:48:43 +02:00
Pascal Hubrecht
7c8403d82f
Merge branch 'Dolibarr:develop' into develop-1 2023-09-25 20:37:58 +02:00
Laurent Destailleur
1ce5963f83 FIX Bad choice of filter on product/service 2023-09-25 17:44:33 +02:00
Francis Appels
94dadee77f Fix Error on the uk_links index of the llx_links table #25926 2023-09-25 17:17:52 +02:00
Laurent Destailleur
bc73033d22 FIX Name of application used in email payment AK not defined 2023-09-25 16:39:40 +02:00
Hystepik
d157e8f660 New asset model phpunit test 2023-09-25 14:54:32 +02:00