Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
124,605 Commits 35 Branches 179 Tags 1.7 GiB
1406715ce5
Commit Graph

1732 Commits

Author SHA1 Message Date
Laurent Destailleur
9874d008aa Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-02-22 00:16:59 +01:00
Laurent Destailleur
88da45d9dd Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-02-22 00:16:14 +01:00
Laurent Destailleur
a76eafa0d4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-02-22 00:15:35 +01:00
Laurent Destailleur
8c2a910a94 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-02-22 00:13:59 +01:00
Eric
6defdcd018
better fix with this->entity thanks to regis (#28331) 
* better fix with this->entity thanks to regis

* Update fichinter.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-02-21 17:06:05 +01:00
Eric
75ad2e82fd
fix entity if interventions are shared between entities (#28317) 2024-02-20 23:01:16 +01:00
HENRY Florian
897475f186
fix: fix restrictedAera on agenda tab for intervention (#28038) 2024-02-07 18:49:16 +01:00
Laurent Destailleur
a3a62570a9 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-01-11 13:45:26 +01:00
Laurent Destailleur
64fb9d0db7 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-01-11 13:45:16 +01:00
Frédéric FRANCE
893538d851
fix #27313 (#27325) 
* fix #27313

* Update fichinter.class.php
 2024-01-10 16:57:30 +01:00
William Mead
8f7a4800ee Added notification information on intervention validated confirmation message 2024-01-09 14:49:20 +01:00
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
Regis Houssin
70e01178a9 FIX uniformization to use "intervention" 2023-12-18 09:27:52 +01:00
Laurent Destailleur
a257dcfa48 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-23 18:48:52 +01:00
William Mead
02eadb29fc
FIX #25458 intervention localizations (backport v17) (#26757) 
* Fix reopen button localization. Added contributor details.

* Added EN done localization

* Added FR done localization

---------

Co-authored-by: William Mead <william.mead@manchenumerique.fr>
 2023-11-20 20:19:43 +01:00
Laurent Destailleur
127de7e7d8 FIX On object validation, ecm index are not updated for uploaded files 2023-11-01 16:17:54 +01:00
Laurent Destailleur
1be3570bdf Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-24 19:27:39 +02:00
Lucas Marcouiller
2dc5419145
Fix #26337 updateline fatal error on updateline (#26341) 
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
 2023-10-24 13:12:59 +02: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
310832a95b Debug v18 2023-08-05 13:44:49 +02:00
Laurent Destailleur
e0d4a5160e Fix case 2023-08-04 10:57:55 +02:00
Laurent Destailleur
0c19ac1fcc FIX #25524 2023-08-01 15:22:32 +02:00
Laurent Destailleur
470cad6335 Debug v18 2023-07-10 01:27:21 +02:00
Laurent Destailleur
a5d5847e04 Clean code 2023-06-29 11:20:19 +02:00
Laurent Destailleur
ef64e1dcfc Debug v18 2023-06-28 11:50:28 +02:00
Hystepik
e551005992 add secure !empty() 2023-06-27 14:48:32 +02:00
Hystepik
498daacf51 Fix #25195 : mysql fatal error on ficheinterstat.class.php 2023-06-27 14:47:57 +02:00
Frédéric FRANCE
740ac26277 use user hasRight 2023-06-14 19:54:16 +02:00
Frédéric France
a4bcf0eeaf use user hasRight 2023-06-13 20:47:33 +02:00
Frédéric France
0cb70110eb use user hasRight 2023-06-12 20:10:42 +02:00
Frédéric France
5a018d715d use user hasRight 2023-06-06 00:05:02 +02:00
Laurent Destailleur
fe9521b6b2 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-21 17:34:34 +02:00
Laurent Destailleur
421f7ecff4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-05-21 11:36:42 +02:00
Laurent Destailleur
6350df54e8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-05-21 11:22:36 +02:00
Noé Courtier
0531f9a853 FIX: Missing error message display on insertExtrafields() 2023-05-17 10:56:15 +02:00
Laurent Destailleur
5dd3f57a1e Debug v18 2023-05-11 13:11:21 +02:00
Laurent Destailleur
c4ea0c7d35 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-04 21:43:37 +02:00
Laurent Destailleur
077c3312ce FIX Update hour of intervention line 2023-05-04 20:15:10 +02:00
Laurent Destailleur
f61e79dc55 Fix missing return 2023-05-02 05:08:19 +02:00
Laurent Destailleur
582f13c81b
Merge pull request #24518 from cmfpmatik/patch-4 
NEW : Update card.php fichinter - Total duration in hours
 2023-05-01 16:41:04 +02:00
Laurent Destailleur
4028b5d568 Clean code 2023-04-29 13:13:12 +02:00
Laurent Destailleur
be835d63ed
Merge pull request #24635 from VMR-Global-Solutions/develop 
API add / fix filter on extrafields in index()
 2023-04-28 20:02:09 +02:00
Laurent Destailleur
e74c50aa8a Clean code 2023-04-28 16:05:25 +02:00
VMR Global Solutions
926aa6fec7
API add / fix filter on extrafields in index() 
Add / change in api_xxx.class.php files the ability to filter on extrafields when missing in the public functions index()
by changing the SQL query with the pattern 
" FROM ".MAIN_DB_PREFIX"xxxx AS t LEFT JOIN ".MAIN_DB_PREFIX."xxxx_extrafields AS ef ON (ef.fk_object = t.rowid)
 2023-04-28 09:31:33 +02:00
Laurent Destailleur
f44c97d3c6 Code is using the Universal Filter Syntax 2023-04-27 22:12:23 +02:00
Oarces DEV
8776c6dcd9
Update card.php 2023-04-19 00:57:32 +02:00
Frédéric FRANCE
fa849696fb use isModEnabled 2023-04-18 20:16:02 +02:00
Oarces DEV
f9ed6ff4f3
Update card.php 
This code generates two rows of a table to display the total duration of an employee, one in time format (DD HH:MM) and the other in hour format (HH).

The first row (original code) displays the title "TotalDurationTime" using the "trans" method of the $langs object to translate the string. The total time is converted to HH:MM:SS format using the "convertSecondToTime" function, which takes into account the daily work time duration specified in the global variable $conf->global->MAIN_DURATION_OF_WORKDAY.

The second row displays the title "TotalDurationHour" using the "trans" method of the $langs object to translate the string. The total duration is converted to hours using the "convertDurationtoHour" function, specifying "s" as the time unit (seconds).
 2023-04-13 16:54:26 +02:00