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
Laurent Destailleur
1104b95137
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
2024-06-27 13:47:27 +02:00
Laurent Destailleur
0a15655720
Debug v20
2024-06-27 10:41:55 +02:00
Laurent Destailleur
8f5b98be43
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
2024-06-25 13:50:27 +02:00
Laurent Destailleur
a2971da463
Debug v20
2024-06-25 13:49:55 +02:00
Laurent Destailleur
398b8b7166
Use tooltip to show explanation of info
2024-06-25 12:49:09 +02:00
Laurent Destailleur
4374ecebad
Fix CSRF = 3 for cancel and clone
2024-06-25 12:31:24 +02:00
Laurent Destailleur
db5ade973c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2024-06-25 11:18:31 +02:00
Laurent Destailleur
856b23ddcb
trans
2024-06-24 13:22:31 +02:00
Frédéric FRANCE
0f1ae42691
fix phan ( #30113 )
...
* fix phan
* Update project.class.php
* Update project.class.php
* try to fix
* try to fix
* try to fix
* try to fix
* try to fix
2024-06-22 15:36:10 +02:00
Laurent Destailleur
e92302a41b
Debug v20
2024-06-20 17:16:53 +02:00
Laurent Destailleur
c936c4b4b4
Look and feel v20
2024-06-19 02:58:06 +02:00
Frédéric FRANCE
a21af12652
fix phpstan ( #30043 )
...
* fix phpstan
* fix phpstan
* fix phpstan
* fix phpdoc
---------
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr >
2024-06-16 11:09:43 +02:00
Laurent Destailleur
44a980d527
Fix phpunit
2024-06-15 19:41:09 +02:00
Eric - CAP-REL
cbba014355
fk_product could be = -1 then line added is not linked to selected pr… ( #30013 )
...
* fk_product could be = -1 then line added is not linked to selected product
* more clear conditions
* idprod could be set if prev dropdown menu was used
2024-06-15 16:27:54 +02:00
Laurent Destailleur
7c6a4ea197
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2024-06-15 15:09:56 +02:00
Frédéric FRANCE
eecfb5fb43
fix phpstan ( #30032 )
2024-06-15 15:07:15 +02:00
Laurent Destailleur
d376a2a406
Fix look and feel v19
2024-06-14 19:39:26 +02:00
Frédéric FRANCE
1ff0e8a821
fix an old error ( #29850 )
...
* fix an old error
* fix OdfException is never thrown in the try block
* fix OdfException is never thrown in the try block
* fix Undefined array key "name"
* fix missing translation
* fix missing translation
* fix Undefined variable $lineid
* fix warnings
* fix upload dir
* fix phpcs
2024-06-08 16:59:40 +02:00
Laurent Destailleur
cbb458486b
Debug v20
2024-06-06 09:27:25 +02:00
Lucas Marcouiller
5b6bbb3479
Fix param after task merge time ( #29847 )
...
Co-authored-by: Hystepik <lmarcouiller@nltechno.com >
2024-06-05 14:55:24 +02:00
Frédéric FRANCE
6393f9f7c2
fix cti ( #29839 )
2024-06-04 19:27:00 +02:00
Lucas Marcouiller
678c76b80e
Fix merge time spent task ( #29834 )
...
* Fix time spent task
* Update task.class.php
---------
Co-authored-by: Hystepik <lmarcouiller@nltechno.com >
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr >
2024-06-04 14:46:01 +02:00
Laurent Destailleur
c00ffbcd66
Fix error in generic report
2024-06-03 22:43:09 +02:00
Laurent Destailleur
3f13d944f5
Clean code
2024-06-03 19:19:52 +02:00
Laurent Destailleur
eb4474dfa6
Fix vardump
2024-05-29 23:24:10 +02:00
Laurent Destailleur
386a40b4a6
Debug look and feel v20 - Fix groupby in kanban
2024-05-29 23:23:20 +02:00
Laurent Destailleur
48c5d9b0bc
Debug v20
2024-05-29 12:26:04 +02:00
Laurent Destailleur
e2e96d4d75
Debug v20
2024-05-29 01:10:56 +02:00
Laurent Destailleur
354f59a6b0
Debug v20
2024-05-29 00:56:56 +02:00
Laurent Destailleur
d723abc487
Debug v20
2024-05-28 23:52:33 +02:00
