lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
121,269 Commits 43 Branches 150 Tags 886 MiB
add_rest_api_region
Commit Graph

929 Commits

Author SHA1 Message Date
Laurent Destailleur
c436ef36b6
Merge pull request #22698 from Hystepik/develop#2 
Fix : php 8.1 warnings
 2022-11-01 22:05:39 +01:00
Laurent Destailleur
41a07f5e7d Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-29 12:51:51 +02:00
Laurent Destailleur
8a599ec610 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-29 12:47:36 +02:00
Laurent Destailleur
c67f94ca4b Merge 2022-10-29 12:46:22 +02:00
lmarcouiller
bbebdbb840 Fix php 8.1 warnings 2022-10-28 15:48:46 +02:00
Laurent Destailleur
81813225aa Look and feel v17 2022-10-24 01:25:50 +02:00
Laurent Destailleur
0f8d87da3b Clean code 2022-10-23 21:25:52 +02:00
Laurent Destailleur
1d21d73400 NEW Add date event (!= date project) and location on event organization 2022-10-21 13:19:21 +02:00
stickler-ci
71bae4f94b Fixing style errors. 2022-10-18 09:43:55 +00:00
jpb
6050f60704 add loadRoleMode on getlinearray 2022-10-18 11:36:17 +02:00
Laurent Destailleur
4b2c4d2df3 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-15 18:13:27 +02:00
Laurent Destailleur
094c2c3027 Fix condition on a field 2022-09-15 01:02:49 +02:00
Laurent Destailleur
767897595b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-10 02:46:10 +02:00
Laurent Destailleur
860d0ebe08 FIX #22164 2022-09-10 01:16:56 +02:00
lmarcouiller
86d777009e fix : scrutinaizer report 2022-09-09 11:09:53 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
lmarcouiller
db6d345e54 Fix #21810 : Broken statistics in project module 2022-08-31 15:31:00 +02:00
Laurent Destailleur
50d2f478fe
Merge pull request #21985 from Hystepik/develop#6 
Fix #21810 : Broken statistics in project module
 2022-08-31 15:07:33 +02:00
Julien Nicolas
c666c2cb89
Bugfix project stats when user has no project 
In case of no project assigned to user, stats were using all projects
 2022-08-30 12:02:53 +02:00
lmarcouiller
6e31609b14 Fix #21810 : Broken statistics in project module 2022-08-30 11:31:20 +02:00
stickler-ci
e7242788b9 Fixing style errors. 2022-08-02 09:00:15 +00:00
Gauthier PC portable 024
da196b868c NEW : conf TIMESPENT_ALWAYS_UPDATE_THM, when it's on we always check current thm of user to update it in task time line 2022-08-02 10:49:34 +02:00
Laurent Destailleur
b6a6dd91d8 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-07-28 18:52:44 +02:00
Laurent Destailleur
3da20beeb5 Fix warning 2022-07-28 18:06:37 +02:00
Laurent Destailleur
5903a9f87f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-07-26 12:24:24 +02:00
Laurent Destailleur
3eedf18344 Debug v16 2022-07-26 11:53:00 +02:00
Laurent Destailleur
da03175c07
Merge branch 'develop' into dev_19763 2022-07-07 23:06:22 +02:00
Frédéric France
b46ede5eae fix deprecated in project 2022-06-22 13:50:54 +02:00
HENRY Florian
770abb73f6
Merge branch 'Dolibarr:develop' into dev_19763 2022-06-18 11:54:44 +02:00
Laurent Destailleur
3481a4652a
Merge pull request #21264 from fboitel/fboitel-dev-scrutinizer-009 
BUG FIX Attribute datee doesn't exist on class Task
 2022-06-17 14:50:11 +02:00
Faustin
aa2b96fb48 Added deprecated attribute datee in class Task 2022-06-15 14:10:21 +02:00
stickler-ci
73977f8a84 Fixing style errors. 2022-06-15 12:09:40 +00:00
Faustin
e5ec06ab53 Added deprecated attribute datee in class Task 2022-06-15 14:09:00 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Faustin
f247bda226 Attribute datee doesn't exist on class Task 2022-06-14 10:54:12 +02:00
BENKE Charlene
b176d1a59d
not my best day 2022-06-09 23:17:29 +02:00
BENKE Charlene
4d327dcc18
datee and dateo not filled 
now we user date_end and date_start
 2022-06-08 17:00:04 +02:00
