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

3667 Commits

Author SHA1 Message Date
Philippe GRAND
445d160fda FIX php8 compatibility 2022-08-28 14:25:16 +02:00
Frédéric France
86a7a7c8bb use isModEnabled 2022-08-23 20:05:09 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Laurent Destailleur
183b205c32 css 2022-08-15 09:10:42 +02:00
Laurent Destailleur
9c8319ae58
Merge pull request #21635 from atm-gauthier/NEW/conf_to_always_update_thm_of_task_time_line 
NEW : conf TIMESPENT_ALWAYS_UPDATE_THM, when it's on we always check …
 2022-08-14 15:57:18 +02:00
UT from dolibit
a8a107fb37
Update index.php 
delete double entry:  $taskstatic = new Task($db);
 2022-08-10 13:37:15 +02:00
Laurent Destailleur
528d54ba79 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-02 20:28:07 +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
5d2d0384f8 Debug v16 2022-07-29 17:05:02 +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
212a0f838a
Merge pull request #21363 from Quatadah/dolicloud-qnasdami-dropdownmenu 
adding dropdown menu in case of a lot of buttons in project
 2022-07-27 10:15:39 +02:00
Laurent Destailleur
60dd3577ec Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-26 13:15:37 +02:00
Laurent Destailleur
da2641bcb2 Clean code 2022-07-26 12:54:19 +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
d65ea8c333 Debug v16 2022-07-26 11:05:00 +02:00
Laurent Destailleur
d0e74fbbeb Sync transifex 2022-07-26 10:54:03 +02:00
Quatadah Nasdami
873745a178 I included the boolean in the $params and resolved the margin issue. 2022-07-25 20:13:54 +02:00
Laurent Destailleur
24f8e9c401 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-22 18:09:38 +02:00
Laurent Destailleur
3761c920eb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/modules/modPartnership.class.php
	htdocs/modulebuilder/template/core/modules/modMyModule.class.php
 2022-07-22 17:43:35 +02:00
atm-lena
46075188b2 Tasks List Search : several same lines 2022-07-21 15:59:46 +02:00
Laurent Destailleur
5e4eb58a43 FIX phpv8 2022-07-21 11:09:35 +02:00
Laurent Destailleur
3079ab2737 FIX phpv8 2022-07-21 10:59:15 +02:00
Laurent Destailleur
f1ffb56f4a
Merge pull request #21334 from Quatadah/dolicloud-qnasdami-clone-button-on-task 
clone button on tasks
 2022-07-19 03:14:13 +02:00
lvessiller
7bbf5ec57b FIX resolve conflicts 2022-07-15 17:50:19 +02:00
Laurent Destailleur
4f54fb4f00 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-14 11:54:30 +02:00
Laurent Destailleur
abd3f272fa Fix backtopage after a cancel 2022-07-12 19:17:44 +02:00
Quatadah Nasdami
0da4360b9f almost done 2022-07-11 17:30:11 +02:00
Quatadah Nasdami
2f6e9ea839 done 2022-07-11 16:28:28 +02:00
Laurent Destailleur
5e54639749 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-08 10:23:47 +02:00
Laurent Destailleur
7dbff58da7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-08 10:17:24 +02:00
Laurent Destailleur
ff7782eb6b Fix phpcs 2022-07-08 00:36:42 +02:00
Laurent Destailleur
da03175c07
Merge branch 'develop' into dev_19763 2022-07-07 23:06:22 +02:00
Laurent Destailleur
b7a99463a6
Merge pull request #21341 from fboitel/NEW#21000 
NEW #21000
 2022-07-07 22:06:59 +02:00
Laurent Destailleur
a871aa8f85
Merge pull request #21382 from fboitel/NEW#20650 
NEW #20650 Checkbox column on left for lists
 2022-07-07 21:48:51 +02:00
Laurent Destailleur
6e4d4b5b0d css 2022-07-07 21:42:32 +02:00
Laurent Destailleur
4086f3f36c
Merge pull request #21317 from ymollard/project-reports 
Filter accounting reports by projects
 2022-07-07 21:20:52 +02:00
Laurent Destailleur
2ffdb19bdf
Because button are reserved for action on workflow, i comment this to not break consistency of position of feature. I will think to a better place... 2022-07-07 21:20:09 +02:00
Christian Foellmann
4c5e05e411 fix page titles 
Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/contact/list.php
	htdocs/product/stock/movement_list.php
	htdocs/user/list.php
 2022-07-06 19:19:08 +02:00
Laurent Destailleur
76e3c10c06
Revert "fix page titles" 2022-07-06 15:56:04 +02:00
Laurent Destailleur
2f2eb058ac
Merge pull request #21415 from aspangaro/17p5_projectlistauthor 
NEW Project - Add author on list
 2022-07-06 13:34:35 +02:00
