Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
107,259 Commits 36 Branches 189 Tags
a06b51e06c69f7c63e1a941ae68698cb997ae28d
Commit Graph

695 Commits

Author SHA1 Message Date
Laurent Destailleur
0020f4e48a Merge pull request #20222 from thomas-Ngr/develop_new_ticket_notify_at_closing 
New - Ticket: notify contacts at closing
 2022-03-07 16:23:27 +01:00
Laurent Destailleur
6bb49797f8 Merge pull request #20243 from JohnXLivingston/fix_template_name_typo 
Fix: typo in template name
 2022-03-07 14:55:02 +01:00
Thomas Negre
d884fe6532 Make ticket messages order by date desc by default 2022-03-03 10:03:19 +01:00
John Livingston
1ece554c92 Fix: typo in template name 
There was a typo in generated HTML comment.
 2022-03-01 17:39:38 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
 2022-03-01 16:48:29 +01:00
Laurent Destailleur
2a48dd349e Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5 2022-03-01 16:38:06 +01:00
Thomas Negre
b9e0fc7b02 stickler corrections 2022-02-28 19:02:07 +01:00
Thomas Negre
472666182e Ticket list: add a warning before mass ticket closing to chose if contacts should be notified 2022-02-28 17:10:46 +01:00
Thomas Negre
e4ed4b8307 Ticket card: enhance closing modal to allow chosing contacts to notify 2022-02-28 17:10:45 +01:00
Laurent Destailleur
8cc0f3bb58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-02-22 18:47:26 +01:00
Thomas Negre
d769d856e7 fix $object->status not being set. Avoid using $object->fk_statut. 2022-02-21 12:09:45 +01:00
Thomas Negre
bf9ca1caaa new : allow to display a warning on untreated tickets. Introduces options TICKET_DELAY_BEFORE_FIRST_RESPONSE and TICKET_DELAY_SINCE_LAST_RESPONSE 2022-02-21 11:43:32 +01:00
Laurent Destailleur
3697cb9ca4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/class/reception.class.php
 2022-02-17 11:34:54 +01:00
Laurent Destailleur
2a18bce2f3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/api/index.php
	htdocs/langs/en_US/productbatch.lang
	htdocs/langs/fr_FR/productbatch.lang
	htdocs/ticket/list.php
 2022-02-16 20:31:55 +01:00
Florian
aa2a57ff95 Check that the value is not an array 2022-02-16 17:00:54 +01:00
Florian
7ed6ca6ec6 FIX ISSUE DB_ERROR_SYNTAX-#18921 2022-02-16 17:00:50 +01:00
Frédéric FRANCE
a613553f37 Merge branch 'hookgetnomurl' into patch-1 2022-02-15 18:44:06 +01:00
Thomas Negre
b6b5eb633b only update last_msg_date if a message is really sent. 2022-02-07 17:38:32 +01:00
Thomas Negre
26648e4f12 ticket : update date_last_msg_sent on message sending from backend or public interface 2022-02-07 15:19:13 +01:00
Laurent Destailleur
d9691e16d5 Merge pull request #18081 from lmag/fix_ticket_substitution 
fix: #19428 ticket substitution
 2022-01-28 20:01:10 +01:00
Thomas Negre
311d6d666d fix ticket : an external user should be able to access only its own company tickets. 2022-01-25 16:07:56 +01:00
Laurent Destailleur
58fcf88e24 Merge pull request #19922 from thomas-Ngr/develop_fix_restrict_external_user_ticket_list 
fix :  restrict external user ticket list view
 2022-01-25 16:07:18 +01:00
Laurent Destailleur
c3a58ae303 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-25 15:43:42 +01:00
Thomas Negre
0126be54a3 fix ticket : an external user should be able to access only its own company tickets. 2022-01-25 15:19:40 +01:00
Thomas Negre
bab35fd97d Fix ticket module : security check would prevent automatic fill of thirdparty fields when creating a ticket from thirdparty card. 2022-01-25 13:42:03 +01:00
Laurent Destailleur
8ceec043e8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-24 12:50:10 +01:00
Laurent Destailleur
daca510fa6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	build/docker/docker-compose.yml
 2022-01-23 18:52:47 +01:00
Laurent Destailleur
acafc69baa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-01-23 16:13:20 +01:00
Laurent Destailleur
dfcaeea9d1 Merge pull request #19900 from thomas-Ngr/develop_new_ticket_check_notify_tier_at_create 
NEW option to default check "notify tier at creation" in ticket module
 2022-01-23 12:11:10 +01:00
Laurent Destailleur
255ac69a0d Update card.php 2022-01-23 12:10:52 +01:00
Thomas Negre
e9526654fe NEW allow a ticket to be automatically marked as read when created from backend. 
Introduces option TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND
 2022-01-21 11:35:18 +01:00
Thomas Negre
bb86be062c NEW ticket module : add an option to enable default check notify tier at creation 
introduces new option TICKET_CHECK_NOTIFY_TIER_AT_CREATE
 2022-01-21 09:44:22 +01:00
Maxime Kohlhaas
ea55712d1b Fix missing require class project 2022-01-15 23:04:56 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
13a3d0057b Merge pull request #19644 from FHenry/dev_public_page_multientity_ticket 
FIX: manage multientity in ticket public page by querystring (#Evarisk)
 2022-01-06 16:53:35 +01:00
Laurent Destailleur
ef56631c80 FIX #yogosha8186 2022-01-03 18:15:19 +01:00
Laurent Destailleur
0c82577fc5 Look and feel v15 2022-01-02 19:04:12 +01:00
Laurent Destailleur
084a404870 Debug v15 2022-01-02 18:33:57 +01:00
Laurent Destailleur
48c990a8bf Sync transifex 2022-01-02 18:22:18 +01:00
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +01:00
Florian HENRY
dfbd03140c FIX: manage multientity in ticket public page by querystring 2021-12-17 11:10:08 +01:00
Laurent Destailleur
6886cca1fa CSS 2021-12-07 02:35:46 +01:00
Laurent Destailleur
8bace4c64e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-30 16:24:42 +01:00
Laurent Destailleur
a298a845f1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/memory.lib.php
	htdocs/langs/en_US/holiday.lang
	htdocs/ticket/card.php
 2021-11-30 16:24:18 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed 
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
 2021-11-29 15:09:18 +01:00
Laurent Destailleur
312a741b80 Fix closing div 2021-11-25 21:42:42 +01:00
ksar
f66f3e7355 FIX #19476 2021-11-25 15:25:17 +01:00
Frédéric FRANCE
dc3bfcfb87 can modify tooltip by reference 2021-11-22 19:57:26 +01:00
Laurent Magnin
00c7114c0b Merge branch 'Dolibarr:develop' into fix_ticket_substitution 2021-11-19 16:52:57 +01:00
Christophe Battarel
0afbff5d67 put code after good id 2021-11-17 16:52:04 +01:00