lmarcouiller
2a89e396fe Fix #20878 : improper use of dol_move 2022-06-01 15:17:19 +02:00
Laurent Destailleur
b43159db6d
Merge branch 'develop' into dev_19763 2022-05-24 22:07:50 +02:00
Laurent Destailleur
4c10c04f9f
Merge pull request #20495 from atm-john/new_fix_regression_select_extrafield_search 
FIX : regression select extrafield search + fix function name
 2022-05-24 21:55:33 +02:00
Laurent Destailleur
c3c29393c1 Look and feel v16 2022-05-16 18:00:59 +02:00
Laurent Destailleur
c3673bfc3c NEW A public form for to send a message and create a lead is available 2022-05-16 13:05:17 +02:00
Laurent Destailleur
ac60aa4711 NEW Add filter "opportunity status" on statistics of projects. 2022-05-16 10:45:42 +02:00
Florian HENRY
b9d78da4f6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-05-13 09:09:31 +02:00
Laurent Destailleur
dc6f90c4a7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-12 10:38:26 +02:00
Laurent Destailleur
88a9b8c201 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-12 10:37:08 +02:00
kamel
aee6f408b2 FIX: Set datec when add time spent on a project task 2022-05-11 09:30:39 +02:00
Florian HENRY
54d6916a20 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-05-11 08:26:44 +02:00
Laurent Destailleur
bb6f73136a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2022-05-06 12:46:26 +02:00
Laurent Destailleur
d76e7224d9 NEW Can set the max number of attendees for an organized event 2022-05-04 01:53:45 +02:00
John BOTELLA
7d3030aa8e Fix fatal error for usage in tpl 2022-05-03 12:31:30 +02:00
Florian HENRY
c951e681c2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-04-13 09:31:07 +02:00
ATM john
c1d9ea95dc fix function name 2022-03-30 12:16:17 +02:00
Laurent Destailleur
63d9f69732 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2022-03-29 15:55:47 +02:00
Laurent Destailleur
1251e80963 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/index.php
	htdocs/commande/list.php
	htdocs/langs/en_US/errors.lang
	htdocs/projet/class/task.class.php
 2022-03-29 15:10:11 +02:00
Laurent Destailleur
5108240ed5
Merge pull request #20456 from hregis/fix_mutlicompany_sharings_compatibility 
FIX multicompany sharings compatibility
 2022-03-29 13:56:43 +02:00
kamel
d43b180115 FIX - Move delete task time trigger position 2022-03-29 10:26:38 +02:00
Regis Houssin
4479ba8015 FIX missing translation keys 2022-03-26 08:32:20 +01:00
Florian HENRY
6774f0e571 new: entities is now updated on project update method 2022-03-25 11:53:27 +01:00
Florian HENRY
df5c427d0d Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-03-04 08:41:04 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
 2022-03-01 16:48:29 +01:00
Laurent Destailleur
2a48dd349e Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5 2022-03-01 16:38:06 +01:00
Frédéric FRANCE
a613553f37
Merge branch 'hookgetnomurl' into patch-1 2022-02-15 18:44:06 +01:00
BENKE Charlene
5f3c81daee FIX if we have PRODUCT_USE_UNITS, task fail 
we need 	public function getLabelOfUnit($type = 'long') fonction or printlineOriginLine fail
 2022-02-04 15:35:03 +01:00
Laurent Destailleur
3884c7b25f
Merge pull request #19894 from defrance/patch-176 
FIX if we have PRODUCT_USE_UNITS, task fail
 2022-02-04 15:32:24 +01:00
stickler-ci
a8344d9059 Fixing style errors. 2022-01-28 22:03:08 +00:00
mschamp
a8dd73d007 FIX #19294 implement detailed timespent in task of project API 2022-01-28 22:59:32 +01:00
Laurent Destailleur
6783ec80be
Try a change on a file to trigger travis 2022-01-26 14:17:32 +01:00
Christian Foellmann
15346d1c4a getTasksArray() fetch_optionals to populate ExtraFields 2022-01-25 09:17:30 +01:00
Florian HENRY
3f811d37f1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-01-24 23:23:43 +01:00
BENKE Charlene
82b14caa13
FIX if we have PRODUCT_USE_UNITS, task fail 
we need 	public function getLabelOfUnit($type = 'long') fonction or printlineOriginLine fail
 2022-01-20 17:06:03 +01:00
