Commit Graph

243 Commits

Author SHA1 Message Date
routmoute
1d38a3b7b8 fix conflict with develop branch 2023-12-29 20:19:17 +01:00
routmoute
48f4e52a22 fix: Display of the list of merged pdf 2023-12-29 02:30:32 +01:00
Laurent Destailleur
f43ef55b26 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
	htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
	htdocs/modulebuilder/template/core/modules/modMyModule.class.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
	htdocs/modulebuilder/template/myobject_agenda.php
	htdocs/modulebuilder/template/myobject_list.php
2023-09-05 19:38:45 +02:00
Florian HENRY
cb8a6796df FIX: Quick search Intervention redirect to wrong page 2023-08-16 14:32:31 +02:00
Laurent Destailleur
ef64e1dcfc Debug v18 2023-06-28 11:50:28 +02:00
Laurent Destailleur
e74c50aa8a Clean code 2023-04-28 16:05:25 +02:00
Laurent Destailleur
be8f9f33df Look and feel v18 2023-04-06 12:00:39 +02:00
Laurent Destailleur
54bb784138 Debug v18 2023-03-02 19:40:28 +01:00
Frédéric FRANCE
7dad374aff fix emty status select list 2023-02-22 09:32:12 +01:00
Laurent Destailleur
eaa0e5eb3e CSS 2023-02-19 02:39:39 +01:00
Laurent Destailleur
e489e10b65 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-17 16:05:12 +01:00
Laurent Destailleur
3c3d221370 FIX #23914 search_all 2023-02-16 21:23:00 +01:00
Laurent Destailleur
ff2835167a Merge pull request #23474 from lamrani002/kanbanForListIntervention
NEW kanbanView for Intervention List
2023-01-11 20:57:17 +01:00
Lamrani Abdel
a2848b4881 kanbanView for Intervention List 2023-01-09 17:52:01 +01:00
Laurent Destailleur
9aa6e59f9b Look and feel v18 2023-01-05 04:04:16 +01:00
Laurent Destailleur
8f02fb2ab8 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-22 20:34:22 +01:00
Laurent Destailleur
68ebd850f4 Debug v17 2022-12-22 16:21:25 +01:00
Laurent Destailleur
357b69a90b Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-22 01:11:03 +01:00
Laurent Destailleur
e06bad5112 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2022-12-21 21:15:00 +01:00
Charlène Benke
ddd07da70e object parameters notre present on hook 2022-12-15 08:42:56 +01:00
hystepik
4c43d81872 Fix #23064 : diplays total at end of inter list 2022-12-14 15:39:02 +01:00
Laurent Destailleur
a0e53a402d Fix reponsive 2022-12-02 19:23:12 +01:00
Maxime Kohlhaas
8c597543e1 Fix : use count() in lists - part 1 2022-11-26 00:54:49 +01:00
Faustin
c715e729e7 checkbox colum on left for intervention lists 2022-11-19 22:58:04 +01:00
lvessiller
2d181f01be NEW rename MAIN_LIST_ALLOW_NOTES by MAIN_LIST_HIDE_NOTES 2022-10-17 11:37:09 +02:00
Laurent Destailleur
201b774d6d Clean code 2022-10-10 20:14:51 +02:00
Laurent Destailleur
8771dc197b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-12 10:32:50 +02:00
Laurent Destailleur
295b850ae8 Fix missing include 2022-09-11 22:25:03 +02:00
Laurent Destailleur
a11a33a804 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-11 22:21:18 +02:00
Alexandre SPANGARO
6b4bd6c09e FIX #21859 - Don't show html balise on list for private/public note 2022-09-09 15:56:17 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Frédéric FRANCE
9150f5102e Merge remote-tracking branch 'upstream/develop' into pr/grandoc/22009 2022-09-02 11:44:45 +02:00
Philippe GRAND
8568f66d42 update code 2022-08-31 22:29:00 +02:00
Frédéric France
e71692e745 fix php8 warnings 2022-08-31 22:02:31 +02:00
Laurent Destailleur
3da20beeb5 Fix warning 2022-07-28 18:06:37 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Laurent Destailleur
4040f65a33 Debug v16 2022-06-10 09:17:48 +02:00
Laurent Destailleur
324721ac1e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/card.php
	htdocs/core/tpl/list_print_total.tpl.php
	htdocs/fichinter/list.php
	htdocs/fourn/class/fournisseur.commande.class.php
2022-05-22 12:54:40 +02:00
IC-Ilies
1b6e0a9fc0 FIX#20886 : manage durations in list_print_total.tpl.php 2022-05-21 16:25:47 +02:00
Florian HENRY
ada81750c1 NEW: Add Customer Ref on Intervention 2022-05-17 12:53:50 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
Laurent Destailleur
c96e3bdddf PHP v8 compatibility 2022-04-30 19:50:20 +02:00
Francis Appels
7e44227df2 Cleanup 'confirm_createbills' 2022-04-25 14:28:57 +02:00
Laurent Destailleur
143660799b Clean code using dolGetFirstLineOfText() 2022-03-16 21:22:03 +01:00
BENKE Charlene
1c87c6fd5d Update list.php
first introduce à type of totalisation
2022-02-05 12:10:57 +01:00
BENKE Charlene
8d74b51009 fix : duration in hour and min (not in second)
use convertSecondToTime for totalise duration
2022-02-04 15:52:37 +01:00
Frédéric FRANCE
46c4f28478 fix multiple warnings 2021-10-22 22:15:59 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Frédéric FRANCE
6e1c4ed980 fix warnings 2021-06-24 20:30:11 +02:00