Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
119,231 Commits 36 Branches 189 Tags
8b7eaf360e58693a9365544cb1520f28ced7e626
Commit Graph

3567 Commits

Author SHA1 Message Date
Shanty
e7e96f650a FIX #30768 allocate the correct invoice_line_id to the element timespent (#30769) 2024-08-27 03:02:43 +02:00
Laurent Destailleur
6c7bc18ae1 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-07-18 02:32:25 +02:00
Laurent Destailleur
193faf6813 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-07-18 02:30:50 +02:00
Laurent Destailleur
609b842e65 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-07-15 00:46:20 +02:00
MaximilienR-easya
eca8735e22 Fix les lien de téléchargement de facture fournisseur sur la page vue d'ensemble des projets (#30349) 2024-07-13 18:13:32 +02:00
Laurent Destailleur
07dedd3d2c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-04-24 21:06:46 +02:00
Laurent Destailleur
8d5dd565a6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-04-24 21:05:22 +02:00
Laurent Destailleur
7259195caf Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-04-24 21:04:48 +02:00
Laurent Destailleur
3723ae025f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2024-04-24 21:01:44 +02:00
Laurent Destailleur
2d971f3a05 Fix regression 2024-04-24 21:00:38 +02:00
Eric
c8ef530d52 note_private and note_public was forgotten too (#29440) 
* note_private and note_public was forgotten

* sql error missing comma

* sql error missing comma for rang=
 2024-04-24 15:11:27 +02:00
Laurent Destailleur
79353a6cbb Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-04-22 14:17:06 +02:00
Laurent Destailleur
98fc0033f5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-04-22 14:16:37 +02:00
Laurent Destailleur
8e0369440f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-04-22 14:16:18 +02:00
Laurent Destailleur
2768d80b9b FIX Regression #29340 2024-04-14 03:15:49 +02:00
Laurent Destailleur
459ff72732 FIX Regression #29340 2024-04-14 02:56:17 +02:00
Eric
2a93168d48 object tasks: priority is fetch but not updated and others... (#29340) 
* priority is fetch but not updated and others...

* insert too
 2024-04-14 00:52:01 +02:00
Laurent Destailleur
a5977e75ce Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-12-14 10:58:46 +01:00
Laurent Destailleur
a534c8dbdb Fix phpcs 2023-12-14 10:56:25 +01:00
atm-lena
ddf960e1c4 Add contact to project and tasks : formconfirm get url too long 2023-12-13 14:32:58 +01:00
Regis Houssin
d91d1838c7 FIX missing project entity filter (Issue #26243) (#26247) 2023-10-20 03:20:06 +02:00
Laurent Destailleur
3a84d84e65 Fix phpcs 2023-09-04 19:47:38 +02:00
Andrea Volani
4de001b43c No need to enforce check on param 'htmlname' 2023-09-04 09:40:53 +02:00
Andrea Volani
6769cf29d7 Merge branch '17.0' of https://github.com/avolani/dolibarr into 17.0 2023-09-04 09:13:42 +02:00
Andrea Volani
07d821b52c Return correct content type based on the call used. 2023-09-04 09:11:57 +02:00
avolani
c2e292d1d4 Return right content type 
Revert content type to html (no json here, ajax calls fails)
 2023-08-30 08:34:09 +02:00
John BOTELLA
6388ddeb6f Fix column display (#25490) 2023-07-27 17:55:34 +02:00
Laurent Destailleur
63f112aea0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/compta/bank/bankentries_list.php
	htdocs/product/card.php
	htdocs/projet/activity/perday.php
 2023-07-19 01:46:22 +02:00
Frédéric FRANCE
810a2ec650 fix no various payment in project overview 
test was inverted here edf79382bf
 2023-07-05 09:54:45 +02:00
Frédéric FRANCE
3a0bcfa58f fix tooltip in element project 
if $margin = 0 then $margin == 'add' is true
do not compare int with string
 2023-06-27 11:14:06 +02:00
Laurent Destailleur
00431c1ece Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-06-16 01:09:56 +02:00
Laurent Destailleur
2fe9e24961 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-06-16 00:56:43 +02:00
Laurent Destailleur
0d46edd121 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-06-16 00:45:37 +02:00
Maxime Kohlhaas
c7304271fa Fix #23806 use dictionary position to display contact type list 2023-06-11 00:42:29 +02:00
Laurent Destailleur
c76d7c0c19 Merge pull request #24938 from FHenry/17_fix_display_project_bugdet_field 
fix: display budget field on load project
 2023-06-09 09:36:56 +02:00
Florian HENRY
59496f1066 review: always display budget field and fix bad quote 2023-06-08 23:32:59 +02:00
Laurent Destailleur
60b5280d85 FIX #24918 2023-06-04 15:26:52 +02:00
Laurent Destailleur
7f9c34a935 Fix more complete than #24938 2023-06-04 02:33:53 +02:00
Florian HENRY
57defe4382 fix: display budget field on load 2023-06-01 17:02:10 +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
Laurent Destailleur
39da668060 Merge pull request #24739 from noec764/15_FIX_Tasks_event_not_displayed 
FIX: Task events not displayed
 2023-05-16 22:57:35 +02:00
Laurent Destailleur
9743bbde60 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-05-16 19:46:09 +02:00
Laurent Destailleur
7e6666038c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-05-16 19:43:23 +02:00
Laurent Destailleur
8def870558 Merge pull request #24751 from atm-jpb/fix_update_date_on_task_in_tab_consummed_time 
FIX : add a test for updating date on task update in tab time consummed pro…
 2023-05-12 19:11:00 +02:00
jpb
b5c0fda8a9 add a test for updating date on task update in tab time consummed project. 2023-05-12 15:00:48 +02:00
Laurent Destailleur
607fb89b38 Clean code 2023-05-12 14:52:47 +02:00
Laurent Destailleur
1d22be092d Fix lang trans 2023-05-12 14:51:22 +02:00
Laurent Destailleur
ca21aef394 Fix typo 2023-05-12 14:28:52 +02:00
Noé Courtier
07bec30c32 FIX: Task events not displayed 2023-05-11 11:10:33 +02:00