Florian HENRY
eab3541ca5 better sql request 2022-07-03 13:07:25 +02:00
Florian HENRY
1216294667 new: Add thirdparty column to task time list 2022-07-03 13:02:42 +02:00
Florian HENRY
a6fd9203fa on going 2022-07-03 00:26:01 +02:00
Alexandre SPANGARO
7fcbe97b9c NEW Project - Add author on list 2022-06-29 17:32:50 +02:00
Christian Foellmann
89d1389e2d fix page titles 2022-06-27 12:48:04 +02:00
Faustin
c387f1d57a NEW #20650 completing checkcolumn on left for task list 2022-06-25 19:01:52 +02:00
Faustin
acddc2a332 NEW #20650 completing checkcolumn on left for project list 2022-06-25 18:51:19 +02:00
Quatadah Nasdami
f48c990375 adding dropdown menu in case of a lot of buttons in project 2022-06-23 17:47:56 +02:00
Laurent Destailleur
264f8ab4ce
Merge pull request #21342 from frederic34/useismodenabled 
Use getDolGlobalString
 2022-06-23 09:55:31 +02:00
Frédéric France
b46ede5eae fix deprecated in project 2022-06-22 13:50:54 +02:00
Frédéric France
287f868fbb use getDolGlobalString 2022-06-22 08:36:24 +02:00
Faustin
08ba39f704 NEW 21000 Added columns 'alias_name' on supplier order list 2022-06-21 19:25:38 +02:00
Faustin
57d2a0352e NEW 21000 Added columns 'alias_name' on tasks list 2022-06-21 18:30:23 +02:00
Faustin
e76b49c360 NEW 21000 Added columns 'alias_name' on poject list 2022-06-21 18:06:58 +02:00
Faustin
dd9e77e764 NEW 21000 Added columns 'alias_name' on poject list 2022-06-21 17:57:00 +02:00
Quatadah Nasdami
a8b6dd56a8 Merge branch 'dolicloud-qnasdami-clone-button-on-task' of https://github.com/Quatadah/dolibarr into dolicloud-qnasdami-clone-button-on-task 2022-06-21 13:34:03 +02:00
Quatadah Nasdami
629ece0473 adding clone button on task 2 2022-06-21 13:33:55 +02:00
Quatadah Nasdami
11c3e68c57
Merge branch 'Dolibarr:develop' into dolicloud-qnasdami-clone-button-on-task 2022-06-21 13:24:26 +02:00
Quatadah Nasdami
aebdb0eaa1 adding clone button 2022-06-21 13:22:59 +02:00
Laurent Destailleur
c1904f0e5e Debug v16 2022-06-21 11:11:28 +02:00
Laurent Destailleur
eeff8fdc0d Debug v16 2022-06-20 02:10:27 +02:00
stickler-ci
13511d983e Fixing style errors. 2022-06-19 17:27:15 +00:00
Yoan Mollard
82cfca1a80 Filter accounting reports by projects 2022-06-19 00:48:06 +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
Laurent Destailleur
3f0f7f323d css 2022-06-14 16:05:26 +02:00
Laurent Destailleur
e991c614d3 Debug v16 2022-06-14 14:48:15 +02:00
Laurent Destailleur
862ca7cf04 Debug v16 2022-06-14 14:39:32 +02:00
Faustin
f247bda226 Attribute datee doesn't exist on class Task 2022-06-14 10:54:12 +02:00
Laurent Destailleur
9202612cc0
Merge pull request #21168 from defrance/patch-203 
datee and dateo not filled
 2022-06-12 18:37:59 +02:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
Frédéric FRANCE
38b18a68d7
Merge branch 'develop' into useismodenabled 2022-06-10 10:07:41 +02:00
BENKE Charlene
b176d1a59d
not my best day 2022-06-09 23:17:29 +02:00
Frédéric France
0b8179d7ef use isModEnabled function 2022-06-09 22:49:48 +02:00
Frédéric France
5dcfc28913 use isModEnabled function 2022-06-09 22:41:59 +02:00
Frédéric France
400afc937f use isModEnabled function 2022-06-09 22:16:48 +02:00
Laurent Destailleur
2ad7c0df74
Merge pull request #21178 from Quatadah/fix19860 
FIX  #19860
 2022-06-09 12:51:19 +02:00
stickler-ci
fb86cea3fc Fixing style errors. 2022-06-09 10:09:49 +00:00
NASDAMI Quatadah
8a48cd5989 Fixing bug 2022-06-09 12:05:23 +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
Laurent Destailleur
0033a1a02a CSS 2022-06-07 17:54:51 +02:00
Laurent Destailleur
cd041c9ea1 Clean code 2022-06-03 02:41:00 +02:00
Laurent Destailleur
32f60e191f Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-01 15:57:35 +02:00
Laurent Destailleur
c3036d455a FIX #20902 2022-06-01 15:56:44 +02:00
lmarcouiller
2a89e396fe Fix #20878 : improper use of dol_move 2022-06-01 15:17:19 +02:00
Laurent Destailleur
d6ecbe65b7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/langs/en_US/errors.lang
 2022-05-31 15:16:54 +02:00
Laurent Destailleur
64a683c8e7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/projet/tasks/task.php
 2022-05-31 14:33: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
