2
0
forked from Wavyzz/dolibarr
Commit Graph

4087 Commits

Author SHA1 Message Date
Lucas Marcouiller
232800d776 NEW feature to merge 2 tasks (#29214)
* first push select not saved

* add working merge

* ass merge of contact for task

* fix typo

* add of merge timespent

* Fix integration error + use of good SelectTasks

* fix precommit

* Fix CI

* fix CI

* fix bad change

* fix to make merge only an update

* remove useless field update

* fix empty array

* fix CI

* fix unused code

---------

Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
2024-04-08 20:50:16 +02:00
Laurent Destailleur
b5de782c6b Fix use the good HTTP code 2024-04-07 14:59:25 +02:00
Laurent Destailleur
fd9475be03 Use same doc comment eveywhere. 2024-04-07 12:26:27 +02:00
Laurent Destailleur
38fb00489d PHPDoc 2024-04-05 13:44:59 +02:00
Jon Bendtsen
a5889ed5eb ref_ext is parameter 3 2024-04-04 23:04:57 +02:00
Jon Bendtsen
4c915da4d0 getByRefExt 2024-04-04 22:46:54 +02:00
Laurent Destailleur
dfc11d257f Merge pull request #29175 from JonBendtsen/project_update_single_array_option_element
allow updating project single Complementary Attribute
2024-04-04 19:51:32 +02:00
Laurent Destailleur
6ef81a05dc typo 2024-04-04 19:13:12 +02:00
Jon Bendtsen
7dc797c62b Merge branch 'develop' into project_update_single_array_option_element 2024-04-03 19:39:44 +02:00
Laurent Destailleur
2947287e3f Look and feel v20 2024-04-03 16:22:16 +02:00
Laurent Destailleur
ab093510fb Responsive 2024-04-03 15:40:24 +02:00
Laurent Destailleur
fffe74246c Fix all short tables must use the setup for the number of rows 2024-04-03 15:30:10 +02:00
Laurent Destailleur
8b96212c23 Merge branch 'develop' into project_update_single_array_option_element 2024-04-03 02:13:30 +02:00
MDW
e64e57716c Fix fatal (PHP8.X) type issue with abs, and amend dol_eval return type
# Fix fatal (PHP8.X) type issue with abs, and amend dol_eval return type

I got the following message:
`Fatal error: Uncaught TypeError: abs(): Argument #1 ($num) must be of type int|float, string given in D:\mdeweerd\workspace\dolibarr\htdocs\projet\list.php on line 233`

I examined the phan report and there was no mention of this because dol_eval was
said to return mixed.

In order to detect such cases, I amended the dol_eval return type to ensure to find
most of the locations where a cast is needed.
2024-04-02 22:52:52 +02:00
Laurent Destailleur
810b62528b Projects 2024-04-02 21:29:21 +02:00
Laurent Destailleur
29d2513d33 Merge branch 'develop' into project_update_single_array_option_element 2024-04-02 14:53:40 +02:00
Laurent Destailleur
7715513ac9 Some API HTTP return code were moved from 401 to 403 to better follow
REST specification.
2024-04-02 14:47:49 +02:00
Laurent Destailleur
a5465f3c97 Merge branch 'develop' into project_update_single_array_option_element 2024-04-02 13:53:53 +02:00
Laurent Destailleur
e72c8c1d53 Merge branch 'develop' into task_update_single_array_option_element 2024-04-02 13:37:44 +02:00
Laurent Destailleur
51f862ad28 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-04-02 13:21:00 +02:00
Laurent Destailleur
990216b13f NEW Api parameters are sanitized by the WAF, same code than GET/POST 2024-04-02 13:07:13 +02:00
Jon Bendtsen
862c215648 spaces after comma 2024-04-01 22:06:51 +02:00
Jon Bendtsen
4442c3fab8 NEW: API GET projects by REF and by email_msgid 2024-04-01 21:57:47 +02:00
Jon Bendtsen
f873f9aa65 will allow updating 1 task single Complementary Attribute without specifying complementary attributes that we don't want to change. Similar to # 29115 but just for a task 2024-04-01 11:35:57 +02:00
Jon Bendtsen
1084dfec2f will allow updating 1 project single Complementary Attribute without specifying complementary attributes that we don't want to change. Similar to # 29115 but just for a project 2024-04-01 11:29:03 +02:00
Charlène Benke
917ab9b454 totalarray must not reinit here
else we lose the setting on line 980
and have warning at the total list line
2024-03-31 14:49:43 +02:00
Frédéric France
7a7b1953ed fix phpstan 2024-03-28 20:34:33 +01:00
Frédéric France
3535623ffc fix phpstan 2024-03-28 20:27:56 +01:00
Laurent Destailleur
e73f79ca96 Qual: Remove unnecessary use of $_GET 2024-03-28 20:19:28 +01:00
Laurent Destailleur
54501bccc3 Merge pull request #29066 from mdeweerd/fix/dol_get_fiche_head
Fix arguments to dol_get_fiche_head and dol_get_fiche_end
2024-03-28 14:16:45 +01:00
Laurent Destailleur
7535a884ac Merge pull request #29069 from mdeweerd/fix/price
Fix arguments to price()
2024-03-28 13:07:25 +01:00
Laurent Destailleur
a2ec7400eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-03-28 10:55:44 +01:00
Laurent Destailleur
1ce34cd5f3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-03-28 09:55:57 +01:00
Laurent Destailleur
3867f00f90 Debug v20 2024-03-28 09:28:58 +01:00
Laurent Destailleur
3acb98b160 NEW Show the profit per attendee on events 2024-03-27 19:06:06 +01:00
Laurent Destailleur
f61bd8c347 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/menus/edit.php
2024-03-27 18:04:11 +01:00
Laurent Destailleur
f5c16bd31a CSS 2024-03-27 17:58:35 +01:00
MDW
47ef0645cf Fix arguments to dol_get_fiche_head 2024-03-27 10:22:58 +01:00
MDW
7b321f8ae5 Fix arguments to price() 2024-03-27 10:21:27 +01:00
Laurent Destailleur
50aadc43f9 NEW Upgrade jsChantImproved to 2.8.10 2024-03-23 17:18:11 +01:00
Laurent Destailleur
51a3641105 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/bom/tpl/objectline_create.tpl.php
	htdocs/compta/bank/releve.php
	htdocs/core/class/html.formsetup.class.php
	htdocs/takepos/freezone.php
2024-03-22 02:35:37 +01:00
Laurent Destailleur
7b0177a84d Move to getDolGlobalString 2024-03-22 00:37:56 +01:00
Laurent Destailleur
60c626dbe4 Merge branch 'develop' into fix/PhanTypePossiblyInvalidDimOffset 2024-03-21 12:53:59 +01:00
MDW
aeefca7e7e Fix $arrayfields typing lost by dol_sort_array() by forcing the type 2024-03-20 23:29:48 +01:00
MDW
351c153102 Fix null return by initialising return value and generate error on 0 2024-03-20 21:58:48 +01:00
MDW
ba4a482c96 Fix PhanTypeMismatchReturnNullable by forcing type for phan 2024-03-20 21:58:41 +01:00
MDW
d245dab56b Fix PhanTypeMismatchReturnNullable by setting variable 2024-03-20 21:58:36 +01:00
MDW
1d97c989d0 Fix arg to preg_replace() with cast 2024-03-20 04:09:57 +01:00
MDW
0969343d15 Fix arg to strcmp with cast 2024-03-20 04:09:56 +01:00
MDW
12e3a5cb4a Fix arg type to preg_replace() with cast 2024-03-20 04:09:55 +01:00