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

3480 Commits

Author SHA1 Message Date
Laurent Destailleur
1f9424a4b3 Clean code/options 2022-10-25 11:34:31 +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
330a1199e4 Look and feel v17 2022-10-21 15:08:54 +02:00
Laurent Destailleur
4b50bf9963 Show dates and location on registration page 2022-10-21 14:01:36 +02:00
Laurent Destailleur
1d21d73400 NEW Add date event (!= date project) and location on event organization 2022-10-21 13:19:21 +02:00
Regis Houssin
765e619cee FIX avoid unnecessary multiple calculation (#22637) 2022-10-20 14:47:55 +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
Regis Houssin
514cc76fe2 FIX use propal instead propale 2022-10-16 16:44:34 +02:00
Laurent Destailleur
332df184bf
Merge pull request #22591 from rycks/13.0_19912_add_default_payment_terms_to_invoices 
close #19912 : add default payment terms to invoice
 2022-10-15 10:38:37 +02:00
Eric Seigne
3400db5503 fix #19912: add default informations from customer to new invoices 2022-10-14 22:11:56 +02:00
lvessiller
5ed6b78abb FIX resove conflicts 2022-10-14 09:42:50 +02:00
lvessiller
f71c94ed05 FIX resolve conflicts 2022-10-14 09:33:58 +02:00
Laurent Destailleur
9fa00c1771 Fix trans in comments 2022-10-12 15:29:30 +02:00
Laurent Destailleur
f516a4b052 FIX filter on categories 2022-10-11 03:48:00 +02:00
Laurent Destailleur
92d0dff65d Clean code 2022-10-11 02:40:55 +02:00
fboitel
a50b02857a
Merge branch 'Dolibarr:develop' into NEW#22527-view-message 2022-10-10 17:27:57 +02:00
Laurent Destailleur
ae4f8b23d5 Standardize code for action buttons Delete 2022-10-10 11:39:50 +02:00
Faustin
f85b129cbc NEW #22527: can now view actions in messaging list for projets 2022-10-09 15:16:58 +02:00
Laurent Destailleur
77301c50ee Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-08 02:55:55 +02:00
Laurent Destailleur
92ff6a95f4 CSS 2022-10-06 18:25:01 +02:00
Laurent Destailleur
9677aa2db1 FIX List of contact assigned to project only if not disabled. 2022-10-06 18:18:07 +02:00
Laurent Destailleur
7d27fbcc15 Fix label for menu on dolidroid 2022-10-06 17:36:52 +02:00
ksar
95ce5c19dd
FIX #22482 
Preserve \r\n strings in task notes
 2022-10-06 14:36:53 +02:00
Laurent Destailleur
395312737b
Merge pull request #22406 from aspangaro/17p6 
Use isModEnabled
 2022-10-04 18:01:59 +02:00
Laurent Destailleur
51c299ffbb NEW Add hidden option MAIN_EMAIL_SUPPORT_ACK 2022-10-01 13:26:11 +02:00
Alexandre SPANGARO
a44dcdb562 Use isModEnabled 2022-09-25 22:57:35 +02:00
Alexandre SPANGARO
43625c2061 Use isModEnabled 2022-09-25 06:26:20 +02:00
Alexandre SPANGARO
e707f1c03c Use isModEnabled 2022-09-25 06:18:41 +02:00
Alexandre SPANGARO
5d19588037 Use isModEnabled 2022-09-25 06:13:47 +02:00
Alexandre SPANGARO
3eba955992 Use isModEnabled 2022-09-25 06:05:35 +02:00
Laurent Destailleur
a87aa30e75 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-23 18:53:18 +02:00
Regis Houssin
4f6cf3f067 FIX missing check if category module is enabled 2022-09-23 11:46:55 +02:00
Laurent Destailleur
d314ed380b NEW Can edit property css, cssview, csslist on extrafields 2022-09-22 13:01:11 +02:00
Laurent Destailleur
6fb9a4713c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-21 01:30:40 +02:00
Laurent Destailleur
f3f3b952e9 Fix label 2022-09-19 18:57:39 +02:00
Laurent Destailleur
08aa34b8db Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-15 18:31:45 +02:00
Laurent Destailleur
e0e9701830 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-15 18:30:42 +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
Atm-Gregr
7d4c7e0f6b stickler 2022-09-13 14:28:57 +02:00
Atm-Gregr
4f9c273c64 retours 2022-09-13 14:19:28 +02:00
Atm-Gregr
527cfadf0f nl2br like on the card 2022-09-12 16:31:00 +02:00
Atm-Gregr
3c5f3f7b85 fix 2022-09-12 16:28:06 +02:00
Laurent Destailleur
45c9e6064e FIX #yogosha12439 Remove define('NOCSRFCHECK', '1') 2022-09-12 12:47:00 +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
Laurent Destailleur
cf887dba16
Merge pull request #22075 from grandoc/new_branch_04_09_2022 
update code
 2022-09-09 18:03:43 +02:00
Laurent Destailleur
7a277d9560
Merge branch 'develop' into loaddolibarrenv 2022-09-09 17:02:05 +02:00
lmarcouiller
86d777009e fix : scrutinaizer report 2022-09-09 11:09:53 +02:00
Frédéric France
63195e0ca3 fix license 2022-09-07 20:21:01 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Philippe GRAND
94a646103d update code 2022-09-04 13:32:12 +02:00
Frédéric France
bb58f3a18f use isModEnabled 2022-08-31 22:38:53 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Frédéric France
e71692e745 fix php8 warnings 2022-08-31 22:02:31 +02:00
Frédéric France
fc01cc66cd fix php8 warnings 2022-08-31 21:55:55 +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
Philippe GRAND
0632855be6 update code 2022-08-29 09:29:11 +02:00
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