Commit Graph

4465 Commits

Author SHA1 Message Date
Laurent Destailleur
cf631563f9 Look and feel v21 2024-07-24 16:07:15 +02:00
Laurent Destailleur
5513b573b0 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-24 04:06:06 +02:00
PsyCrow
ce18dc1ad2 Add info in project overview tab for various payments (#30435)
Add the label of the payment in overview tab for project.
2024-07-23 19:29:43 +02:00
Laurent Destailleur
ff5c45b39e Fix css to allow to avoid behaviour change of v20 2024-07-23 09:39:53 +02:00
Laurent Destailleur
a39d55474f Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-18 02:44:35 +02:00
Laurent Destailleur
b303be54fd Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-18 02:41:28 +02:00
Laurent Destailleur
9d4951e85b Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-07-18 02:35:53 +02:00
Laurent Destailleur
f14833f856 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-07-18 02:33:03 +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
Frédéric FRANCE
6a77028b02 fix syntax error, fix phan (#30372)
* fix syntax error

* fix phpstan
2024-07-15 20:52:09 +02:00
Laurent Destailleur
bd57bcf617 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-15 19:52:31 +02:00
Laurent Destailleur
ac1704ec49 Clean menu for AI generation modes 2024-07-15 13:40:55 +02:00
Laurent Destailleur
d2f286fddb Fix css 2024-07-15 11:52:21 +02:00
Laurent Destailleur
ab6c02aa9e Fix css 2024-07-15 11:48:22 +02:00
Laurent Destailleur
0ece58dcd1 Fix css 2024-07-15 11:41:00 +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
Anthony Damhet
c1270ac2f5 Add llxHeader to projects (#30357)
* Add llxHeader to projects

* Correction llxHeader for compta/prelevement

* Add space after comma

* Add missing space

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-13 18:10:40 +02:00
Laurent Destailleur
a0e4cc9d00 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/projet/tasks/time.php
2024-07-13 17:49:14 +02:00
Laurent Destailleur
5661a381ee Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/projet/tasks/time.php
2024-07-13 17:47:55 +02:00
Florent Poinsaut
23eeabe476 FIX #30362 Fix an user with user->rights->projet->lire can see task
time from other user on all project (#30363)

Conflicts:
	htdocs/projet/tasks/time.php
2024-07-13 17:40:55 +02:00
Florent Poinsaut
5f5074b048 FIX #30362 Fix an user with user->rights->projet->lire can see task time from other user on all project (#30363) 2024-07-13 17:28:25 +02:00
Laurent Destailleur
7661b87f80 QUAL Removed inclusion of the file json.lib.php 2024-07-12 01:53:47 +02:00
Laurent Destailleur
147a8bfaee Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/categories/viewcat.php
	htdocs/contrat/card.php
	htdocs/contrat/list.php
	htdocs/eventorganization/conferenceorbooth_list.php
	htdocs/expedition/list.php
	htdocs/societe/card.php
2024-07-11 10:44:39 +02:00
Laurent Destailleur
3b98b16b35 NEW Add country in search of project 2024-07-11 10:10:39 +02:00
Alexandre SPANGARO
128769811c Add css bodylist on list (#30334)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-11 00:45:05 +02:00
Frédéric FRANCE
6601503edc Fix phpstan llxheader (#30328)
* fix phpstan for llxHeader

* fix phpstan for llxHeader

* fix phpstan for llxFooter
2024-07-09 19:28:09 +02:00
Laurent Destailleur
8a4f550d64 Debug v20 2024-07-09 17:33:27 +02:00
Alexandre SPANGARO
6e58d54475 NEW Project - Can upload a file with drag and drop (#30276)
* NEW Product/Service - Can upload a file with drag and drop

* NEW Project - Can upload a file with drag and drop
2024-07-06 02:57:22 +02:00
Vincent de Grandpré
b0cd32bf68 NEW Implementing Billable tasks on projects using new attribute "billable" (#30092)
* Implementing Billable task function on projects using new attribute in #30014

* added billable to Task->initAsSpecimen()

* default billable to 1 in initAsSpecimen

* set billable to 1 in ProjectTest::testTaskCreate

* Moving attribut usage in usage_bill_time condition of project

* PPDoc

* fusion

* pre-commit + typo

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-03 03:29:05 +02:00
Frédéric FRANCE
c6d61c03f9 fix phpstan (#30246) 2024-07-03 01:43:51 +02:00
Frédéric FRANCE
844f995c60 fix phpstan (#30246) 2024-07-03 01:33:55 +02:00
Laurent Destailleur
253fdba882 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-02 23:11:21 +02:00
Laurent Destailleur
331fb36f47 Debug v20 2024-07-02 18:52:26 +02:00
Laurent Destailleur
a75d6e6ffe Finished the groupby experimental into project list 2024-07-02 18:46:20 +02:00
Frédéric FRANCE
3da9e53b03 Project phpdoc (#30233)
* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc
2024-07-02 01:46:40 +02:00
Zephyriony
4170bd410c NEW Opacity for finished lines (#30219)
* Update list.php

* Update list.php

* Update list.php

* Update list.php

* Update list.php

* Update list.php

* Update list.php

* Update list.php

* Update list.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-01 14:17:44 +02:00
atm-jonathan
d654f90f91 return resprint hook (#30222) 2024-07-01 12:56:24 +02:00
Laurent Destailleur
d514e908f0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-07-01 01:30:55 +02:00
Laurent Destailleur
07c6e36a3a Fix for #30170 2024-07-01 01:22:04 +02:00
Laurent Destailleur
90918f0687 Fix fatal error 2024-07-01 00:42:46 +02:00
Alexandre SPANGARO
96afcaa476 Better comments (#30200)
* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* CI Missing language key

* Update eventorganization.lang

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-06-30 21:02:50 +02:00
Laurent Destailleur
675e761297 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/margin/tabs/productMargins.php
	htdocs/margin/tabs/thirdpartyMargins.php
2024-06-30 04:11:04 +02:00
Laurent Destailleur
db61320098 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/product/price.php
	htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
	htdocs/user/list.php
2024-06-30 04:05:46 +02:00
Laurent Destailleur
b2e288f8ec Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/menus/standard/eldy.lib.php
2024-06-30 03:53:16 +02:00
Laurent Destailleur
f64e4b4981 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-06-29 20:53:10 +02:00
Laurent Destailleur
bbbcf57756 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-29 19:25:59 +02:00
Frédéric FRANCE
f1302291de fix phan emailcollector (#30196)
* fix phan emailcollector

* fix phpstan

* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc
2024-06-29 18:57:43 +02:00
Laurent Destailleur
56f4127959 css 2024-06-29 13:56:21 +02:00