Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
135,578 Commits 36 Branches 189 Tags
8e12d3fd17d61675b51c49b05c6a910a6ea1f3ed
Commit Graph

11042 Commits

Author SHA1 Message Date
Laurent Destailleur
504928aa90 Debug v18 - Fix status of user when expired 2023-08-12 17:04:38 +02:00
Frédéric FRANCE
4deeefe980 fix getentity 2023-08-12 06:09:22 +02:00
Laurent Destailleur
c5d6f3f5b0 Merge pull request #25398 from lamrani002/testMB 
NEW Upgrade in module builder in menu section
 2023-08-11 14:16:13 +02:00
Laurent Destailleur
18d013a6f7 NEW Merge the "Create ..." buttons on contract into one. 2023-08-11 13:18:43 +02:00
Laurent Destailleur
35e4565ccc Avoid duplicate feature with TICKET_LINK_TO_CONTRACT_WITH_HARDLINK 2023-08-11 12:58:23 +02:00
Laurent Destailleur
e91f0d88c8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-08-11 12:34:27 +02:00
Laurent Destailleur
39b53051d4 Merge pull request #25577 from defrance/develop-2 
NEW add Ticket tab on contract
 2023-08-11 12:33:14 +02:00
Alexandre SPANGARO
ffd68671b8 Merge branch 'develop' into 18a9 2023-08-11 06:10:13 +02:00
Laurent Destailleur
06bd68f252 Merge branch 'develop' into develop-2 2023-08-09 18:20:15 +02:00
Laurent Destailleur
4f63273e28 Clean code 2023-08-09 16:02:27 +02:00
Lamrani Abdel
d0dc3b019c fix problem for namedic 2023-08-09 13:43:44 +02:00
Lamrani Abdel
5a825f519b update functionnality for delete dict 2023-08-09 13:19:52 +02:00
am97
954c54ad3f Fix SQL syntax error (#25562) 
Single quotes are needed to indicate that 'project' and 'external' are strings, otherwise the requests fail
 2023-08-09 12:50:14 +02:00
lamrani abdelwadoud
2e8525933c Add new dictionary for modulebuilder (#25592) 
* product_card problem unexpected tocken

* new update for function generate_doc

* new function for create dictionnary

* add function for create new dictionary

* fix problem

* update function for building correct string

* optimize function and fix incoherences

* optimize function and fix incoherences

* Revert "optimize function and fix incoherences"

This reverts commit ecbd902a9f.
 2023-08-09 12:37:20 +02:00
Laurent Destailleur
664f507a0c Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-08 13:05:16 +02:00
Laurent Destailleur
eae4dbd3c3 Fix duration 2023-08-08 13:03:36 +02:00
Laurent Destailleur
e3e73d9096 Work on renaming libelle into label 2023-08-06 01:14:36 +02:00
Laurent Destailleur
fc94e39d58 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-05 12:40:47 +02:00
Laurent Destailleur
b47a640f0b Debug v18 2023-08-05 12:37:25 +02:00
Charlène Benke
37b13d97b5 Update contract.lib.php 2023-08-04 15:01:21 +02:00
Laurent Destailleur
b52c79dcfe Fix warnings 2023-08-04 04:37:10 +02:00
Laurent Destailleur
c6a1c5cfcd Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-04 04:31:22 +02:00
Laurent Destailleur
ff11a7442e Fix warnings 2023-08-04 04:28:45 +02:00
Laurent Destailleur
5ac5dce4cb Look and feel v19 2023-07-31 21:44:03 +02:00
Laurent Destailleur
6b0630561e Fix warnings 2023-07-30 18:58:11 +02:00
Laurent Destailleur
01e65bbad1 Fix warning 2023-07-30 18:58:04 +02:00
Laurent Destailleur
980923e4b2 Fix warnings 2023-07-30 18:47:40 +02:00
Laurent Destailleur
6748835cee Fix warning 2023-07-30 18:42:05 +02:00
Laurent Destailleur
2f8130d74a NEW Add tab Events/Agenda on recurring invoices 2023-07-29 21:02:52 +02:00
Laurent Destailleur
761565cabb Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-25 23:47:28 +02:00
onhairech
b920dfdbda qodana fix 4: missing returns (#25334) 
* qodana fix 4: missing returns

* Delete settings.json

* correcting the return  info function

* unreachable code fix

* return fix
 2023-07-25 23:29:34 +02:00
Laurent Destailleur
6a79459deb Fix phpcs 2023-07-24 19:00:56 +02:00
Laurent Destailleur
c15f773e19 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-07-23 21:53:14 +02:00
Laurent Destailleur
b06156536c Fix mb_strlen 2023-07-23 21:50:17 +02:00
mc2contributor
9119288795 Add missing argument (#25403) 2023-07-23 20:00:58 +02:00
Laurent Destailleur
d8815660c7 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-22 16:28:32 +02:00
Laurent Destailleur
1e443e060c Debug v18 2023-07-22 16:17:06 +02:00
Laurent Destailleur
09c6c06ecd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-07-21 14:48:50 +02:00
Laurent Destailleur
054cb4a6d1 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-07-21 14:44:22 +02:00
Laurent Destailleur
862c81494c Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-20 01:10:19 +02:00
Laurent Destailleur
5e41023862 Debug v18 2023-07-19 22:58:11 +02:00
Lamrani Abdel
94f5896d43 fix incoherences in update menu in relation to select permission 2023-07-19 11:57:13 +02:00
Laurent Destailleur
e9273d6183 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/receipt.php
 2023-07-19 04:19:15 +02:00
Laurent Destailleur
8f9ee9eb35 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 
Conflicts:
	htdocs/core/lib/project.lib.php
	htdocs/societe/class/societe.class.php
 2023-07-19 02:03:34 +02:00
Laurent Destailleur
6d64026b93 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-07-19 01:52:19 +02:00
Laurent Destailleur
b55be51b4f Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/lib/agenda.lib.php
 2023-07-19 01:50:18 +02:00
atm-gauthier
88a8bcdb22 FIX : We should always be able to filter on action type no matter if we can't read actions of others (#24462) 2023-07-16 12:14:18 +02:00
atm-steve
b307ecea40 FIX display project tasks list columns (#24557) 
* fix: display columns

* fix fix

* fix: IDE
 2023-07-16 12:02:14 +02:00
Lucas Marcouiller
f202bc62f3 Fix : modulebuilder security check (#25354) 
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
 2023-07-13 17:13:43 +02:00
Laurent Destailleur
c75761f780 FIX Add same security test whe nuploading files from API than from GUI 2023-07-12 22:56:27 +02:00