Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 03:28:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
143,484 Commits 36 Branches 190 Tags
a90f0863de1a619a67ca19c20ed4484f94ece834
Commit Graph

1196 Commits

Author SHA1 Message Date
Laurent Destailleur
75103c251b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2024-04-24 21:10:06 +02:00
Laurent Destailleur
090d079641 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-04-24 21:08:47 +02:00
Laurent Destailleur
0693fa9149 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-04-24 21:08:18 +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
Can Arslan
a45b62b2d6 FIX: duplicate error check (#29433) 
we are checking if there is an error on previous line
 2024-04-24 15:17:44 +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
d4b7332c76 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-22 14:24:14 +02:00
Laurent Destailleur
6303bceecd Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-04-22 14:19:59 +02:00
Laurent Destailleur
c454729f90 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-04-22 14:19:30 +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
0a3f66c6c4 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/tools/codespell/codespell-ignore.txt
	htdocs/admin/system/security.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/product/fournisseurs.php
 2024-04-11 22:57:43 +02:00
Can Arslan
e5da8f8736 FIX: wrong array key (#29317) 
Array key is 'moreinpopup' (set on line 1388)
 2024-04-11 19:14:26 +02:00
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
Laurent Destailleur
8b96212c23 Merge branch 'develop' into project_update_single_array_option_element 2024-04-03 02:13:30 +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
Laurent Destailleur
a2ec7400eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2024-03-28 10:55:44 +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
f4330a11fe Fix PHPdoc, casts for correct type to strcmp 2024-03-20 04:08:24 +01:00
MDW
10b260a31d Fix PhanTypeSuspiciousStringExpression 2024-03-19 02:44:02 +01:00
MDW
18600215a1 Fix PhanTypeSuspiciousStringExpression 2024-03-19 02:43:51 +01:00
Laurent Destailleur
6b1f490ee1 Merge branch 'develop' into phpstanphpstan 2024-03-19 02:05:42 +01:00
MDW
fd9d48faac Fix phpstan CommonObject->fields - notnull is optional field 2024-03-19 00:32:00 +01:00