kamel
192f273e27 FIX: Fix show errors in card 2022-05-24 15:02:35 +02:00
lvessiller
839511aa83 NEW rename categoriesArr varibale 2022-05-23 12:25:25 +02:00
lvessiller
0de33fccd8 NEW rename categoriesArr varibale 2022-05-23 12:23:16 +02:00
lvessiller
89af598c4f NEW MAIN_SEARCH_CATEGORY_CUSTOMER_ON_LISTS const to show category customer filter 2022-05-23 11:57:35 +02:00
lvessiller
e7d165f570 Merge branch 'develop' of github.com:Dolibarr/dolibarr into new-task-list-filter-category-customer 2022-05-23 11:55:07 +02:00
lvessiller
e3016aa661 NEW MAIN_SEARCH_CATEGORY_CUSTOMER_ON_LISTS const to show category customer filter 2022-05-23 11:53:14 +02:00
lvessiller
50a910899d Merge branch 'develop' of github.com:Dolibarr/dolibarr into new-project-list-filter-category-customer 2022-05-23 10:37:48 +02:00
Laurent Destailleur
9b64f04857 Fix label 2022-05-23 00:57:02 +02:00
Lucas Marcouiller
b4a7657fbe fix style 2022-05-21 18:47:01 +02:00
Lucas Marcouiller
51041bbea1 Fix : php 8.0 warnings 2022-05-21 18:46:41 +02:00
Laurent Destailleur
beb710957c
Merge pull request #20901 from atm-GregM/DolGetButtonAction_Projet 
FIX : replacing to dolGetButtonAction on Projet card
 2022-05-20 21:33:42 +02:00
lvessiller
75ff04b2fe NEW separate categories filters 2022-05-20 15:38:33 +02:00
lvessiller
3e09fb60c6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into new-task-list-filter-category-customer 2022-05-20 15:36:26 +02:00
lvessiller
757c81c03f NEW separate categories filters 2022-05-20 15:34:40 +02:00
Laurent Destailleur
9e2e3393c6 Work on popup create pages 2022-05-19 21:32:17 +02:00
GregM
0defbe8205 replacing to dolGetButtonAction on Projet card 2022-05-19 17:55:13 +02:00
Laurent Destailleur
e1c2968ae7 Look and feel v16 2022-05-18 23:11:59 +02:00
Laurent Destailleur
86d34af4b0 Fix deprecated code 2022-05-18 11:38:56 +02:00
Laurent Destailleur
1a0e416c1a WIP 2022-05-18 00:51:20 +02:00
Laurent Destailleur
7de1fe8646 Look and feel v16 2022-05-18 00:17:46 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
Laurent Destailleur
b87b997c7d Debug v16 2022-05-16 19:19:52 +02:00
Laurent Destailleur
04f64dd252 Look and feel v16 2022-05-16 18:54:50 +02:00
Laurent Destailleur
c3c29393c1 Look and feel v16 2022-05-16 18:00:59 +02:00
Laurent Destailleur
84fccb0988 Debug v16 2022-05-16 13:57:11 +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
775a8c5334 Look and feel v16 2022-05-12 20:18:58 +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
Laurent Destailleur
23665c3f6b Tooltip 2022-05-11 10:02:59 +02:00
Laurent Destailleur
ea0d6b1867 css 2022-05-11 10:00:37 +02:00
Laurent Destailleur
1c4c7201fc Trans 2022-05-11 09:53:23 +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
112c8826b7 finish invoice per product line 2022-05-11 09:06:26 +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
30597d7f89
Merge pull request #18163 from FHenry/dev_new_project_upgrade_external_user_perms_project 
NEW: Separate read-only and adding time on projects
 2022-05-08 19:50:46 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +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
Florian HENRY
477aa4cc09 Merge branch 'dev_new_project_upgrade_external_user_perms_project' of github.com:FHenry/dolibarr into dev_new_project_upgrade_external_user_perms_project 2022-05-06 11:19:27 +02:00
Florian HENRY
a54c0fb247 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_project_upgrade_external_user_perms_project 2022-05-06 11:13:44 +02:00
lvessiller
c4c4c91a77 NEW customer category filter on task list 2022-05-04 09:52:29 +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
Laurent Destailleur
fa7254be9a Fix picto and perm 2022-05-03 17:05:14 +02:00
John BOTELLA
7d3030aa8e Fix fatal error for usage in tpl 2022-05-03 12:31:30 +02:00
Laurent Destailleur
fa8ce6e4fd
Merge pull request #20710 from fappels/develop_confirm_createbills 
Move massaction 'confirm_createbills' from actions_massactions.inc.php to commande/list.php
 2022-04-29 17:19:18 +02:00
Laurent Destailleur
708d3610a5 Look and feel v16 2022-04-29 13:04:29 +02:00
Francis Appels
7e44227df2 Cleanup 'confirm_createbills' 2022-04-25 14:28:57 +02:00
lvessiller
86fa7ae24e NEW customer category filter on project list 2022-04-22 17:10:24 +02:00
Florian HENRY
7e1079c65c on going 2022-04-15 10:57:16 +02:00
Florian HENRY
5a8e5c4780 on going 2022-04-15 10:16:18 +02:00
Laurent Destailleur
a4b16c5b38 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-14 23:38:42 +02:00
Laurent Destailleur
4bf918065b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-14 23:29:00 +02:00
Laurent Destailleur
4d1eed7dc1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/perweek.php
 2022-04-14 23:28:26 +02:00
