Commit Graph

1325 Commits

Author SHA1 Message Date
Laurent Destailleur
9e01c45df6 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-28 16:56:07 +02:00
Laurent Destailleur
e5e1f385b5 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-28 16:49:12 +02:00
Laurent Destailleur
6428a1d892 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-07-28 15:05:02 +02:00
Laurent Destailleur
75d1fbc49f Debug v20 - fix cond to show dict, several fix in public ticket gui 2024-07-28 15:02:08 +02:00
Laurent Destailleur
7d1aa1e7f6 Debug v20 - fix cond to show dict, several fix in public ticket gui 2024-07-28 14:54:06 +02:00
Laurent Destailleur
57ad79a95b QUAL: Move the public css file into the public directory 2024-07-27 22:25:13 +02:00
Laurent Destailleur
73e4aa3147 Fix no html allowed into the subject of email/message 2024-07-27 15:47:17 +02:00
Laurent Destailleur
290f164b4f Sanitize output 2024-07-27 15:41:14 +02:00
Laurent Destailleur
16e48da91e Fix CTI 2024-07-23 19:35:06 +02:00
Laurent Destailleur
1c6dfc4508 Removed duplicate info subject on ticket page. 2024-07-23 09:22:10 +02:00
Laurent Destailleur
6ed6900c79 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-22 16:46:40 +02:00
Laurent Destailleur
3633762298 Fix dolPrintHTML when MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY is off 2024-07-22 16:36:24 +02:00
Laurent Destailleur
8d7e2d7aa0 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-22 13:23:00 +02:00
Laurent Destailleur
940b946dfb Debug v20 2024-07-22 13:19:35 +02:00
Laurent Destailleur
147a8bfaee Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/categories/viewcat.php
	htdocs/contrat/card.php
	htdocs/contrat/list.php
	htdocs/eventorganization/conferenceorbooth_list.php
	htdocs/expedition/list.php
	htdocs/societe/card.php
2024-07-11 10:44:39 +02:00
Zephyriony
1a3c4d5289 Add doActions on ticket stats (#30336) 2024-07-10 18:57:14 +02:00
Laurent Destailleur
8a4f550d64 Debug v20 2024-07-09 17:33:27 +02:00
Frédéric FRANCE
f99beb9023 fix expects int (#30304) 2024-07-06 14:30:13 +02:00
Frédéric FRANCE
2f5647e4e3 fix checkFunctionArgumentTypes (#30234)
* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* add ignore

* add ignore

add ignore

add ignore

add ignore

add ignore

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes
2024-07-03 02:30:53 +02:00
Laurent Destailleur
25971c3e6f Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-07-02 13:41:32 +02:00
Laurent Destailleur
e985d24b52 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-02 02:11:39 +02:00
Laurent Destailleur
d6480594af Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-02 02:09:25 +02:00
Laurent Destailleur
6259d02042 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-07-02 02:08:10 +02:00
Shanty
7cee801622 FIX #30010 : Use conf TICKET_MESSAGE_MAIL_INTRO instead of translation key (#30081)
* Use conf TICKET_MESSAGE_MAIL_INTRO instead of translation key

* Set TicketMessageMailIntroText as default value if conf empty
2024-07-01 01:51:33 +02:00
Alexandre SPANGARO
96afcaa476 Better comments (#30200)
* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* CI Missing language key

* Update eventorganization.lang

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-06-30 21:02:50 +02:00
Frédéric FRANCE
4b275dc148 add phpdoc (#30208)
* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc

* clean phpdoc
2024-06-30 19:39:01 +02:00
Frédéric FRANCE
f1302291de fix phan emailcollector (#30196)
* fix phan emailcollector

* fix phpstan

* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc
2024-06-29 18:57:43 +02:00
Laurent Destailleur
1104b95137 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-27 13:47:27 +02:00
Laurent Destailleur
dec8342bb7 Debug v20 2024-06-27 00:30:26 +02:00
Laurent Destailleur
cf5daf7c25 Removed useless option. Default dolibarr behaviour is to be open. 2024-06-27 00:29:51 +02:00
Laurent Destailleur
c54a97e923 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-06-24 01:47:18 +02:00
Laurent Destailleur
82614d7fca Debug v20 2024-06-15 18:55:17 +02:00
lamrani abdelwadoud
53f8b7693e Fix delete linked files for ticket and Don (#29929) 2024-06-08 15:04:18 +02:00
Anthony Damhet
61c9245498 Add llxHeader to tickets (#29932) 2024-06-08 14:50:14 +02:00
Nicolas Domenech
74359d67d7 Fix missing hook getNomUrl in ticket (#29881) 2024-06-07 16:23:56 +02:00
Lucas Marcouiller
71f875ce9d Fix NewMessage in ticket class to use origin_replyto field (#29885)
Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
2024-06-07 16:18:20 +02:00
Laurent Destailleur
c2ceaf0b77 Debug v20 2024-06-05 14:00:49 +02:00
Laurent Destailleur
5ee4af14ed Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-05-31 16:30:50 +02:00
Laurent Destailleur
dc024a1f18 Debug v20 2024-05-30 14:43:16 +02:00
Laurent Destailleur
82908a30eb Clean phan warnings 2024-05-30 13:37:17 +02:00
Charles
fb1e5b9dd5 Update card.php Issue #29757 (#29758)
Bug-Fix Issue #29757  Prevent the check for a duplicate ref from populating the new ticket object fields with values from the conflicting ticket.
2024-05-25 13:04:39 +02:00
Laurent Destailleur
66f4562300 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-05-23 14:50:17 +02:00
Laurent Destailleur
a854e58905 FIX Missing $param in hook call for list 2024-05-23 14:41:56 +02:00
Zephyriony
2707445dbe Update contact.php fetch object (#29727)
* Update contact.php fetch object

* Update contact.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-05-21 16:00:59 +02:00
Zephyriony
404d21a402 NEW Execute the doAction hook on other ticket pages (#29701)
* Update document.php

* Update contact.php
2024-05-16 17:32:59 +02:00
Frédéric FRANCE
d0830b3159 fix phpstan (#29602)
* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix travis

* fix phpstan

* fix phpstan

* fix phan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

fix phpstan

fix phpstan

fix phpstan

fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix travis

* fix phpstan

* fix phpstan

* fix phpstan

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-05-05 00:34:19 +02:00
Laurent Destailleur
283f16234f Debug v20 2024-05-03 01:02:40 +02:00
Laurent Destailleur
afc178f246 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-30 13:21:04 +02:00
atm-irvine
851ecdeb4d FIX : Blank list when contract was checked in list of tickets (#29528)
* FIX : Blank list when contract was checked in list of tickets

* Added contracts lang
2024-04-29 19:31:12 +02:00
atm-irvine
71c2256a6d NEW : Edit ticket (#29497)
* NEW : Edit ticket

* Fixed for travis

* Fix pre-commit

* Fix for phan

* Update html.formticket.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-04-27 12:43:04 +02:00