lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
120,568 Commits 43 Branches 150 Tags 886 MiB
8776c6dcd9
Commit Graph

120568 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oarces DEV
8776c6dcd9
Update card.php 2023-04-19 00:57:32 +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
Laurent Destailleur
cc17467f3b Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-04-13 15:06:15 +02:00
Laurent Destailleur
4c51e35adc FIX Bad deletion of email when there is several emails processed 2023-04-13 15:00:34 +02:00
Laurent Destailleur
96cb5fac9c Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-04-13 13:08:59 +02:00
Laurent Destailleur
4fc8b40b71 Fix too verbose 2023-04-13 13:06:09 +02:00
Laurent Destailleur
fbe8e2731d Fix escapment 2023-04-13 12:58:06 +02:00
Laurent Destailleur
4fe73e1fc3 Fix duplicate defined 2023-04-13 10:41:27 +02:00
Laurent Destailleur
845f888caa Add note 2023-04-13 10:40:27 +02:00
Laurent Destailleur
9821833d0d Clean code 2023-04-12 18:18:55 +02:00
Laurent Destailleur
c510b7d4df Add hidden search parameter search_current_entity 2023-04-12 18:16:14 +02:00
Laurent Destailleur
778093f382 Log 2023-04-12 16:45:32 +02:00
Laurent Destailleur
949e288ce0 Fix search on not with imapv2 2023-04-12 16:01:07 +02:00
Laurent Destailleur
24fdec736b Fix missing escape html 2023-04-12 14:53:54 +02:00
Laurent Destailleur
b577457c86 css 2023-04-12 14:50:19 +02:00
Laurent Destailleur
0d8d2528b0 Clean code 2023-04-12 06:08:06 +02:00
Laurent Destailleur
8e63baeeab Debug v18 2023-04-12 04:50:40 +02:00
Laurent Destailleur
28c625dc6b NEW Show main currency in company info user tooltip 2023-04-12 03:38:25 +02:00
Laurent Destailleur
bb0d7c59e6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-04-12 00:19:17 +02:00
Laurent Destailleur
c552633095 Log 2023-04-12 00:13:06 +02:00
Laurent Destailleur
bc711b0504 FIX Deployment of external module failed with copy dir error. 2023-04-11 22:20:54 +02:00
Laurent Destailleur
a8cd44cafc Clean code 2023-04-11 22:17:15 +02:00
Laurent Destailleur
45d79232d2 Clean code 2023-04-11 19:36:19 +02:00
Laurent Destailleur
9ffc86a872 Remove warning 8.2 2023-04-11 18:49:15 +02:00
Laurent Destailleur
66923ccf8c Code comment 2023-04-11 18:47:54 +02:00
Laurent Destailleur
5f1503d7ea Log 2023-04-11 18:05:47 +02:00
Laurent Destailleur
1b19a30386 Debug email collector 2023-04-11 18:00:46 +02:00
Laurent Destailleur
ce8a8c617c Fix Move of message with PHP-IMAP, Fix substitution for fetch thirdparty 
Fix php8 compatibility
 2023-04-11 17:24:19 +02:00
Laurent Destailleur
c14471e419 css 2023-04-11 15:39:38 +02:00
Laurent Destailleur
a1e6fe7f50 Revert "Try fix MS OAuth2 Imap (from feedback at dolibarr.org/forum/t/emailcollectors-with-microsoft-365-oauth2)" 
This reverts commit 976c2d76f2.
 2023-04-11 10:34:03 +02:00
Laurent Destailleur
0f58368d5d Fix do imap expunge only if no error 2023-04-11 10:13:15 +02:00
Laurent Destailleur
84a81fde36 Debug v18 2023-04-10 19:39:56 +02:00
Laurent Destailleur
1964a020aa Look and feel v18 2023-04-10 19:35:58 +02:00
Laurent Destailleur
6d18cdb062 First test with PHP 8.2 2023-04-10 19:22:38 +02:00
Laurent Destailleur
8747cc1423 Fix phpunit 2023-04-10 19:17:37 +02:00
Laurent Destailleur
f6901171e9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-04-10 19:13:56 +02:00
Laurent Destailleur
5184f7c168 css 2023-04-10 19:13:41 +02:00
Laurent Destailleur
e629f07f17
Merge pull request #22892 from OPEN-DSI/14.0_fix_update_extrafields_multiselect_type 
FIX: Set extrafield value of multiselect type
 2023-04-10 19:11:25 +02:00
Laurent Destailleur
18b78d28ab Clean content of column "Already shipped into other shipment" 2023-04-10 18:56:33 +02:00
Laurent Destailleur
2958635f14 Merge branch 'altairisfr-warehouse_tags_in_reassortlot' into develop 2023-04-10 17:54:40 +02:00
Laurent Destailleur
edf766ad66 Merge branch 'warehouse_tags_in_reassortlot' of 
https://github.com/altairisfr/dolibarr into
altairisfr-warehouse_tags_in_reassortlot
 2023-04-10 17:54:17 +02:00
Laurent Destailleur
ab037cb5e9 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-04-10 17:15:26 +02:00
Laurent Destailleur
3e372602d8 Trans 2023-04-10 17:07:20 +02:00
Laurent Destailleur
6914e2bb2a NEW Can receive more than qty ordered on reception 2023-04-10 16:58:38 +02:00
Laurent Destailleur
565057700b Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-04-10 16:44:59 +02:00
Laurent Destailleur
9a6bfd003d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-04-10 15:58:50 +02:00
Laurent Destailleur
90bca8b4d7 NEW Can go back to draft on shipment when stock change not on validate 2023-04-10 15:55:58 +02:00
Laurent Destailleur
8ba802ed5d Fix when reverting a shipment validation or closing and stock empty 2023-04-10 15:34:13 +02:00
Laurent Destailleur
f57dfd14c3 Fix label of warehouse no more visible 2023-04-10 15:00:46 +02:00
Laurent Destailleur
f26b5b58c9 Fix error management 2023-04-10 14:27:39 +02:00