Laurent Destailleur
6bbf4ccaaf Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-04-14 23:25:04 +02:00
Laurent Destailleur
fb0a38d248 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-04-14 23:24:09 +02:00
Laurent Destailleur
694357d48e
Merge pull request #19420 from marc-dll/12.0_FIX_project_activity_default_workingdays 
FIX: project timesheets: assume Saturday and Sunday as default weekend days when working days conf is empty or badly formed
 2022-04-14 23:23:12 +02:00
Laurent Destailleur
110fa251e8
Merge pull request #19425 from marc-dll/13.0_FIX_project_timesheet_offdays_offset 
FIX: project timesheet: public holidays offset by 1 day
 2022-04-14 23:22:05 +02:00
Florian HENRY
902301659b finish invoice per product per line 2022-04-13 09: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
Laurent Destailleur
45fca25408 NEW Upgrade chartjs library to 3.7.1 2022-04-03 11:52:25 +02:00
Laurent Destailleur
867883e9b1 Clean code for kanban view 2022-03-31 18:06:39 +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
kamel
e17bbdebcf NEW - Add hooks on project task time page 2022-03-29 10:16:06 +02:00
Regis Houssin
4479ba8015 FIX missing translation keys 2022-03-26 08:32:20 +01:00
Laurent Destailleur
8236a8e846 Fix bad test for button to show / hide canceled orders 2022-03-25 15:37:15 +01:00
Laurent Destailleur
4d91e448ce Fix bad test for button to show / hide canceled orders 2022-03-25 15:35:49 +01:00
Florian HENRY
6774f0e571 new: entities is now updated on project update method 2022-03-25 11:53:27 +01:00
Laurent Destailleur
6abeb2804e Fix phpcs 2022-03-24 11:47:12 +01:00
Laurent Destailleur
4a80f35aaa Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-03-23 17:26:25 +01:00
Laurent Destailleur
c620757dbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/langs/en_US/projects.lang
	htdocs/product/price.php
	htdocs/reception/class/reception.class.php
 2022-03-23 17:23:21 +01:00
Laurent Destailleur
32f2499c36 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/en_US/propal.lang
	htdocs/product/price.php
	htdocs/projet/card.php
	htdocs/reception/class/reception.class.php
 2022-03-23 17:04:31 +01:00
Florian HENRY
6c3ea310dc align css 2022-03-18 09:12:34 +01:00
Florian HENRY
93e8c57d78 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-03-18 08:42:19 +01:00
Laurent Destailleur
63b96e22b0
Update card.php 2022-03-17 02:37:30 +01:00
Laurent Destailleur
71a4a9a48b
Merge pull request #20313 from atm-kevin/NEW_WYSIWYG_ON_PROJECT_TASKS 
NEW : Project's tasks WYSIWYG editor
 2022-03-16 22:36:24 +01:00
Laurent Destailleur
ac22b1ce81 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-03-16 21:31:08 +01:00
Florian HENRY
cfa3f2f4a1 fix: prededefault setup values for public field (visibility) works 2022-03-16 09:36:52 +01:00
Laurent Destailleur
58f5cafc34 FIX #20359 2022-03-15 19:15:02 +01:00
stickler-ci
bf9b6c05a2 Fixing style errors. 2022-03-10 15:20:37 +00:00
kevin
2a09d4821b Resolve merge conflicts 2022-03-10 16:16:42 +01:00
kevin
896c79f27a Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_WYSIWYG_ON_PROJECT_TASKS 2022-03-10 16:13:02 +01:00
kevin
7b3d472fa2 Rework code to best match the standard 2022-03-10 16:10:34 +01:00
Laurent Destailleur
88ffe1827e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/ajax/row.php
	htdocs/filefunc.inc.php
 2022-03-10 15:59:09 +01:00
stickler-ci
bb2f57a962 Fixing style errors. 2022-03-09 13:15:30 +00:00
kevin
22249d15c3 Add WYSIWYG Editor on project's tasks description field 2022-03-09 14:09:22 +01:00
Laurent Destailleur
e76afe475b Fix responsive 2022-03-09 11:42:15 +01:00
Marc de Lima Lucio
f837845c12 FIX: still prevent project creation if PROJECTLEADER role unavailable, but with a specific error message 2022-03-08 15:07:02 +01:00
Laurent Destailleur
feafbaded2
Update info.php 2022-03-07 14:31:19 +01:00
Laurent Destailleur
2ef42c178b
Update info.php 2022-03-07 14:30:38 +01:00
Laurent Destailleur
acb47a4cc7
Update document.php 2022-03-07 14:29:39 +01:00
Florian HENRY
7880d8f040 fix double call 2022-03-04 10:04:41 +01:00
Florian HENRY
df5c427d0d Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-03-04 08:41:04 +01:00
Marc de Lima Lucio
7239fa3605 FIX: project creation prevented if PROJECTLEADER contact role renamed, de-activated or deleted 2022-03-03 12:19:47 +01:00
kevin
c71bebfd21 Add Init Hooks on several project tabs 2022-03-02 20:48:46 +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
HENRY Florian
77d8025d86
Merge branch 'develop' into dev_new_project_upgrade_external_user_perms_project 2022-03-01 08:54:43 +01:00
Laurent Destailleur
c2fb5d577c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/banks.lang
	htdocs/projet/list.php
 2022-02-28 20:12:28 +01:00