Florian HENRY
5329028d6a Start feature 2022-01-07 12:17:39 +01:00
Florian HENRY
61fc81732c fix: #19749 2022-01-07 11:29:43 +01:00
John BOTELLA
33ea8e850b Remove not defined param 2021-12-28 19:47:58 +01:00
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +01:00
Frédéric FRANCE
dc3bfcfb87
can modify tooltip by reference 2021-11-22 19:57:26 +01:00
Laurent Destailleur
0017c15974 Debug v15 2021-10-30 17:19:46 +02:00
Frédéric FRANCE
cc374e9eb1
fix warnings in ticket list 2021-10-24 10:02:12 +02:00
Frédéric FRANCE
46c4f28478
fix multiple warnings 2021-10-22 22:15:59 +02:00
Laurent Destailleur
6c870bb3d1
Merge pull request #19059 from FHenry/fix_introduced_scrutinizer 
fix: scrutinizer
 2021-10-21 22:52:20 +02:00
Florian HENRY
7970f4ba5c fix scrutinzer 2021-10-21 22:24:35 +02:00
Florian HENRY
24cc74cd3a fix scrutinizer 2021-10-21 19:00:48 +02:00
Laurent Destailleur
c896c05464
Merge pull request #18989 from FHenry/dev_18986 
NEW: Add budget field into task #18986
 2021-10-16 21:16:01 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Florian HENRY
5f4410468d add filed budget in task 2021-10-15 10:24:56 +02:00
Laurent Destailleur
3d4bb66853 Clean code 2021-09-30 15:59:47 +02:00
Norbert Penel
4e86f872ca it was impossible to update a task 
after some investigation i saw those errors but they are maybe some more around here
 2021-09-30 13:35:23 +02:00
Norbert Penel
d43cf4938a
it was impossible to update a task 
after some investigation i saw those errors but they are maybe some more around here
 2021-09-28 13:46:03 +02:00
Laurent Destailleur
70d255740b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/class/task.class.php
 2021-09-24 02:33:48 +02:00
Laurent Destailleur
4c80e0425b Fix date for tasks created during project creation 2021-09-24 02:10:42 +02:00
Laurent Destailleur
8fb5286260 FIX #18797 2021-09-24 02:02:12 +02:00
Laurent Destailleur
8909702619 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/bom/class/bom.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/product/class/productfournisseurprice.class.php
 2021-09-16 13:40:05 +02:00
Laurent Destailleur
5b07be0179 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/holiday/list.php
 2021-09-16 13:33:49 +02:00
Juanjo Menent
1eb4975a76 fix: Bad date creation for project clone 2021-09-10 11:44:58 +02:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
3d72a21396 Clean code 2021-08-28 03:09:41 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
3b6559b1a6 Clean code by adding cast int. 2021-08-27 18:53:45 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Laurent Destailleur
07ab352877 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
 2021-08-24 16:37:18 +02:00
Laurent Destailleur
2d870d0f81
Merge branch '14.0' into 14p10 2021-08-24 15:15:38 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-08-23 19:44:02 +02:00
Laurent Destailleur
23829ae637 Cast numeric into on sql request 2021-08-23 18:56:46 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Alexandre SPANGARO
53af4b0076 FIX #18375 SQL Error on tasks statistics 2021-08-20 22:11:26 +02:00
Christian Foellmann
b5c30126cb extend the hook getElementList to make $ids in the hooked function 2021-07-29 14:49:41 +02:00
Laurent Destailleur
0d12f25341 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-13 13:21:50 +02:00
Laurent Destailleur
f9d60b15d9 Fix phpcs 2021-07-12 23:56:42 +02:00
Laurent Destailleur
202ee8340a FIX #18091 2021-07-12 23:01:34 +02:00
Laurent Destailleur
f286017cab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-06 19:03:55 +02:00
Francis Appels
5d824899e5 Fix php 8 warning on home page 2021-07-05 13:44:05 +02:00
Laurent Destailleur
6196a77e64
Merge pull request #17861 from marc-dll/develop_NEW_project_block_timesheet 
NEW: project time spent: conf to prevent recording time after X months
 2021-06-29 19:53:20 +02:00
Laurent Destailleur
347c6ae8a8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/projet/class/project.class.php
	htdocs/projet/list.php
 2021-06-14 20:13:27 +02:00
