Commit graph

123653 commits

Author SHA1 Message Date
Laurent Destailleur
46bd07c8b0 Fix show warning to avoid bad setup 2023-10-10 12:55:36 +02:00
Laurent Destailleur
cf19844ea3 Fix only enabled users. 2023-10-10 12:30:09 +02:00
Laurent Destailleur
e642697f60 Fix label of trigger user enabled or disabled 2023-10-10 12:22:22 +02:00
Laurent Destailleur
849bcf9bca Fix title New Employee 2023-10-10 12:10:49 +02:00
Laurent Destailleur
25d3ead0a0 FIX Error not returned on sales with takepos and batch module enabled 2023-10-10 11:51:52 +02:00
Laurent Destailleur
cd3147381a Fix javascript error 2023-10-10 11:16:28 +02:00
Laurent Destailleur
8505223b73 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-10 10:17:16 +02:00
Laurent Destailleur
b619c534d7 Fix var 2023-10-10 10:04:16 +02:00
Laurent Destailleur
e65f32b3aa
Merge pull request #26137 from hregis/fix_avoid_lines_breaks
FIX avoid warning if module not activated
2023-10-09 10:29:53 +02:00
Laurent Destailleur
60a1ff7cd6 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-09 09:14:06 +02:00
Laurent Destailleur
b3368514ab NEW Add option MAIN_MAIL_DEBUG_LOG_WITH_DATE to add 1 log file per email 2023-10-09 09:13:27 +02:00
Regis Houssin
fb4ed77d93 FIX avoid warning if module not activated 2023-10-08 21:05:46 +02:00
Laurent Destailleur
e85a318701
Merge pull request #26131 from hregis/fix_avoid_lines_breaks
FIX avoid warning + CSRF
2023-10-08 18:46:10 +02:00
Laurent Destailleur
5e0efcf7ce
Update ticket_public.php 2023-10-08 18:45:49 +02:00
Laurent Destailleur
e82b0fd0aa Removed useless title 2023-10-08 17:43:16 +02:00
Laurent Destailleur
72f87593d2 css 2023-10-08 16:46:40 +02:00
Laurent Destailleur
14c428bc97 CSS 2023-10-08 16:43:36 +02:00
Laurent Destailleur
0a46de7d81 Fix warning 2023-10-08 12:51:46 +02:00
Laurent Destailleur
1b246f694e Fix label 2023-10-08 12:04:00 +02:00
Regis Houssin
d6b39dc227 FIX avoid warnings 2023-10-07 08:30:07 +02:00
Regis Houssin
c419b0c1b1 FIX syntax error 2023-10-07 08:16:06 +02:00
Regis Houssin
e380669207 FIX avoid warning + CSRF 2023-10-07 08:13:12 +02:00
Laurent Destailleur
f74a4c9589 FIX combo value not visible with smartphone for multiselect 2023-10-06 20:10:52 +02:00
Laurent Destailleur
f4166de704 Fix warning 2023-10-06 16:21:39 +02:00
Laurent Destailleur
779d632367 Prepare 18.0.2 2023-10-06 16:09:57 +02:00
Laurent Destailleur
bf5df76117 Prepare 18.0.2 2023-10-06 16:05:20 +02:00
Laurent Destailleur
4afda75a4d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-05 21:01:34 +02:00
Laurent Destailleur
8c7ec0f7a5 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-05 20:59:02 +02:00
Laurent Destailleur
0af268056e
Merge pull request #26116 from am97/fix/17.0/clone
FIX: modification of complementary attributes in commercial proposals
2023-10-05 20:56:26 +02:00
Laurent Destailleur
876f45e3fd
Merge pull request #26115 from am97/fix/16.0/clone
FIX: modification of complementary attributes in commercial proposals
2023-10-05 20:52:02 +02:00
Andrés Maldonado
ab1071b70a FIX: modification of complementary attributes in commercial proposals
The db object must not be cloned in order to avoid a PHP Fatal error:  Uncaught Exception: Serialization of 'PgSql\Connection' is not allowed
2023-10-04 18:31:20 +02:00
Andrés Maldonado
54a0245c4d FIX: modification of complementary attributes in commercial proposals
The db object must not be cloned in order to avoid a PHP Fatal error:  Uncaught Exception: Serialization of 'PgSql\Connection' is not allowed

This commit replaces the dol_clone function by the one in the 17.0 branch
2023-10-04 17:48:30 +02:00
Laurent Destailleur
78db102acd Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-04 13:03:27 +02:00
Laurent Destailleur
2a96ac6428 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-04 13:02:09 +02:00
Laurent Destailleur
342cdc81ac Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-04 13:01:09 +02:00
Laurent Destailleur
a201f54777 css 2023-10-04 12:59:00 +02:00
Laurent Destailleur
9bd3bb0594 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/compta/bank/various_payment/card.php
	htdocs/compta/bank/various_payment/list.php
	htdocs/core/lib/security.lib.php
	htdocs/core/lib/signature.lib.php
2023-10-04 12:43:03 +02:00
Laurent Destailleur
a2ea4d77c3 Merge 2023-10-04 10:43:14 +02:00
Laurent Destailleur
0a015a82b4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-04 10:39:40 +02:00
Laurent Destailleur
9ac5270626 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/core/lib/signature.lib.php
2023-10-04 10:38:46 +02:00
Laurent Destailleur
8fc2beda1f Fix regression 2023-10-04 10:36:07 +02:00
Laurent Destailleur
f6f25e1117 Fix regression 2023-10-04 10:34:47 +02:00
Laurent Destailleur
517b19cc6f Fix regression 2023-10-04 10:33:38 +02:00
Laurent Destailleur
726258ff4f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
Conflicts:
	htdocs/core/lib/signature.lib.php
2023-10-04 10:32:24 +02:00
Laurent Destailleur
c3585930e5 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-04 10:23:22 +02:00
Laurent Destailleur
4298150413 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/signature.lib.php
2023-10-04 10:22:33 +02:00
Laurent Destailleur
997e14a293
Merge pull request #26105 from rycks/15.0_fix_global_object_var_for_multicompany_online_sign
fix #26104 : remove global object
2023-10-04 10:01:44 +02:00
Laurent Destailleur
74f486bd60
Merge pull request #26034 from atm-quentin/FIX_rights_paiement_sc
FIX rights paymentsc paiementcharge
2023-10-04 09:47:49 +02:00
Eric Seigne
563cdcefb3 fix #26104 : remove global object 2023-10-04 00:10:19 +02:00
Laurent Destailleur
a0248fe9e3
Merge pull request #26036 from atm-sami/NEW_add_data_in_printObjectLine_hook
add extrafields and defaulttpldir for hook parameters
2023-10-02 18:29:50 +02:00