Laurent Destailleur
5d0408f7af Fix filter on member list 2022-02-26 19:15:40 +01:00
Laurent Destailleur
eba20957f3 Fix CSS 
Conflicts:
	htdocs/projet/list.php
 2022-02-25 21:47:25 +01:00
Laurent Destailleur
acf6d19500 Fix CSS 2022-02-25 21:45:29 +01:00
Laurent Destailleur
409da7f091 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-25 19:17:41 +01:00
Laurent Destailleur
a2dea71b4d
Merge pull request #20172 from Dolibarr/atm-maxime-patch-1 
Fix #20171 permissiontoadd
 2022-02-25 14:00:13 +01:00
priojk
c201ff211f Fix #20141 generation of intervention 
When an intervention card was created from the times spent on tasks in a project, the task label was wrong in
the descriptions on the intervention card
 2022-02-24 11:10:46 +01:00
Maxime Kohlhaas
a9ce98dfb0
Update document.php 2022-02-24 03:11:43 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Laurent Destailleur
3b6f7bff66 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 16:32:51 +01:00
Laurent Destailleur
aec2579c41 Clean code 2022-02-18 12:22:53 +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
Laurent Destailleur
243999d223
Merge pull request #19746 from atm-quentin/NEW_contact_pj_filter_list 
NEW : Contact filter project list
 2022-01-25 16:06:31 +01:00
Laurent Destailleur
c3a58ae303 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-25 15:43:42 +01:00
Christian Foellmann
15346d1c4a getTasksArray() fetch_optionals to populate ExtraFields 2022-01-25 09:17:30 +01:00
Florian HENRY
bb5f5bc18c merge 2022-01-24 23:30:41 +01:00
Florian HENRY
db8d8f0b7d Revert "merge" 
This reverts commit 8d3d8fe63b.
 2022-01-24 23:27:26 +01:00
Florian HENRY
8d3d8fe63b merge 2022-01-24 23:24:08 +01:00
Florian HENRY
3f811d37f1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-01-24 23:23:43 +01:00
Laurent Destailleur
a16293f9b7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-22 17:27:57 +01:00
Laurent Destailleur
4ac62773ae Fix permissions on deletion on time spend line 2022-01-21 16:22:59 +01:00
Laurent Destailleur
8c22de6982 Comment 2022-01-21 16:15:38 +01:00
Laurent Destailleur
bbb0864fd8 Look and feel v15 2022-01-21 15:45:09 +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
Laurent Destailleur
8cb5264928 Fix css 2022-01-15 12:56:19 +01:00
Laurent Destailleur
b3b1e82100 Change on column Assigned to on projet and task. 2022-01-15 12:30:41 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +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
Quentin VIAL-GOUTEYRON
446ba2a416 FIX stickler 2022-01-05 15:33:05 +01:00
Quentin VIAL-GOUTEYRON
7a4b0e38cd NEW : Contact filter project list 2022-01-05 14:35:11 +01:00
Laurent Destailleur
49dae0aed2 Look and feel v15 2022-01-01 18:41:26 +01:00
John BOTELLA
33ea8e850b Remove not defined param 2021-12-28 19:47:58 +01:00
Laurent Destailleur
e4c4ef14ef Fix td balance 2021-12-21 23:52:01 +01:00
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +01:00
Laurent Destailleur
4855a97b21 Fix phpunit 2021-12-20 20:07:29 +01:00
Laurent Destailleur
02317f1d95 Fix nav lose filter 2021-12-20 18:12:08 +01:00
Laurent Destailleur
26d30be518 FIX list on time spent when no param provided was wrong. 2021-12-20 17:50:59 +01:00
Laurent Destailleur
69cd7ae2ab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/don/card.php
	htdocs/public/test/badges.php
	htdocs/public/test/test_exec.php
 2021-12-08 18:27:03 +01:00
Laurent Destailleur
c3bfd5caa4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/adherents/type.php
	htdocs/asset/type.php
	htdocs/categories/edit.php
	htdocs/comm/action/card.php
	htdocs/compta/bank/card.php
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/class/extrafields.class.php
	htdocs/don/card.php
	htdocs/product/stock/card.php
	htdocs/projet/card.php
	htdocs/projet/tasks/task.php
	htdocs/user/group/card.php
 2021-12-08 18:21:20 +01:00
Laurent Destailleur
e47e3b9797 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-12-08 18:09:55 +01:00
Laurent Destailleur
f1dac82a53 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/adherents/card.php
	htdocs/categories/edit.php
	htdocs/contact/card.php
	htdocs/core/class/extrafields.class.php
	htdocs/product/stock/card.php
 2021-12-08 17:56:05 +01:00
Laurent Destailleur
6886cca1fa CSS 2021-12-07 02:35:46 +01:00
Quentin VIAL-GOUTEYRON
826bde0656 FIX set optional from post 2021-12-06 11:19:12 +01:00
Laurent Destailleur
7219100174 css 2021-12-04 00:54:31 +01:00
Laurent Destailleur
8bace4c64e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-30 16:24:42 +01:00
Laurent Destailleur
a298a845f1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/memory.lib.php
	htdocs/langs/en_US/holiday.lang
	htdocs/ticket/card.php
 2021-11-30 16:24:18 +01:00
