Commit Graph

296 Commits

Author SHA1 Message Date
Laurent Destailleur
08ac0e9ee4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-21 12:38:41 +02:00
Laurent Destailleur
11cc0a61da Fix cast of int 2023-09-20 11:59:57 +02:00
Laurent Destailleur
ce66267ae5 Merge pull request #25972 from thomas-Ngr/develop_fix_duplicate_ticket_information
FIX : duplicate ticket information
2023-09-19 22:41:16 +02:00
tnegre
1c70a2b3da FIX when creating tickets from public interface and backoffice at the same time, values from the ticket created on public interface were not erased during creation from backoffice. 2023-09-19 17:08:06 +02:00
atm-thibaultf
363ac9f926 NEW CONF allow modify ticket classification even if closed 2023-09-12 13:07:21 +02:00
Laurent Destailleur
40e739dab6 Clean dead code 2023-09-01 00:08:31 +02:00
Laurent Destailleur
5e586bfb07 Fix phpstan 2023-08-21 14:03:43 +02:00
Maximilien Rozniecki
58c864b889 Fix a bug with fetching with the object used to create the ticket 2023-08-17 14:53:19 +02:00
Laurent Destailleur
35e4565ccc Avoid duplicate feature with TICKET_LINK_TO_CONTRACT_WITH_HARDLINK 2023-08-11 12:58:23 +02:00
Laurent Destailleur
e91f0d88c8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-08-11 12:34:27 +02:00
Laurent Destailleur
06bd68f252 Merge branch 'develop' into develop-2 2023-08-09 18:20:15 +02:00
Charlène Benke
6ce2b54a3a Asked change made 2023-08-09 18:01:02 +02:00
UT from dolibit
7872a5889f Update card.php (#25579) 2023-08-08 21:31:17 +02:00
Charlène Benke
311d41a6b3 Update card.php 2023-08-04 15:42:25 +02:00
Charlène Benke
14a043a309 add contract field 2023-08-04 10:35:32 +02:00
Laurent Destailleur
a1a8ad2159 FIX #yogosha17287 2023-07-31 14:50:27 +02:00
Laurent Destailleur
2207bbcc74 Fix test 2023-07-12 13:12:38 +02:00
Laurent Destailleur
476f95c4f6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/comm/action/index.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
	htdocs/cron/class/cronjob.class.php
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/public/ticket/list.php
	htdocs/supplier_proposal/list.php
	htdocs/ticket/class/ticket.class.php
2023-05-17 00:57:17 +02:00
Laurent Destailleur
e62e56c19a Fix label of button, title 2023-05-13 14:50:07 +02:00
Laurent Destailleur
1a38e78a9b Fix error management on file upload on ticket 2023-05-13 14:36:08 +02:00
stickler-ci
7f71fb0038 Fixing style errors. 2023-05-10 07:36:39 +00:00
Maximilien Rozniecki
396abfe882 update ticket ref when the ref is already used at the creation 2023-05-10 09:27:49 +02:00
Laurent Destailleur
ad195f53f0 Debug v18 2023-05-04 22:17:06 +02:00
stickler-ci
fe375de220 Fixing style errors. 2023-03-21 16:56:07 +00:00
Benjamin Falière
de18ca511f Add non empty socid condition 2023-03-21 17:27:14 +01:00
Benjamin Falière
f28e2f525c Added my name 2023-03-21 17:14:15 +01:00
Benjamin Falière
59c9899035 NEW add link to thirdparty tickets history 2023-03-21 17:09:33 +01:00
Laurent Destailleur
f84a8361bc Look and feel v18 2023-03-13 10:05:00 +01:00
Laurent Destailleur
9d304cd169 Merge pull request #24081 from MaximilienR-easya/dev_NEW_dont_send_ticket_mail_to_closed_contact
don't send ticket email to closed contact
2023-03-04 15:17:57 +01:00
Maximilien Rozniecki
fd93a3fe15 not adding the closed contact 2023-03-03 14:53:06 +01:00
Frédéric FRANCE
8ed361b917 add pictos 2023-03-03 14:36:34 +01:00
Laurent Destailleur
a64ed59e18 Merge 2023-02-23 22:25:56 +01:00
Laurent Destailleur
fb4e3ec123 Debug v17 2023-02-22 15:50:46 +01:00
Laurent Destailleur
610ab03f0d Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-02-22 14:38:25 +01:00
Laurent Destailleur
da503e6c58 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-22 14:33:59 +01:00
Laurent Destailleur
56bc4b0538 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-22 14:32:35 +01:00
Laurent Destailleur
e7546e6da1 FIX #23804 2023-02-22 14:29:36 +01:00
Laurent Destailleur
870ac42082 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-20 16:20:49 +01:00
Laurent Destailleur
3b8794dfb6 Debug v17 2023-02-20 02:08:04 +01:00
Laurent Destailleur
2168578f2e Fix inline css 2023-02-18 14:00:25 +01:00
Frédéric FRANCE
03e8ee0e6d use user->hasRight 2023-02-14 23:00:15 +01:00
Laurent Destailleur
80d46a22f1 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-18 21:36:57 +01:00
Laurent Destailleur
48161b8400 Debug v17. Bad param for selection of project 2023-01-17 13:50:23 +01:00
Laurent Destailleur
8a4613176c Fix warnings 2022-12-28 16:26:07 +01:00
Laurent Destailleur
0b487ef7d9 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-27 12:05:13 +01:00
Laurent Destailleur
348adb2820 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2022-12-27 11:20:22 +01:00
Laurent Destailleur
8d4faf3530 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-27 11:19:11 +01:00
Laurent Destailleur
912428f5a1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-27 11:14:40 +01:00
Frédéric France
637fc95265 clean code 2022-12-22 22:29:24 +01:00
Laurent Destailleur
68ebd850f4 Debug v17 2022-12-22 16:21:25 +01:00