Laurent Destailleur
d154ec2344 FIX Collector to create lead was broken 2021-06-14 20:06:52 +02:00
Laurent Destailleur
a79afeaf02 Add info to allow debug of email collector 2021-06-14 19:58:12 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
stickler-ci
c62c668c68 Fixing style errors. 2021-06-09 09:29:22 +00:00
Marc de Lima Lucio
d383941596 Merge branch 'NEW_13.0_project_block_timesheet' of github.com:marc-dll/dolibarr into develop_NEW_project_block_timesheet 2021-06-09 11:24:17 +02:00
Marc de Lima Lucio
7317aad41f FIX: projet time spent: also restrict to X months back for update and delete 2021-06-09 11:08:38 +02:00
Marc de Lima Lucio
4c6dfd8d5c Merge branch 'NEW_13.0_project_block_timesheet' of github.com:marc-dll/dolibarr into develop 2021-06-09 11:03:04 +02:00
Marc de Lima Lucio
6733d278d8 NEW: project time spent: conf to prevent recording time after X months 2021-06-08 18:13:18 +02:00
Laurent Destailleur
1e657b8621 Fix value of showoncombobox 2021-06-05 15:14:10 +02:00
Laurent Destailleur
673eb73d0a
Merge branch 'develop' into dev_1 2021-05-25 19:55:31 +02:00
Laurent Destailleur
3dfb22b05e
Update task.class.php 2021-05-25 19:54:09 +02:00
Laurent Destailleur
a0418fc17d FIX CWE-269 huntr - download of files of project 2021-05-21 18:53:09 +02:00
Givriz
0c5a934e10 Compatibility phpv8 2021-05-20 17:40:44 +02:00
Laurent Destailleur
7569275d28 Fix generation of invoice 2021-05-18 13:36:07 +02:00
Laurent Destailleur
1c95e2b7c7 FIX #17453 2021-05-03 14:58:29 +02:00
Laurent Destailleur
655056ed31 Debug v14 2021-04-29 12:10:55 +02:00
Laurent Destailleur
389b71bc7e Clean API 2021-04-25 19:21:48 +02:00
Laurent Destailleur
9eaf836c8e
Merge pull request #17281 from altairisfr/warehouses_in_project 
Warehouses in project
 2021-04-16 20:29:21 +02:00
altairis-noe
3fe0eb54c7 association of warehouses to projects 2021-04-15 09:59:08 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
667481acd5 Fix #yogosha5832 - Missin test on permission for /index routes on APIs 2021-04-08 19:05:28 +02:00
stickler-ci
f5aa199c94 Fixing style errors. 2021-04-06 15:03:07 +00:00
Gauthier PC portable 024
04cb8453f0 FIX : we can't update task if closed project because of wrong test with PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE conf 2021-04-06 16:59:00 +02:00
Laurent Destailleur
92da23945b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/13.0.0-14.0.0.sql
 2021-04-02 22:51:14 +02:00
Laurent Destailleur
25e32c4fcd
Merge branch 'develop' into dev_EventOrganisation 2021-04-02 22:43:10 +02:00
Laurent Destailleur
e0cb175208 Doxygen 2021-04-02 21:49:21 +02:00
Florian HENRY
88b481e5a8 keep tab project 2021-04-02 11:25:14 +02:00
Florian HENRY
73d7eefdcf Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-31 20:09:44 +02:00
Laurent Destailleur
be6bb3a756 FIX #yogosha5746 - next step (work in progress) 2021-03-30 19:12:07 +02:00
Laurent Destailleur
fb84608586 Clean sql 2021-03-30 03:37:54 +02:00
Florian HENRY
cc78e7c685 add field on conf or booth tabs 2021-03-23 21:04:38 +01:00
Laurent Destailleur
ca1715df96 Add some protection for SQL injection 2021-03-22 13:31:06 +01:00
Laurent Destailleur
6063b02bf4 Fix #ygosha5698 2021-03-22 12:47:23 +01:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00
Florian HENRY
177a6bfe4f conference or booth card and list ok 2021-03-15 20:20:53 +01:00
Laurent Destailleur
7d1e18f5ab
Merge pull request #16625 from FHenry/dev_EventOrganisation 
new: working on conference or booth object and event type #FoundationFunding
 2021-03-15 11:37:57 +01:00
Laurent Destailleur
cc10106a21 Fix protection on int 2021-03-14 12:20:23 +01:00