Laurent Destailleur
3de3adad74 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/ajax/objectonoff.php
 2021-11-30 16:11:12 +01:00
Laurent Destailleur
055cb5c0c9
Merge pull request #18526 from cfoellmann/PR/deprecated-html 
deprecated html attributes
 2021-11-30 14:27:12 +01:00
Laurent Destailleur
1122cd1e5e
Merge pull request #19163 from Hystepik/develop#4 
Fix: php 8.0 warnings project
 2021-11-30 14:18:23 +01:00
Laurent Destailleur
2b1fab2181 Clean code 2021-11-30 11:50:27 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed 
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
 2021-11-29 15:09:18 +01:00
Laurent Destailleur
dd953b6e5a Fix filter 2021-11-27 01:09:16 +01:00
Laurent Destailleur
78f94b1c76 Fix css and label for recurring invoices 2021-11-25 14:17:20 +01:00
Laurent Destailleur
4cfec658bc css 2021-11-25 14:11:18 +01:00
Frédéric FRANCE
dc3bfcfb87
can modify tooltip by reference 2021-11-22 19:57:26 +01:00
Laurent Destailleur
441af6b6fb Fix add rel="noopener noreferrer" 2021-11-22 02:35:55 +01:00
Marc de Lima Lucio
ffa88b803f FIX: project timesheet by week: cleanup unused code 2021-11-19 16:03:41 +01:00
Marc de Lima Lucio
c5f0faad43 FIX: project timesheet: public holidays offset by 1 day 2021-11-19 15:36:00 +01:00
Marc de Lima Lucio
7cb657c991 FIX: project timesheets: assume Saturday and Sunday are default weekend days when working days conf is empty or badly formed 2021-11-19 14:49:11 +01:00
lmarcouiller
00369a5269 fix errors 2021-11-19 14:32:40 +01:00
Hystepik
63773bf36d
Merge branch 'develop' into develop#4 2021-11-19 14:22:39 +01:00
Laurent Destailleur
2afe6ccb4b Debug feature shown/hide canceled orders 2021-11-18 21:26:35 +01:00
Laurent Destailleur
c6463c9a83
Merge pull request #19166 from polkiko/canceled_orders 
NEW Canceled purchase orders do not qualify for total and are hidden
 2021-11-18 20:56:42 +01:00
Laurent Destailleur
fd74e33ef1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/index.php
 2021-11-11 16:19:01 +01:00
Laurent Destailleur
ddad00c8e4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/takepos/index.php
 2021-11-11 16:14:48 +01:00
Laurent Destailleur
6e01f1702e Fix css 2021-11-08 18:45:00 +01:00
Marc de Lima Lucio
c1a2e7b12e FIX: project task list: extrafields could not be displayed 2021-11-08 17:51:19 +01:00
Laurent Destailleur
ca53176b14
Merge pull request #19179 from frederic34/tasklist 
fix warnings in task list
 2021-10-31 17:52:31 +01:00
Laurent Destailleur
8f54143bfb
Merge pull request #19178 from frederic34/patch-1 
fix not defined
 2021-10-31 17:47:34 +01:00
Laurent Destailleur
d891dd8ddc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/product/stats/card.php
	htdocs/projet/element.php
	htdocs/salaries/card.php
 2021-10-31 16:19:10 +01:00
Laurent Destailleur
e6e440e573 Fix #19257 error in the page Overview of a project 2021-10-31 15:14:15 +01:00
Alexandre SPANGARO
9142599ea5 copyright 2021-10-30 21:18:52 +02:00
Alexandre SPANGARO
b1c799ee08 FIX #19241 Project - Fix display salary in overview 2021-10-30 21:17:15 +02:00
Laurent Destailleur
0017c15974 Debug v15 2021-10-30 17:19:46 +02:00
Frédéric FRANCE
42cd2ce868
Update list.php 2021-10-26 18:46:51 +02:00
Scrutinizer Auto-Fixer
5567310e44 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-10-25 20:07:31 +00:00
Laurent Destailleur
ad2e567571 Fix bug huntr.dev 2021-10-25 15:32:10 +02:00
Frédéric FRANCE
db44f4082b
fix warnings in task list 2021-10-24 14:26:43 +02:00
Frédéric FRANCE
8cd4b0bc83
fix warnings in task list 2021-10-24 14:25:05 +02:00
Frédéric FRANCE
5f198c78a9
fix warnings in task list 2021-10-24 14:08:44 +02:00
Frédéric FRANCE
5ef5075f8f
fix warnings in task list 2021-10-24 14:00:05 +02:00
Frédéric FRANCE
3765a89283
fix warnings in task list 2021-10-24 13:57:04 +02:00
Frédéric FRANCE
ede0c60e2e
fix not defined 2021-10-24 13:50:22 +02:00
Laurent Destailleur
dcb433756d
Merge pull request #19174 from frederic34/fixticketlist 
fix warnings in ticket list
 2021-10-24 12:31:57 +02:00
