Commit Graph

126990 Commits

Author SHA1 Message Date
Frédéric FRANCE
1334e707bb Merge branch 'develop' into patch-9 2023-12-05 12:30:20 +01:00
David
829adfcf5d FIX: discount rate was rounded to 2 digits
price2num() was called with 2 params instead of 3, the second one being '2', the rate was rounded to 2 digits.
2023-12-05 11:19:13 +01:00
Laurent Destailleur
00657ace00 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-05 10:45:58 +01:00
Laurent Destailleur
d191220683 Debug v19 2023-12-05 10:45:46 +01:00
Laurent Destailleur
f9ac359054 Fix manifest 2023-12-05 10:08:16 +01:00
Laurent Destailleur
d7df50d978 FIX protection on fetch if 2 record found 2023-12-05 00:44:31 +01:00
Dario Contrino
92161b67cd FIX #26965 add check for global variable VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT
Adding an OR clause in the check if product is a variant.
Same structure as in check if user has rights to create movement.
2023-12-04 21:51:02 +01:00
Frédéric FRANCE
7c266a5820 fix auguria 2023-12-04 21:48:27 +01:00
Laurent Destailleur
2f939121c3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-04 21:32:31 +01:00
Laurent Destailleur
c60d9e352e Merge pull request #26964 from hansemschnokeloch/fix-26962
Fix #26962
2023-12-04 21:17:27 +01:00
Laurent Destailleur
5fb751bcd1 Debug v19 2023-12-04 21:10:07 +01:00
Laurent Destailleur
91b21b66ba Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-04 21:04:36 +01:00
Laurent Destailleur
4b6299ca15 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
2023-12-04 21:02:10 +01:00
Laurent Destailleur
2777cf843e FIX menu auguria 2023-12-04 20:57:35 +01:00
Laurent Destailleur
3d08acb69e Fix menu auguria 2023-12-04 20:55:30 +01:00
Laurent Destailleur
a6425991d6 Merge pull request #26958 from moreauftheobald/17.0
17.0: Correct bug in init_menu_auguria.sql Impossible to activate Menu
2023-12-04 20:44:59 +01:00
Laurent Destailleur
e4536e0a2e Merge pull request #26963 from cesar-bsd-com-br/patch-1
FIX: total_time at bottom in project overview only showing last value, instead of a sum of all records
2023-12-04 20:10:32 +01:00
pascal
0fbc2e03d0 fix #26962 2023-12-04 19:03:21 +01:00
Cesar Rodrigues
95d0712152 Fix total_time at bottom in project overview
Fix the total_time variable, that is always showing only the last line value, instead of a sum.

This PR is related to https://github.com/Dolibarr/dolibarr/issues/26962
2023-12-04 14:44:17 -03:00
Laurent Destailleur
55ae5ad349 Fix php-cs 2023-12-04 14:02:33 +01:00
Laurent Destailleur
619155f65e Fix with php-cs-fixer 2023-12-04 13:53:48 +01:00
Laurent Destailleur
4daacd3371 Fix with php-cs-fixer 2023-12-04 13:49:31 +01:00
Laurent Destailleur
1c9429643a Fix php-cs 2023-12-04 13:46:42 +01:00
Frédéric FRANCE
e6d64d84a9 Merge branch 'develop' into patch-7 2023-12-04 12:53:26 +01:00
Frédéric FRANCE
e331745156 Merge branch 'develop' into patch-8 2023-12-04 12:53:09 +01:00
Laurent Destailleur
c98b7ae0cb Fix php-cs-fixer 2023-12-04 12:37:08 +01:00
Laurent Destailleur
705ebea947 Fix php-cs-fixer 2023-12-04 12:36:57 +01:00
Laurent Destailleur
eebe4370fb Fix php-cs-fixer 2023-12-04 12:36:19 +01:00
Laurent Destailleur
7606fdd84f Debug v19 2023-12-04 12:29:38 +01:00
moreauf
97434c89bd 17.0: Correct bug in init_menu_auguria.sql Impossible to activate Menu 2023-12-04 12:29:22 +01:00
Laurent Destailleur
a7125280bc Fix with php-cs-fixer 2023-12-04 12:12:12 +01:00
Laurent Destailleur
c409b32e1a Fix with php-cs-fixer 2023-12-04 12:08:22 +01:00
Laurent Destailleur
d0b6b9fe65 Fix with php-cs-fixer 2023-12-04 12:07:53 +01:00
Laurent Destailleur
9e1b90e4a1 Fix with php-cs-fixer 2023-12-04 12:07:31 +01:00
Laurent Destailleur
1babae58a4 Fix with php-cs-fixer 2023-12-04 12:05:28 +01:00
Laurent Destailleur
be78ad6afd Fix with php-cs-fixer 2023-12-04 12:05:17 +01:00
Laurent Destailleur
b5728632ef Fix with php-cs-fixer 2023-12-04 12:05:11 +01:00
Laurent Destailleur
2eb630cd00 Fix with php-cs-fixer 2023-12-04 12:05:02 +01:00
Laurent Destailleur
54e6de0d7f Fix with php-cs-fixer 2023-12-04 12:04:36 +01:00
pascal
71c6bd9715 Fix 26953 2023-12-04 12:03:01 +01:00
Laurent Destailleur
ba10d60a0b Fix with php-cs-fixer 2023-12-04 12:02:35 +01:00
Laurent Destailleur
987d6c41b9 Fix with php-cs-fixer 2023-12-04 11:41:14 +01:00
Laurent Destailleur
de7d3c2bf8 Fix with php-cs-fixer 2023-12-04 11:22:28 +01:00
Laurent Destailleur
881e32f03a Fix with php-cs-fixer 2023-12-04 11:21:01 +01:00
Laurent Destailleur
cbd4d75c22 Fix php-cs-fixer for PHP 7.1 2023-12-04 11:11:14 +01:00
Laurent Destailleur
085f6e26f3 Fix phpcs 2023-12-04 10:25:02 +01:00
Laurent Destailleur
fa594ab779 fix phpcs 2023-12-04 10:24:06 +01:00
Laurent Destailleur
23c6b59818 Fix phpcs 2023-12-04 10:23:11 +01:00
Laurent Destailleur
b282251fbc Fix phpcs 2023-12-04 10:22:29 +01:00
Laurent Destailleur
697c8d14b7 Fix phpcs 2023-12-04 10:16:54 +01:00