William Mead
b9de0e49d8
Added intervention closed confirmation text
2023-10-06 09:34:41 +02:00
William Mead
68b731d9ac
Added intervention closed notification email text
2023-10-06 09:16:33 +02:00
William Mead
b29a06a0a6
Cleaned code
2023-10-06 09:15:48 +02:00
Laurent Destailleur
8ce07dfa83
Merge pull request #22573 from rycks/13.0_fix_sellist_add_order_by_option
...
Close #22571 : order by could be set
2023-10-06 05:02:29 +02:00
Laurent Destailleur
6cd7ef77fc
Merge branch 'develop' into 13.0_fix_sellist_add_order_by_option
2023-10-06 01:42:22 +02:00
Laurent Destailleur
9deebe63d8
Update commonobject.class.php
2023-10-06 01:41:44 +02:00
Laurent Destailleur
c3a9ba5506
Update commonobject.class.php
2023-10-05 21:29:30 +02:00
Laurent Destailleur
b0cc8d7b0d
Merge branch '18.0' into 13.0_fix_sellist_add_order_by_option
2023-10-05 21:25:19 +02:00
Laurent Destailleur
b307774dde
Update commonobject.class.php
2023-10-05 21:17:40 +02:00
Laurent Destailleur
955439a673
SEC: Add action confirm_... as sensitive to need a CSRF token
2023-10-05 21:09:55 +02:00
Laurent Destailleur
2aee9fc5a9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2023-10-05 21:09:33 +02:00
Laurent Destailleur
f5534586c1
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop
2023-10-05 21:09:21 +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
Laurent Destailleur
5b0483bf13
Merge pull request #26113 from defrance/patch-277
...
php warning and field not used
2023-10-05 20:47:40 +02:00
Laurent Destailleur
e0ff53bcaa
Merge pull request #26106 from thomas-Ngr/develop_fix_duplicate_ticket_information
...
fix ticket card: set origin_email to null
2023-10-05 20:42:25 +02:00
Laurent Destailleur
8488c05b6a
Merge pull request #24872 from MaximilienR-easya/dev_New_linked_file_shared_public_side
...
New access to msg linked files via public interface
2023-10-05 20:41:23 +02:00
Laurent Destailleur
0f448389d1
Update actions_ticket.class.php
2023-10-05 20:40:24 +02:00
Laurent Destailleur
a2b6532c5a
Debug v19
2023-10-05 16:32:38 +02:00
Laurent Destailleur
553776a77a
Enhance error message when set character set failed
2023-10-05 12:58:44 +02:00
William Mead
b3ce1af29d
NEW Added notification on closed intervention
2023-10-05 12:11:39 +02:00
Laurent Destailleur
6e40408683
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2023-10-05 11:27:41 +02:00
Laurent Destailleur
76a7801975
Fix warning
2023-10-05 11:27:00 +02:00
Laurent Destailleur
1b8c72f30d
fix html typo
2023-10-05 11:08:19 +02:00
Laurent Destailleur
c3ae353a2a
Work on session add
2023-10-04 21:12:50 +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
3700b047ec
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2023-10-04 13:04:54 +02:00
Laurent Destailleur
40f10588e3
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop
2023-10-04 13:04:31 +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
Charlène Benke
bf1437ff8b
Update note.php
2023-10-04 12:17:56 +02:00
Charlène Benke
f59a0f5eba
warning error and duplicate
2023-10-04 12:17:02 +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
Laurent Destailleur
ee4d662ca7
Merge pull request #26091 from elkoiko/fix-warnings-contrat-and-contratligne
...
FIX warnings for undefined properties in Contrat and ContratLigne
2023-10-04 09:46:11 +02:00