Commit Graph

1244 Commits

Author SHA1 Message Date
Laurent Destailleur
b78f7af196 Merge branch 'develop' into fix/classname_empty 2024-03-20 10:56:54 +01:00
Laurent Destailleur
755d1feae8 Update actions_ticket.class.php 2024-03-20 10:52:37 +01:00
Laurent Destailleur
db61f9a676 Merge branch 'develop' into 18_fix_ticket_plain_text_editor 2024-03-20 10:49:49 +01:00
Laurent Destailleur
536004c898 Fix phpstan warnings 2024-03-20 10:43:51 +01:00
Eric Seigne
7bbde7d950 replace br to new lines if ckeditor is not enabled on ticket 2024-03-20 09:01:51 +01:00
MDW
903d9d52de Fix Expected an object instance & duplicate assignment
# Fix Expected an object instance & duplicate assignment

Fix: ticket.class.php: PhanTypeExpectedObjectOrClassName: Expected an object instance or the name of a class but saw expression $classname with type ''|string
Fix: ticket.class.php: PhanPluginRedundantAssignment: Assigning '' to variable $sendtocc which already has that value
2024-03-20 04:26:16 +01:00
Laurent Destailleur
e92d6230df Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/ticket/class/ticket.class.php
	htdocs/ticket/list.php
	htdocs/ticket/stats/index.php
2024-03-20 02:31:33 +01:00
Laurent Destailleur
dd5d70ad5d Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
Conflicts:
	htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
	htdocs/public/ticket/create_ticket.php
	htdocs/public/ticket/index.php
	htdocs/public/ticket/list.php
	htdocs/public/ticket/view.php
	htdocs/ticket/agenda.php
	htdocs/ticket/card.php
	htdocs/ticket/class/ticket.class.php
	htdocs/ticket/contact.php
	htdocs/ticket/document.php
	htdocs/ticket/index.php
	htdocs/ticket/list.php
	htdocs/ticket/messaging.php
	htdocs/ticket/stats/index.php
2024-03-20 02:25:58 +01:00
Laurent Destailleur
a7223719a5 Merge pull request #28446 from rycks/18.0-ticket_code_review
18.0 fix links error on dedicated virtualhost and ticket code review
2024-03-20 01:55:57 +01:00
Laurent Destailleur
10e3627c59 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-03-19 18:14:07 +01:00
Laurent Destailleur
e9e2105508 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/core/class/CMailFile.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/ticket/class/ticket.class.php
2024-03-19 18:12:13 +01:00
Laurent Destailleur
43a3f449c4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-19 17:07:51 +01:00
Laurent Destailleur
5e3eaab7d1 Merge pull request #27080 from altairisfr/nocompany
NEW : add constant TICKETS_NO_COMPANY_ON_FORM
2024-03-19 16:54:47 +01:00
Laurent Destailleur
b705dd8094 NEW Support Reply-To tracking in emails sending (tickets only for the
moment)

Conflicts:
	htdocs/core/class/CMailFile.class.php
	htdocs/ticket/class/ticket.class.php
2024-03-19 16:42:27 +01:00
Christophe Battarel
db79c9dab4 Merge branch 'develop' into nocompany 2024-03-19 10:58:22 +01:00
MDW
61cae896ec Force variable typing to avoid false positives 2024-03-19 03:16:00 +01:00
MDW
d111b9119f More specifc return value for listeContact 2024-03-19 02:59:39 +01:00
MDW
f9639fc689 Fix arg type for strtolower by typing function arguments 2024-03-19 02:59:38 +01:00
Laurent Destailleur
2077c23c5e Update styles.css.php 2024-03-19 02:08:49 +01:00
Laurent Destailleur
0b9d518e8b Merge pull request #28942 from Hystepik/new-references-tickets
New data struture for references field in ticket
2024-03-19 01:53:36 +01:00
Laurent Destailleur
66faa6dd0e Update ticket.class.php 2024-03-19 01:52:57 +01:00
MDW
c266bdb042 Fix assignement to 'userassigned' 2024-03-19 00:32:08 +01:00
MDW
fd9d48faac Fix phpstan CommonObject->fields - notnull is optional field 2024-03-19 00:32:00 +01:00
mrozniecki
fcff03c66d Add substitution for mail intro and signature on ticket mail 2024-03-18 16:10:39 +01:00
Hystepik
d82729e49d New data struture for references field in ticket 2024-03-18 15:11:50 +01:00
Laurent Destailleur
de58435ef1 FIX: if we stop for security purpose, we must exit a non zero value. 2024-03-16 23:08:15 +01:00
Laurent Destailleur
97e11f7f5f Update cticketcategory.class.php 2024-03-16 17:16:46 +01:00
Laurent Destailleur
0fdca9b183 Update messaging.php 2024-03-16 16:00:22 +01:00
Laurent Destailleur
34a554e64d Update cticketcategory.class.php 2024-03-16 15:59:43 +01:00
Laurent Destailleur
ea12c39cba Update index.php 2024-03-16 15:57:16 +01:00
Laurent Destailleur
57fa0671e5 Update messaging.php 2024-03-16 15:56:40 +01:00
Laurent Destailleur
2bef2c6b87 Update list.php 2024-03-16 15:55:11 +01:00
Laurent Destailleur
52d9b7d6c4 Update index.php 2024-03-16 15:53:25 +01:00
Laurent Destailleur
15ba3757ab Update document.php 2024-03-16 15:52:38 +01:00
Laurent Destailleur
15207665d8 Update contact.php 2024-03-16 15:52:01 +01:00
Laurent Destailleur
78d49e6713 Update ticket.class.php 2024-03-16 15:51:21 +01:00
Laurent Destailleur
8e3a567c03 Update cticketcategory.class.php 2024-03-16 15:49:04 +01:00
Laurent Destailleur
b65b184405 Update agenda.php 2024-03-16 15:48:04 +01:00
Laurent Destailleur
c8545ff59d Update card.php 2024-03-16 15:46:45 +01:00
Laurent Destailleur
e994d6650f Fix regression in GETPOST limit 2024-03-16 11:41:00 +01:00
Laurent Destailleur
79aa9fb1f1 Code simpler 2024-03-15 20:29:21 +01:00
Laurent Destailleur
5fadea4d0d NEW Support Reply-To tracking in emails sending (tickets only for the
moment)
2024-03-15 19:40:32 +01:00
MDW
a5acb44890 Fix origin_email and track_id can be null 2024-03-15 10:12:51 +01:00
MDW
23785393a3 Add csslist to json keys 2024-03-15 03:55:52 +01:00
MDW
f8055ec866 Fix PhanTypeMismatchPropertyDefault 2024-03-15 03:54:13 +01:00
MDW
e7d378055f Fix PhanPluginRedundantAssignment 2024-03-13 01:04:59 +01:00
Laurent Destailleur
74b8162d22 Merge pull request #28700 from mdeweerd/urlencode/fixuptype
Fix: Ensure the argument type for urlencode is string
2024-03-12 14:43:41 +01:00
Laurent Destailleur
a437398993 Update index.php 2024-03-12 13:52:16 +01:00
MDW
88d59896ec Qual: 'enabled' in fields can be string ('isModEnabled(...)')
# Qual: 'enabled' in fields can be string ('isModEnabled(...)')

Update PHPdoc to allow that enabled is a string
2024-03-12 13:38:08 +01:00
MDW
d491c9f264 Fix: Repeat fields typing in CommonClass children
# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
2024-03-11 17:40:29 +01:00