Frédéric FRANCE
cc374e9eb1
fix warnings in ticket list 2021-10-24 10:02:12 +02:00
Frédéric FRANCE
d240a9f774
fix warnings in ticket list 2021-10-24 09:59:30 +02:00
Laurent Destailleur
f2cd7a7a56 Removed the div class="ficheaddleft" 2021-10-24 00:37:37 +02:00
Jesús Jerez
fc307fb685
Merge branch 'develop' into canceled_orders 2021-10-23 23:24:47 +02:00
Polkiko
a58f713f6d NEW Canceled purchase orders do not qualify for total in project overview (and are hidden) 
If purchase order has been canceled then it does not qualify for total amount and is not shown in table. It can be seen by clicking on the "show/hide" button.
 2021-10-23 23:12:23 +02:00
Lucas Marcouiller
58b28d3d7d Fix: fix php 8.0 warnings project 2021-10-23 22:32:03 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Laurent Destailleur
06bc357409 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-23 14:49:50 +02:00
Laurent Destailleur
3f60cbbedc Remove the div class="ficheaddleft" 2021-10-23 14:49:35 +02:00
Hystepik
67711bdea9
Merge branch 'develop' into develop#3 2021-10-23 10:59:36 +02:00
Lucas Marcouiller
953a56b08c Fix: PHP 8.0 Warnings 2021-10-23 10:57:03 +02:00
Laurent Destailleur
728a00560f
Merge pull request #19122 from frederic34/patch-7 
fix warnings
 2021-10-22 22:48:53 +02:00
Frédéric FRANCE
6ec183cc3a
fix warnings 2021-10-22 22:32:01 +02:00
Frédéric FRANCE
46c4f28478
fix multiple warnings 2021-10-22 22:15:59 +02:00
Frédéric FRANCE
7c449892bb
fix display 2021-10-22 00:19:10 +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
3bdec20364 fix scrutinzer 2021-10-21 19:09:13 +02:00
Florian HENRY
ac27532d62 fix scrutinzer 2021-10-21 19:06:40 +02:00
Florian HENRY
24cc74cd3a fix scrutinizer 2021-10-21 19:00:48 +02:00
Laurent Destailleur
f1d646bded Look and feel v15 2021-10-18 15:41:55 +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
aeffad4c0f fix order 2021-10-15 11:02:05 +02:00
Florian HENRY
ab9ba4e0a2 NEW: feature #18986 2021-10-15 10:53:17 +02:00
Florian HENRY
5f4410468d add filed budget in task 2021-10-15 10:24:56 +02:00
Laurent Destailleur
e6c451cdae Fix responsive 2021-10-12 23:50:23 +02:00
Lucas Marcouiller
bbf5cb5db1 FIX: creation of project backtopage 2021-10-11 15:02:53 +02:00
Laurent Destailleur
96b617cb4d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/eventorganization/conferenceorboothattendee_card.php
	htdocs/mrp/mo_list.php
 2021-10-06 18:30:26 +02:00
Laurent Destailleur
92ae3c9d52 Fix label in graph 2021-10-06 14:26:48 +02:00
Laurent Destailleur
6060f0bfb0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/main.lang
 2021-10-04 14:53:44 +02:00
Laurent Destailleur
d6e1a6be93 Look and feel v14 2021-10-03 18:20:01 +02:00
Laurent Destailleur
bb6399e12a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
 2021-09-30 16:21:36 +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
37603b451a Fix token in url 2021-09-27 12:24:01 +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
3d22cbe4da Fix look and feel 2021-09-24 02:16:40 +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
b08b7d2f68 NEW Can show progression of task into combo list of tasks 2021-09-23 13:20:42 +02:00
Laurent Destailleur
d38c3028eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2021-09-23 02:41:53 +02:00
Noé Cendrier
c89468428e add warehouse in projects elements count 2021-09-21 17:22:55 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
 2021-09-20 17:15:12 +02:00
Laurent Destailleur
1d597e8a72 Fix add unset* action as sensible GET actions 2021-09-19 18:03:38 +02:00
Laurent Destailleur
5c8fb38426 Fix add del* action into list of sensitive actions 2021-09-19 14:41:46 +02:00
Laurent Destailleur
2acb84b432 FIX unprivileged user can see task associated with a not allowed project 2021-09-19 01:30:39 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
62b721a904 Add deletecontact as sentitive action 
Replace dol_buildpath with DOL_URL_ROOT
 2021-09-18 19:34:46 +02:00
Laurent Destailleur
3d9be1437a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/list.php
	htdocs/fourn/paiement/list.php
	htdocs/projet/tasks/time.php
 2021-09-17 12:29:58 +02:00
Laurent Destailleur
b546f21ef4 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 13.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2021-09-17 12:21:25 +02:00
Laurent Destailleur
1a705adf6e
Merge pull request #18726 from cfoellmann/PR/button-classes 
add missing css classes to buttons
 2021-09-17 10:52:13 +02:00
