Commit Graph

126677 Commits

Author SHA1 Message Date
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
Charles
72b995d568 Update ticket.class.php - SQL Syntax Error
Function "loadCacheCategoriesTickets" query had two WHERE clauses.  Change the second "WHERE" to "AND".
2023-09-28 00:31:45 +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
Laurent Destailleur
2a9c2896ae Doc 2023-09-28 00:28:12 +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
46d4e83b5f Merge pull request #26043 from hregis/fix_trigger_delete
FIX missing contact_id for the trigger
2023-09-27 15:31:12 +02:00
Laurent Destailleur
5411a18e1b Fix warning 2023-09-27 12:53:58 +02:00
VESSILLER
afe71305fa FIX thirdparty object in proposal card is not loaded 2023-09-27 12:15:44 +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
Beef
5bdad9aa25 Merge branch 'Dolibarr:develop' into develop 2023-09-27 10:56:33 +02:00
TheRealBeef
45bf2cd9a8 Updated to display the Advanced Stock Transfers
Regular stock transfers can not be associated with projects in normal use, so the previous functionality was depreciated.
2023-09-27 10:52:39 +02:00
Regis Houssin
9eb4c93c1c FIX add warning in the changelog 2023-09-27 09:44:58 +02:00
Regis Houssin
19e2f0c75c FIX missing contact_id for the trigger 2023-09-27 08:54:54 +02:00
sonikf
da92e4be32 fix remove unnecessary exposed service paramaters 2023-09-27 09:52:34 +03:00
Alexandre SPANGARO
e1c1042d42 Review ticket admin page 2023-09-27 06:16:37 +02:00
Laurent Destailleur
a3f9b14e9d Merge pull request #26039 from hregis/fix_trigger_delete
FIX wrong place of trigger delete
2023-09-27 01:34:26 +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
Regis Houssin
bcc97f8b9f FIX wrong place of trigger delete 2023-09-26 23:49:21 +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