Commit graph

125115 commits

Author SHA1 Message Date
Pascal Hubrecht
6a3ff1cd73
Merge branch 'Dolibarr:develop' into fix-26066 2023-09-29 17:00:23 +02:00
Laurent Destailleur
72e17fe60e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-09-29 16:53:54 +02:00
pascal
084b205975 FIX #26066
Fix #26066 and add missing $page parameter
2023-09-29 16:28:42 +02:00
Laurent Destailleur
532fd91b57 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-29 16:27:27 +02:00
Laurent Destailleur
3cb78be3ac Clean code 2023-09-29 16:27:07 +02:00
Laurent Destailleur
e957c285bd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-29 12:07:42 +02:00
Laurent Destailleur
e25ffc5fef NEW Add the picto phone of thirdparty on the kanban view of projects 2023-09-29 12:04:18 +02:00
Laurent Destailleur
93bbd6770e Fix function stream_wrapper_restore not found 2023-09-29 11:20:30 +02:00
Laurent Destailleur
519aa293a6
Merge pull request #26063 from hansemschnokeloch/fix-25230
FIX #25230 Supplier invoice API partial payment
2023-09-29 00:36:40 +02:00
Laurent Destailleur
7e858125fb Fix phpcs 2023-09-29 00:32:08 +02:00
Laurent Destailleur
e20b43d8b5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2023-09-29 00:21:55 +02:00
Laurent Destailleur
f2bfdb318e phpcs 2023-09-29 00:19:32 +02:00
Laurent Destailleur
261460b804
Merge pull request #25946 from JonBendtsen/add_stock_2_service_menu
adding stock menu point to services menu
2023-09-29 00:00:32 +02:00
Laurent Destailleur
1f5fd2e5b5
Merge branch 'develop' into add_stock_2_service_menu 2023-09-28 23:09:17 +02:00
Laurent Destailleur
24b2dd805b
Merge pull request #26058 from defrance/patch-276
FIX : Bad hidden variable Name
2023-09-28 22:54:49 +02:00
Laurent Destailleur
54f5317eab
Merge pull request #26061 from elkoiko/undefined-property-pa_ht-class-contrat
fix: Undefined property: Contrat::$pa_ht
2023-09-28 22:53:54 +02:00
pascal
b271695b3e update phpdoc 2023-09-28 18:00:17 +02:00
pascal
dbfa676e48 FIX #25230 2023-09-28 17:53:23 +02:00
Thomas Couacault
04b811427d
fix: Undefined property: Contrat::$pa_ht 2023-09-28 15:38:16 +02:00
Charlène Benke
d8fac8081f
FIX : Bad hidden variable Name
the hidden constant MAIN_PDF_SHIPPING_DISPLAY_AMOUNT_HT had been renamed since version 9 to SHIPPING_PDF_DISPLAY_AMOUNT_HT
but not in this pdf file
2023-09-28 10:25:09 +02:00
Laurent Destailleur
04fd4c44df Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-28 01:11:59 +02:00
Laurent Destailleur
3cc1496c0d
Merge pull request #23063 from alsoft10/16.0-emailcollector
Feature created #23062
2023-09-28 01:09:36 +02:00
Laurent Destailleur
1c6c9bcfb7
Merge branch 'develop' into 16.0-emailcollector 2023-09-28 01:09:11 +02:00
Laurent Destailleur
be61b1cb47
Update emailcollector.class.php 2023-09-28 01:05:58 +02:00
Laurent Destailleur
79f1c7be95 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-28 01:01:18 +02:00
Laurent Destailleur
644f43c67c Fix fontawesome v5 compatibility 2023-09-28 01:00:36 +02:00
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
88de198fe5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-28 00:30:33 +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
719e896ee8 css 2023-09-27 20:12:43 +02: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