Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
129,526 Commits 36 Branches 189 Tags
4ad9e9b8288288cc5bfc69e4bcb2e4ab21f198df
Commit Graph

369 Commits

Author SHA1 Message Date
William Mead
108454c4f3 Fixed originid type. Updated contributor details. 2024-01-22 17:27:50 +01:00
Frédéric France
03e29c6960 fix param 2024-01-20 09:22:38 +01:00
MDW
bd002480ce Qual: Spelling htdocs/[d-k]* (#27427) 
Highlights:

- htdocs/install/doctemplates/websites/website_template-restaurant/containers/page249.tpl.php

  Potential functional change (fix) because toekn was changed to token:
   `<input type=hidden name=toekn`

- htdocs/install/upgrade2.php
  $filles changed to $children

- htdocs/intracommreport/class/intracommreport.class.php
  Local $enveloppe changed to $envelope.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-01-13 19:48:41 +01:00
Laurent Destailleur
2a4578ef68 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-11 13:48:15 +01:00
Laurent Destailleur
34f5c1e293 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-11 13:47:14 +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
Laurent Destailleur
b418bc9e1e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2024-01-10 15:14:11 +01:00
Frédéric FRANCE
7cf895b411 Update card.php 2024-01-09 20:52:43 +01:00
William Mead
1964a3e595 Added notification information on intervention done confirmation message 2024-01-09 15:09:07 +01:00
William Mead
8f7a4800ee Added notification information on intervention validated confirmation message 2024-01-09 14:49:20 +01:00
Laurent Destailleur
4501872f17 Clean code with rector 2 2024-01-05 04:33:58 +01:00
Laurent Destailleur
b28ae5d8d3 Clean code 2023-12-27 12:12:20 +01:00
Laurent Destailleur
a7125280bc Fix with php-cs-fixer 2023-12-04 12:12:12 +01:00
Laurent Destailleur
06736918de Fix warning 2023-11-27 12:33:07 +01:00
Laurent Destailleur
7785ae93a1 Fix php8.2 warnings 2023-11-27 11:41:05 +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
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
58194357ca FIX FICHINTER_DATE_WITHOUT_HOUR (hour must not be set). Close #23388 2023-10-16 14:57:24 +02:00
Laurent Destailleur
4f4ede2e32 Fix php8.2 warnings 2023-10-15 18:14:14 +02:00
Laurent Destailleur
0e7c5debed Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-10-13 16:38:51 +02:00
William Mead
2fd9a0708f Fix #26215 fichinter modify line PHP error (#26216) 
* FIX fichinter modify line

* Adjusted contributor line indent

---------

Co-authored-by: William Mead <william.mead@manchenumerique.fr>
 2023-10-13 16:14:00 +02:00
Laurent Destailleur
c32fe8dc5f QUAL: Use dol_clone with parameter 2 for ->oldcopy 2023-10-11 19:10:24 +02:00
William Mead
2568b6c63b Fixed intervention done confirmation popup 2023-10-06 14:10:06 +02:00
William Mead
b29a06a0a6 Cleaned code 2023-10-06 09:15:48 +02:00
William Mead
b3ce1af29d NEW Added notification on closed intervention 2023-10-05 12:11:39 +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
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
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
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
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
Maximilien Rozniecki
ef4000bb19 the problem persist, we need to do an array_merge to not lose the invisible etrafields since they are not send via GET/POST 2023-03-23 10:31:39 +01:00
Laurent Destailleur
dc2cb7fbb3 NEW Add dropdown button actions (example on Create button on project) 2023-03-18 14:10:23 +01:00
Laurent Destailleur
60fe730a48 Look and feel v18 2023-03-12 13:56:15 +01:00
Frédéric FRANCE
03e8ee0e6d use user->hasRight 2023-02-14 23:00:15 +01:00
Frédéric FRANCE
ae48571135 use user->hasRight 2023-02-14 22:56:12 +01:00
Laurent Destailleur
48161b8400 Debug v17. Bad param for selection of project 2023-01-17 13:50:23 +01:00
hystepik
0aee71a656 Fix : ficheinter cards and stat 2022-12-06 15:46:50 +01:00
Laurent Destailleur
2e1e6120ce Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-10-24 19:51:05 +02:00
Laurent Destailleur
a01e628187 Merge branch 'develop' into feature/intervention_ext_download 2022-10-24 19:48:19 +02:00
Laurent Destailleur
c22e97d7f3 Merge pull request #22645 from JavierNR/feature/intervention_signature 
NEW: Enable online signature for interventions
 2022-10-24 17:58:49 +02:00