Marc de Lima Lucio
571d130c3c FIX: task time: keep on using natural_search 2021-09-17 10:51:37 +02:00
Laurent Destailleur
c559e5cc3e Fix missing label 2021-09-16 21:23:02 +02:00
Marc de Lima Lucio
88cd8fface FIX: task time: can't filter by user with pgsql + show error message 2021-09-16 17:53:47 +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
Christian Foellmann
fd1d4d9073 add missing css classes to buttons 2021-09-16 11:33:42 +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
77e9f15360 Work on #18448 2021-09-02 22:52:17 +02:00
Givriz
1c99bd7c4a Compatibility phpv8 2021-09-02 18:48:46 +02:00
Laurent Destailleur
28aa57b169
Merge pull request #18497 from FHenry/dev_new_projtask_changefilterdate 
NEW: date filter on project list and task list From->To
 2021-09-01 19:19:08 +02:00
Laurent Destailleur
270eede593 Removed $_GET and $_REQUEST 2021-09-01 18:39:35 +02:00
Laurent Destailleur
4810db3dbf
Merge pull request #18498 from GurvanKervern/undefVars2 
Undef vars2
 2021-09-01 18:36:26 +02:00
Laurent Destailleur
79a25248cd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2021-09-01 17:55:32 +02:00
Laurent Destailleur
38c0e93285 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/public/project/index.php
 2021-09-01 17:52:04 +02:00
Laurent Destailleur
375557e092 FIX Menu List of project was not visible. 2021-09-01 15:10:02 +02:00
Laurent Destailleur
dad4c34ec5 Debug module conference or booth 2021-08-31 23:51:45 +02:00
Florian HENRY
673852c739 better line desc 2021-08-31 09:24:41 +02:00
Florian HENRY
009fa41762 add checkbox to ask detail on line desc 2021-08-31 09:10:57 +02:00
Florian HENRY
0ae4e721c4 merge 2021-08-30 23:50:33 +02:00
Florian HENRY
ff1ba623c1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_projtask_changefilterdate 2021-08-30 23:46:34 +02:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons 
replace remaining SubmitCancel buttons
 2021-08-28 18:39:06 +02:00
Laurent Destailleur
86af3ff3d7
Merge pull request #18492 from aspangaro/15a5 
NEW Task - Add From/to input on search date
 2021-08-28 17:43:15 +02:00
Laurent Destailleur
28752ddca4 Fix concat 2021-08-28 15:19:54 +02:00
Laurent Destailleur
82eb118583
Merge pull request #18530 from FHenry/dev_more_inv_task_comment 
add hidden option to display date and duration in invoice generation from task time spent
 2021-08-28 15:15:21 +02:00
Laurent Destailleur
3d72a21396 Clean code 2021-08-28 03:09:41 +02:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +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
Florian HENRY
b492d49908 add hidden option to display date and duration in invoice generation from task time spent 2021-08-27 17:27:05 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
stickler-ci
601cc865fb Fixing style errors. 2021-08-25 10:54:09 +00:00
GurvanKervern
15445e9bba Fix undef vars 7 
To remove PHP8 warnings
 2021-08-25 18:50:05 +08:00
Florian HENRY
5e795e74d7 NEW: date filter on project list and task list From->To 2021-08-25 12:48:32 +02:00
Florian HENRY
03b04bea08 NEW: date filter on project list and task list From->To 2021-08-25 12:46:56 +02:00
Alexandre SPANGARO
01a6d8296e NEW Task - Add From/to input on search date 2021-08-25 09:30:52 +02:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +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
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function 
improve forms - buttonsSaveCreate()
 2021-08-24 15:26:03 +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
7af023665f Clean var not defined 2021-08-23 19:37:11 +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
Florian HENRY
1cc04c54ca Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_project_upgrade_external_user_perms_project 2021-08-21 15:29:32 +02:00
Alexandre SPANGARO
af843ed82c Merge branch '14.0' into 14p10 2021-08-20 22:11:42 +02:00
Alexandre SPANGARO
53af4b0076 FIX #18375 SQL Error on tasks statistics 2021-08-20 22:11:26 +02:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
Laurent Destailleur
335e1ff405 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-20 12:45:37 +02:00
Laurent Destailleur
e1dc5b5188 css 2021-08-19 16:12:13 +02:00
Laurent Destailleur
ce5acda635 Fix phpcs 2021-08-03 15:03:41 +02:00
Laurent Destailleur
0058e32207 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-02 19:03:38 +02:00
Laurent Destailleur
eced1c824a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/core/class/html.form.class.php
	htdocs/projet/tasks/time.php
 2021-08-02 18:47:09 +02:00
Laurent Destailleur
d822421e10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/accountancy/tpl/export_journal.tpl.php
	htdocs/projet/tasks/time.php
 2021-08-02 18:31:26 +02:00
Laurent Destailleur
6f449cfd6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 16:33:38 +02:00
Christian Foellmann
b5c30126cb extend the hook getElementList to make $ids in the hooked function 2021-07-29 14:49:41 +02:00
laurantines
f8563ace0d
Fix opp statusbrequires even if PROJECT_USE_OPPORTUNITIES off 
If I modify a project and do not have PROJECT_USE_OPPORTUNITIES enabled, I cannot change the project budget. I get the error message that ErrorOppStatusRequiredIfAmount. However, I do not have the opportunities enabled and it does not make sense for that message to appear when I have not added any opportunities.
 2021-07-28 16:14:38 +02:00
kamel
95ecbb8940 FIX: add include missing file '/core/actions_dellink.inc.php' in project card 2021-07-28 12:05:46 +02:00