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

2568 Commits

Author SHA1 Message Date
Laurent Destailleur
12e847ade1 Fix color of reports. Fix include_once into include. 2021-04-06 22:18:32 +02:00
kamel
c44522594a FIX: Fix when add or modify ressources on events with duplicate entries 2021-04-06 16:04:30 +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
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
Laurent Destailleur
ce5bea7b34 FIX #yogosha5751 2021-03-29 22:43:39 +02:00
Florian HENRY
a8b486c7b9 fix error translation 2021-03-26 19:00:56 +01:00
Laurent Destailleur
a1366da130 FIX #yogosha5715 2021-03-23 03:45:17 +01:00
Laurent Destailleur
e06b8bb586 Look and feel v14 2021-03-23 03:20:23 +01:00
Laurent Destailleur
ca1715df96 Add some protection for SQL injection 2021-03-22 13:31:06 +01:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00
Laurent Destailleur
1e402f9ea2
Merge pull request #16754 from frederic34/patch-13 
fix php8 warnings
 2021-03-17 16:55:54 +01:00
Laurent Destailleur
9cbb2e8d42
Merge pull request #16755 from frederic34/patch-14 
fix php7 php8 warning
 2021-03-17 16:52:07 +01:00
Laurent Destailleur
8de1b4c94e Factorize code 2021-03-17 11:34:19 +01:00
Frédéric FRANCE
11a6961c13
fix php8 warning 2021-03-16 23:02:28 +01:00
Frédéric FRANCE
ff690861c4
fix php8 warnings 2021-03-16 22:50:14 +01:00
Laurent Destailleur
e00e6cfd9a
Merge pull request #16721 from aspangaro/14a25 
Translation "Generated documents"
 2021-03-16 10:25:31 +01:00
Alexandre SPANGARO
6960f0dc25 Uniformize translation 2021-03-16 04:22:55 +01:00
Alexandre SPANGARO
4fd24c6855 Translation "Generated documents" 2021-03-16 04:04:18 +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
a46bbb83f8
Merge pull request #16678 from frederic34/patch-32 
fix php8 warnings
 2021-03-15 10:54:23 +01:00
Frédéric FRANCE
5d99dfea50
fix php8 warning 2021-03-15 08:08:05 +01:00
Frédéric FRANCE
1e85e8f37d
fix php8 warnings 2021-03-15 00:53:34 +01:00
Frédéric FRANCE
67abd6d1d6
go back actioncomm create after create project 2021-03-12 17:05:11 +01:00
Florian HENRY
862926316a working on list 2021-03-11 19:09:42 +01:00
Laurent Destailleur
c3a047ee06 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
 2021-03-08 19:31:47 +01:00
Laurent Destailleur
2f0c4038fb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
	htdocs/compta/sociales/card.php
	htdocs/societe/consumption.php
 2021-03-08 19:27:34 +01:00
Frédéric FRANCE
c0c9ac439f
Update api_agendaevents.class.php 2021-03-08 00:23:05 +01:00
Frédéric FRANCE
45189de496
Update api_agendaevents.class.php 2021-03-08 00:16:28 +01:00
Florian HENRY
6844c57413 fix sql 2021-03-04 07:53:32 +01:00
Florian HENRY
ec52ed445c fix ambigous 2021-03-03 22:18:42 +01:00
Florian HENRY
04c6d5dd8f fix sql 2021-03-03 22:16:35 +01:00
Florian HENRY
91b93ac7ce fix sql 2021-03-03 22:10:17 +01:00
Florian HENRY
9c256ab8a8 fix review 2021-03-03 21:40:37 +01:00
Florian HENRY
4e2f929460 test 2021-03-03 21:11:04 +01:00
Florian HENRY
55e9a6596b test 2021-03-03 21:10:50 +01:00
Florian HENRY
1913564b38 fix travis 2021-03-03 16:28:14 +01:00
stickler-ci
e28f844d54 Fixing style errors. 2021-03-02 21:31:48 +00:00
Florian HENRY
e5e3abd685 class conference or booth or and table actioncomm ok 2021-03-02 22:23:54 +01:00
Florian HENRY
6862c206aa merge from develop 2021-03-02 21:48:35 +01:00
Florian HENRY
32ef55cd9e working default status/percent for event actioncomm 2021-03-01 20:58:02 +01:00
Florian HENRY
b5fd3e4984 on going 2021-03-01 17:06:03 +01:00
Laurent Destailleur
9cf4222d3a Look and feel v14 2021-02-27 17:15:40 +01:00
stickler-ci
eca98237f0 Fixing style errors. 2021-02-27 13:57:52 +00:00
Florian HENRY
eb17ae5fe2 fix event type select 2021-02-27 14:13:42 +01:00
Florian HENRY
bf04a8cf1b ongoing 2021-02-27 13:35:16 +01:00
Frédéric FRANCE
5931051c88
code syntax comm directory 2021-02-23 18:59:19 +01:00
Laurent Destailleur
2be6992916 Fix include_once into include for inc.php file. See comment in #16338 2021-02-19 16:10:19 +01:00
Laurent Destailleur
485dd07f67 NEW Can show the holidays on the agenda view. 2021-02-18 23:13:55 +01:00
Laurent Destailleur
acc3915576 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-18 17:08:27 +01:00
Laurent Destailleur
27818b68ae Fix tz pb in week view 2021-02-18 17:07:39 +01:00
Laurent Destailleur
2afc85cb88 Fix navigation link in agenda views 2021-02-18 16:35:38 +01:00
Laurent Destailleur
72e4c00760 Fix showifmore 2021-02-18 16:13:30 +01:00
Laurent Destailleur
041a7f54e3 Fix cursor 2021-02-18 16:10:46 +01:00
Laurent Destailleur
b607ed6259 Look and feel v14 2021-02-18 15:58:38 +01:00
Laurent Destailleur
76a729147c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-18 15:42:38 +01:00
Laurent Destailleur
9d12aeee49 Fix timezone problem with drag and drop 2021-02-18 15:41:52 +01:00
Laurent Destailleur
72ad47c75f Fix link to create a new event in calendar 2021-02-18 15:20:05 +01:00
Laurent Destailleur
2904cc803f Fix selection in combo 2021-02-18 13:56:13 +01:00
Laurent Destailleur
56d2ac274a NEW Support color of type of event 2021-02-18 12:46:42 +01:00
Laurent Destailleur
fc9d6cef97 Enhancement Auto and manual calendar. Better separation. 2021-02-18 11:16:36 +01:00
Laurent Destailleur
9e16cd5b77 Look and feel v14 2021-02-14 20:47:57 +01:00
Laurent Destailleur
66c7770146 Factorize some common code for type of event 2021-02-14 20:12:43 +01:00
Laurent Destailleur
45789ec21c Fix TZ problems 
Conflicts:
	htdocs/core/lib/company.lib.php
 2021-02-07 19:47:33 +01:00
Laurent Destailleur
8c71c8335e Fix TZ problems 2021-02-07 19:44:22 +01:00
Laurent Destailleur
7b72ac5a7a Look and feel v14 2021-02-06 12:10:27 +01:00
Laurent Destailleur
6e7e8d7d36 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	test/phpunit/CodingPhpTest.php
 2021-02-03 23:26:08 +01:00
Laurent Destailleur
d608a46c95 Fix dates 2021-02-03 22:47:35 +01:00
Laurent Destailleur
f301635681 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2021-02-03 21:02:32 +01:00
Laurent Destailleur
3798892fd3 FIX Hide/Unhide external ICSS calendars 2021-02-03 19:53:28 +01:00
Laurent Destailleur
2e9656a5b2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formactions.class.php
	htdocs/filefunc.inc.php
 2021-02-02 03:26:20 +01:00
Laurent Destailleur
daf88944f8 FIX #16118 Timezone problem on some fields 2021-02-02 00:19:41 +01:00
Laurent Destailleur
7de4e622a9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-31 19:12:26 +01:00
Laurent Destailleur
7ffa9c6d99 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2021-01-31 19:11:34 +01:00
Paul Vincent M. Ancajas
d80709a7b9 Fix/FIX: making sure the return agenda is only specific to user 2021-02-01 01:41:19 +08:00
stickler-ci
726e0ceff0 Fixing style errors. 2021-01-31 08:16:59 +00:00
Paul Vincent M. Ancajas
80714d8d6d Fix/FIX: Show notification in Event box of user in his dashboard if assigned by others 2021-01-31 16:09:35 +08:00
Laurent Destailleur
e5b4c76a26 Fix combo to select action status 2021-01-28 19:38:47 +01:00
Laurent Destailleur
aaddda9a6e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/user/class/usergroup.class.php
 2021-01-14 14:13:08 +01:00
Laurent Destailleur
75323859e4 Add some hooks to add new buttons (compensation of removal of tabs). 2021-01-12 13:58:16 +01:00
Laurent Destailleur
ba68c958e1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 19:12:57 +01:00
Laurent Destailleur
8dc4e5929c Fix var not defined 2021-01-05 12:43:57 +01:00
Laurent Destailleur
8baa4c67ae Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-04 12:34:09 +01:00
Laurent Destailleur
b0738643fb FIX Solve problem with TZ 2021-01-03 18:42:45 +01:00
Laurent Destailleur
645b7694c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/db/DoliDB.class.php
 2021-01-03 15:26:31 +01:00
Laurent Destailleur
8ad5dc81de GETPOST 2021-01-03 15:13:29 +01:00
Florian HENRY
d3bdb72cc8 finish 2020-12-24 15:03:12 +01:00
Florian HENRY
f03574d061 bank ok 2020-12-24 14:56:26 +01:00
Florian HENRY
79fe5ee34c actioncomm ok 2020-12-24 14:35:40 +01:00
Laurent Destailleur
d65dc85a10 FIX for php 8 2020-12-23 19:16:25 +01:00
Laurent Destailleur
a5d2e04dea Debug v13 2020-12-12 19:09:07 +01:00
Laurent Destailleur
697ca3e4f5 Fix selection of duration type 2020-12-11 02:23:43 +01:00
Laurent Destailleur
769a8886b9 Debug notification on events 2020-12-08 20:32:37 +01:00
Laurent Destailleur
bfa813e1b0 Load langs 2020-12-08 20:16:41 +01:00
Laurent Destailleur
240648d540 css 2020-12-08 17:09:48 +01:00
Laurent Destailleur
5bd6d6f388 Look and feel v13 2020-12-03 14:34:15 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00
Laurent Destailleur
00ad6df395 Fight against $_POST 2020-11-30 14:47:07 +01:00
Laurent Destailleur
f046673d80
Merge pull request #15485 from frederic34/patch-8 
The variable does not seem to be defined for all execution path
 2020-11-23 22:07:49 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel" 
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
 2020-11-23 15:12:52 +01:00
Frédéric FRANCE
b3350e033a
The variable does not seem to be defined for all execution path 2020-11-22 20:36:05 +01:00
Laurent Destailleur
fe0764be6e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/expedition/class/expedition.class.php
	htdocs/product/class/product.class.php
 2020-11-22 02:32:47 +01:00
Laurent Destailleur
a30e842521 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-21 23:48:34 +01:00
Laurent Destailleur
60bfbe2e57
Merge pull request #15448 from Givriz/dev 
Feature : creation of a "button-save" class
 2020-11-21 23:44:30 +01:00
Laurent Destailleur
9004be1df2 Debug feature to send remind by email 2020-11-21 17:42:07 +01:00
Laurent Destailleur
bf94ce6aad Fix warnings 2020-11-21 16:49:54 +01:00
Laurent Destailleur
3534555909 Fix setup of scheduled jobs 2020-11-21 14:14:53 +01:00
Givriz
c48129e279 Ajout de la class "button-save" 
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
 2020-11-19 20:23:38 +01:00
quentin
6ce006f853 FIX cant empty action comm desc 2020-11-16 15:46:16 +01:00
Frédéric FRANCE
f375640350
Update cactioncomm.class.php 2020-11-11 23:24:09 +01:00
bahfir abbes
078a60bac5 fix:initialize ref with id value 2020-11-06 00:41:49 +01:00
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Laurent Destailleur
e42dee3c8e
Merge pull request #15224 from frederic34/apiclean 
doxygen
 2020-10-31 04:24:53 +01:00
Laurent Destailleur
44f532e1da Fix look and feel v13 2020-10-31 03:50:16 +01:00
Frédéric FRANCE
8190711342
doxygen 2020-10-30 18:01:01 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
ef182bed07 Fix browser reminder 2020-10-18 14:00:47 +02:00
Laurent Destailleur
547b3602cc FIX refresh of tasks combo must use an ajax page not a full html page 2020-10-17 21:14:19 +02:00
Laurent Destailleur
a9521b13f9 FIX Assignement of event to create when created from view per user. 2020-10-17 19:52:23 +02:00
Laurent Destailleur
7b20e703ee Clean code 2020-10-17 15:53:31 +02:00
Laurent Destailleur
e3552e7e02 Clean code 2020-10-16 20:17:54 +02:00
Laurent Destailleur
7c67dbf6d5 Better responsive 2020-10-13 10:05:47 +02:00
Laurent Destailleur
813deee4a5 Fix phpcs 2020-10-02 01:14:43 +02:00
Laurent Destailleur
ed69b6ad15
Merge pull request #14863 from bomuux/patch-2 
Bug: ActionComm::ref_ext is not saved properly
 2020-10-01 19:21:28 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
bomuux
9ed6092ed8
Bug: ActionComm::ref_ext is not saved properly 
ActionComm::ref_ext is considered to be a timestamp in ActionComm::create(), (but not in ActionComm::create()).
Correction to consider it a string.
 2020-09-29 19:56:22 +02:00
Laurent Destailleur
708ac91a39
Merge pull request #14825 from atm-greg/fix_notification_system 
Fix notification system
 2020-09-29 14:13:33 +02:00
atm-greg
a61f79c039 only update reminders if event is not past 2020-09-29 14:10:24 +02:00
atm-greg
1ed6312f4b add modification of the notifications 2020-09-29 14:08:49 +02:00
atm-greg
988a532bed fix br 2020-09-28 16:37:17 +02:00
Laurent Destailleur
3c6dda9dd5 Clean code 2020-09-25 10:27:30 +02:00
atm-greg
554948d3e2 bad user for getNomUrl 2020-09-24 15:34:52 +02:00
atm-greg
5244c05abb reminders in the future can be displayed too 2020-09-24 15:30:29 +02:00
atm-greg
b269af5bf6 delete reminders on ActionComm::delete 2020-09-24 15:26:35 +02:00
atm-greg
e6eff6511e fix reminder offsetunit and display problems 2020-09-24 15:20:30 +02:00
atm-greg
101405b052 fix notification creation => must create for every user linked to the event 2020-09-24 12:31:28 +02:00
Tobias Sekan
a72519f353
Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-23 09:09:42 +02:00
Laurent Destailleur
b3dd51b790 Fix warnings 2020-09-20 16:46:29 +02:00
Laurent Destailleur
216b3c885d Fix escaping 2020-09-20 01:30:36 +02:00
Laurent Destailleur
c191dd1a34 Fix escaping 2020-09-19 23:27:11 +02:00
Tobias Sekan
b2a953ed5b
Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-18 12:21:41 +02:00
Sekan, Tobias
eac9e54e0b fix more different button visibility 2020-09-18 11:48:53 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Laurent Destailleur
bd577e253a Fix phpcs 2020-09-14 22:31:57 +02:00
Laurent Destailleur
cf423add2e Reminders visible on edit page too 2020-09-14 21:09:48 +02:00
Laurent Destailleur
59c10235b5 Show reminders on the event page 2020-09-14 21:06:40 +02:00
Laurent Destailleur
f626bd70d0 Look and feel v13 2020-09-14 20:53:42 +02:00
Scrutinizer Auto-Fixer
73915d51c8 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-14 02:30:04 +00:00
Laurent Destailleur
f45054df06 Close #14604 Merge manually change to get notification to show 
Remains: support call of the action=closereminderid done by browser once
notif has be thrown.
 2020-09-12 03:02:08 +02:00
Laurent Destailleur
3930b00e4d Debug a not used page to show agenda per type of event 2020-09-11 14:35:52 +02:00
Laurent Destailleur
c4383747a1 Look and feel v13 2020-09-11 13:57:16 +02:00
Scrutinizer Auto-Fixer
c263c8a76c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-08 19:27:28 +00:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 08:18:17 +00:00
Laurent Destailleur
7094cec42a Fix use same duration code 'on 1 letter' than the production duration 
record, also than tha sprintf.
 2020-09-04 14:37:55 +02:00
Laurent Destailleur
07fc85c222 Fix minor 2020-09-04 12:25:16 +02:00
Laurent Destailleur
1408c862f6 css 2020-09-03 21:23:58 +02:00
Laurent Destailleur
aafe323405 css 2020-09-03 19:11:56 +02:00
Laurent Destailleur
3f243aa457
Merge pull request #14622 from kev-73/develop 
NEW: add week number for month view in agenda
 2020-09-03 19:02:59 +02:00
kev-73
38ed033b8a
New: add week number for month view in agenda 
Agenda, view by month : add a column on left side of agenda, which containt the week number for each line, so for each week. Column width at 2%, no change for width of others columns, because with 14% by defalut, so 14*7=98, the 2% for new column is available. For get date and week number, use fonctions and variables already define in file.
 2020-09-03 14:03:40 +02:00
Laurent Destailleur
5af1eff2d9 Fix phpcs 2020-09-03 10:46:46 +02:00
Laurent Destailleur
31548c6fbb Better error message 2020-09-02 21:42:29 +02:00
Laurent Destailleur
f642fc9ad9 Fix 2020-09-02 21:40:17 +02:00
Laurent Destailleur
ed743c9dbb Fix phpcs 
More secured sendEmailsReminder()
 2020-09-02 21:39:22 +02:00
Laurent Destailleur
6d52721246
Merge pull request #14609 from atm-lena/NEW_AddDefaultMailModelToSelect_EventReminder 
Event Reminder : Add "Default Mail Model" to select Mail Model
 2020-09-02 18:08:40 +02:00
Laurent Destailleur
2a4f0fc034 Fix backto link 2020-09-02 16:37:02 +02:00
atm-lena
7b91c8efc8 Event Reminder : Add "Default Mail Model" to select Mail Model 2020-09-02 09:58:55 +02:00
Laurent Destailleur
e4557b3dd3 Responsive 2020-09-01 23:04:29 +02:00
Laurent Destailleur
619a9a3679 Look and feel v13 2020-09-01 22:53:49 +02:00
Laurent Destailleur
8e02d39cb3 Fix prefill of end date when event type is rendez-vous 2020-09-01 22:44:03 +02:00
Laurent Destailleur
a424515835
Merge pull request #14596 from atm-lena/NEW_AgendaEvent_Remind_Part2 
Agenda Remind (Part 2 & 3)
 2020-09-01 15:33:52 +02:00
Laurent Destailleur
a626b252bd
Optimize code 2020-09-01 15:33:02 +02:00
atm-lena
1b225706db FIX create remind : dateremind save 2020-09-01 14:48:03 +02:00
stickler-ci
763515a4ca Fixing style errors. 2020-09-01 08:17:19 +00:00
atm-lena
86c6ef23e3 Errors management v2 2020-09-01 10:05:55 +02:00
atm-lena
b747f6285e Errors management 2020-09-01 10:01:59 +02:00
atm-lena
d2ed43d913 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2 2020-09-01 09:43:14 +02:00
atm-lena
13f91f1de8 FIX getEmailTemplat() in sendEmailsReminder() reminder function 2020-09-01 09:41:59 +02:00
Laurent Destailleur
b69a992324 Fix option AGENDA_SUPPORT_PRIORITY_IN_EVENTS 2020-09-01 04:29:57 +02:00
Laurent Destailleur
e353d4a42d Add tooltip if label truncated 2020-09-01 03:59:57 +02:00
atm-lena
f8c79db4a9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2 2020-08-31 14:14:27 +02:00
Laurent Destailleur
e030b2089a Look and feel v13 2020-08-30 13:14:28 +02:00
Laurent Destailleur
8adf1852b1 Clean code 2020-08-30 03:00:35 +02:00
Laurent Destailleur
6293f76692 Debug 2020-08-29 06:17:26 +02:00
Laurent Destailleur
bca9a84710 Enhance autofill of end date when creating an event 2020-08-29 06:05:52 +02:00
Laurent Destailleur
b721930b3b
Merge pull request #14568 from atm-lena/NEW_AgendaEvent_Remind 
Agenda Remind (Part 1)
 2020-08-29 05:19:21 +02:00
Laurent Destailleur
82f93fed92 css 2020-08-29 03:52:27 +02:00
Laurent Destailleur
ad87e753b4 Clean trim on GETPOST (already included inside GETPOST when not 'none' 2020-08-28 21:27:50 +02:00
atm-lena
6562334f7b FIX sendEmailsReminder() function 2020-08-28 09:37:18 +02:00
Laurent Destailleur
9f8d1f0e63
Merge pull request #14520 from TobiasSekan/ShowUserOnExternalCalenderEvents 
NEW Show user on external calender events (when found)
 2020-08-27 20:10:13 +02:00
Laurent Destailleur
0309510ab8 Fix avoid duplicate event recorded from email collector 2020-08-27 18:50:08 +02:00
atm-lena
c0f254d10c Translation + decode 2020-08-27 16:03:25 +02:00
atm-lena
e3ce3cbb7c Function sendEmailsReminder() 2020-08-27 15:49:56 +02:00
atm-lena
f57325237a WIP : sendEmailsReminder() 2020-08-27 12:30:59 +02:00
atm-lena
5856033892 Replace "agenda_send" and "event_push" to "actioncomm_send" 2020-08-27 11:15:08 +02:00
stickler-ci
b0fe7bc2e0 Fixing style errors. 2020-08-27 08:47:57 +00:00
atm-lena
4ef2644300 Use date.lib.php functions 2020-08-27 10:29:23 +02:00
atm-lena
9d1fc28eba Fix type reminder "push" to "browser" 2020-08-27 09:35:02 +02:00
atm-lena
bbc554070c Fix 2020-08-27 09:33:40 +02:00
atm-lena
6a60228bc3 Translation 2020-08-26 17:11:32 +02:00
atm-lena
efe60ebc58 Error management 2020-08-26 17:02:34 +02:00
atm-lena
cc29654f47 WIP : rename fk_project to fk_actioncomm + add line to sql file to install 2020-08-26 16:48:09 +02:00
atm-lena
a01d1b58c7 Add fk_email_template 2020-08-26 16:06:20 +02:00
atm-lena
cf9337b644 Add fk_project to actioncommreminder object 2020-08-26 15:58:14 +02:00
atm-lena
c10556473f Clean 2020-08-26 15:35:12 +02:00
atm-lena
552e655668 Add field "entity" in actioncommrminder object and table 2020-08-26 15:22:32 +02:00
atm-lena
2fb5824836 Calcul date of reminder for event create 2020-08-26 15:12:08 +02:00
atm-lena
d3ac39589a WIP 2020-08-26 12:48:12 +02:00
atm-lena
42f492877e WIP 2020-08-26 11:36:32 +02:00
atm-lena
3046556d7b Add checkbox "AddReminder" 2020-08-26 11:19:14 +02:00
atm-lena
a4018f41f7 WIP 2020-08-26 10:52:36 +02:00
atm-lena
7df993c7ed Add "select_model_mail" function + add select to create event 2020-08-25 17:26:32 +02:00
atm-lena
94b2f3c5e1 Add $conf conditions 2020-08-25 12:57:36 +02:00
atm-lena
25840c2b3d Create Event - Add fields 2020-08-25 12:40:29 +02:00
Sekan, Tobias
a7895f3496 Merge branch 'ShowUserOnExternalCalenderEvents' of https://github.com/TobiasSekan/dolibarr into ShowUserOnExternalCalenderEvents 2020-08-25 12:20:10 +02:00
Sekan, Tobias
4c851884e5 Address feedback 2020-08-25 12:16:44 +02:00
Laurent Destailleur
d23e83779f
Merge branch 'develop' into ParseTranspAndPrioFromExternalCalendar 2020-08-23 18:21:18 +02:00
Laurent Destailleur
053aa1b750
Merge pull request #14509 from TobiasSekan/ShowLocationOnImportCalenderEvents 
NEW Show place from events on import calender
 2020-08-23 18:11:02 +02:00
Laurent Destailleur
a265bec7ca NEW Events in agenda for contact 
FIX Saving contacts of an events
 2020-08-23 02:38:56 +02:00
stickler-ci
183013e9ed Fixing style errors. 2020-08-21 12:02:03 +00:00
Sekan, Tobias
9af5354dfe Parse priority and transparency from external calender events 2020-08-21 13:57:03 +02:00
stickler-ci
61cce2e700 Fixing style errors. 2020-08-21 06:46:00 +00:00
Sekan, Tobias
22ff5a320f fix not working external calender on/off 2020-08-21 08:40:23 +02:00
Sekan, Tobias
bb1452917b fix wrong event percentage 2020-08-21 08:33:19 +02:00
Sekan, Tobias
ba98db934d Show user on external calender events 2020-08-21 08:18:26 +02:00
Laurent Destailleur
ad0625b6ec Debug posting message from ticket page 2020-08-21 01:11:22 +02:00
Sekan, Tobias
546571a6f8 Show place from events on import calender 2020-08-20 08:20:00 +02:00
Laurent Destailleur
dd86c21382 FIX dolGetElementUrl and agenda page for external modules 2020-07-25 03:01:04 +02:00
Laurent Destailleur
46fccf8eb1 FIX dolGetElementUrl and agenda page for external modules 2020-07-24 11:53:44 +02:00
Laurent Destailleur
8b5f4fe9a6 Fix massaction delete on events 2020-07-11 12:21:53 +02:00
Laurent Destailleur
46119dc786 Fix per user 2020-07-09 12:49:48 +02:00
Laurent Destailleur
b2bd90ae1a Fix link to list of event 2020-07-09 12:33:28 +02:00
Laurent Destailleur
9592fdb3fc CSS 2020-07-09 11:55:16 +02:00
Laurent Destailleur
1dfd2d565b FIX Reposition and nav 2020-07-08 18:18:47 +02:00
Laurent Destailleur
96d935832c FIX Reposition and nav 2020-07-08 18:18:08 +02:00
Laurent Destailleur
5ea47f3ade Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/resultat/index.php
	htdocs/product/admin/product.php
	htdocs/projet/tasks/list.php
 2020-07-08 18:11:58 +02:00
Laurent Destailleur
96729769f7 Standardize Agenda view 2020-07-08 18:06:14 +02:00
Laurent Destailleur
f72a836231 Fix look and feel v12 2020-07-06 16:59:25 +02:00
Laurent Destailleur
3939a640e9 Fix note in creation 2020-07-06 16:52:28 +02:00
Laurent Destailleur
90d4458aab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2020-06-27 00:38:51 +02:00
Laurent Destailleur
29ba9c82c3 Fix #14120 2020-06-26 17:17:13 +02:00
Laurent Destailleur
333d4873c3 Properties ->contactid has been renamed into ->contact_id 2020-06-25 12:17:47 +02:00
Laurent Destailleur
18c23680f7 Fix bad object 2020-06-25 12:17:06 +02:00
Laurent Destailleur
501fd2f7a3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/admin/receipt.php
 2020-06-21 20:48:41 +02:00
Laurent Destailleur
bb3320f103 FIX #14104 2020-06-20 18:34:19 +02:00
Laurent Destailleur
90b5ed9908 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/website.lib.php
 2020-06-11 23:41:35 +02:00
Laurent Destailleur
e94ef09977 css 2020-06-10 22:24:15 +02:00
Laurent Destailleur
8dbc0ff040 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/prelevement.php
	htdocs/admin/system/phpinfo.php
	htdocs/modulebuilder/index.php
 2020-05-31 00:31:14 +02:00
Laurent Destailleur
94e02269ee Fix: missing fk_project 2020-05-31 00:20:01 +02:00
Laurent Destailleur
ddebe1bbba FIX Missing ref into popup 2020-05-30 23:52:47 +02:00
Laurent Destailleur
02bf646abe FIX Missing ref into popup 2020-05-30 23:51:02 +02:00
stickler-ci
029f5570e5 Fixing style errors. 2020-05-28 12:55:29 +00:00
Supermanu
0baea21947 NEW Add mass deletion for events 
Only users with the right `allactions->delete` will be able to mass delete.
 2020-05-28 14:45:54 +02:00
Supermanu
721b99bb2f Add calendar selection for agenda view 2020-05-28 11:24:37 +02:00
Frédéric FRANCE
5c78eca68a
prepare new rule 2020-05-23 21:14:44 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule 2020-05-23 21:07:47 +02:00
stickler-ci
66637ba0b6 Fixing style errors. 2020-05-23 16:39:06 +00:00
Frédéric FRANCE
2085ac73e7
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:34:58 +02:00
Laurent Destailleur
4e3fbb9d05
Merge pull request #13912 from TobiasSekan/NewEventMassactionPercent 
NEW mass-actions for the event list view
 2020-05-23 14:26:51 +02:00
Laurent Destailleur
7397806ae7
Update actioncomm.class.php 2020-05-23 14:26:28 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule 2020-05-21 01:41:27 +02:00
Laurent Destailleur
92cbff7749 Clean code 2020-05-20 23:40:04 +02:00
stickler-ci
f0bb7d233f Fixing style errors. 2020-05-19 06:29:23 +00:00
Tobias Sekan
7fd6151c43
Add massactions for event list 2020-05-19 08:18:38 +02:00
Tobias Sekan
223224d12c
Add function to update the event percent + const 2020-05-19 08:07:21 +02:00
Laurent Destailleur
ff8d22a80d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	scripts/cron/cron_run_jobs.php
 2020-05-18 15:57:01 +02:00
Laurent Destailleur
9336828710 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/card.php
	htdocs/expedition/class/expedition.class.php
 2020-05-18 15:54:39 +02:00
Laurent Destailleur
45345440a4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	scripts/cron/cron_run_jobs.php
 2020-05-18 15:50:36 +02:00
Maxime Kohlhaas
cf96383bf9 Fix : entity was missing in actioncomm fetch 2020-05-18 10:44:55 +02:00
Laurent Destailleur
4584fa1aa6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/asset/list.php
	htdocs/compta/bank/list.php
	htdocs/contrat/services_list.php
	htdocs/core/lib/date.lib.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/holiday/list.php
	htdocs/projet/tasks/list.php
	htdocs/supplier_proposal/list.php
	htdocs/user/list.php
 2020-05-11 19:43:06 +02:00
Laurent Destailleur
42ee755ea5 Look and feel v12 2020-05-08 02:52:55 +02:00
Maxime Kohlhaas
1a9afe6b20 Fix missing hook params for printFieldListValue 2020-05-08 01:40:25 +02:00
Laurent Destailleur
206b16410e Revert the option to avoid to introduce a feature that is duplicate with 
already existing view "Events/Agenda". It also keeps a common behaviour
between other tools.
Maxi debug on messages of tickets
 2020-05-07 22:52:32 +02:00
Laurent Destailleur
1c70e49695
Merge branch 'develop' into 12.0_a23 2020-04-27 14:14:13 +02:00
Laurent Destailleur
9679b1f04c
Merge pull request #13704 from frederic34/actioncomm_note 
actioncomm note deprecated
 2020-04-23 18:52:56 +02:00
Laurent Destailleur
72c6ac1c72 Complete #13708, normalization of code 2020-04-23 13:21:39 +02:00
Frédéric FRANCE
177008ab65
actioncomm note deprecated 2020-04-23 00:45:33 +02:00
Frédéric FRANCE
4220d6b253
actioncomm note deprecated 2020-04-23 00:38:42 +02:00
Laurent Destailleur
16e46c672c Clean code 2020-04-20 15:06:27 +02:00
Scrutinizer Auto-Fixer
387ea73bf3 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-13 11:24:42 +00:00
Laurent Destailleur
96d087c99d Fix clean event report 2020-04-13 02:59:33 +02:00
Laurent Destailleur
92b6b1a042 Look and feel v12 2020-04-12 18:13:43 +02:00
stickler-ci
a873afdad9 Fixing style errors. 2020-04-12 15:08:44 +00:00
Laurent Destailleur
51f73526f9
Merge branch 'develop' into patch-8 2020-04-12 17:07:57 +02:00
Laurent Destailleur
fe4cd2e7bc
Update actioncomm.class.php 2020-04-12 17:05:12 +02:00
Laurent Destailleur
422e33a68b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ihm.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/stats/cabyprodserv.php
	htdocs/filefunc.inc.php
	htdocs/takepos/invoice.php
 2020-04-12 17:01:44 +02:00
Laurent Destailleur
1cda760621 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2020-04-12 16:54:09 +02:00
Laurent Destailleur
eebf48b27c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2020-04-12 16:52:58 +02:00
Frédéric FRANCE
e2660fd31c
Update actioncomm.class.php 2020-04-11 22:38:28 +02:00
Frédéric FRANCE
88f18ec3ce
can't remove actioncomm if there is a category 2020-04-11 22:24:50 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
1adee36314 Upgrade to font awesome 5.13 2020-04-07 21:11:18 +02:00
Laurent Destailleur
ff1b3db54b Fix regression on hamburger picto 2020-04-06 23:38:30 +02:00
Alexandre SPANGARO
e6d9f7885c Work on split module fournisseur 2020-03-24 21:22:20 +01:00
Laurent Destailleur
a5379c7144 FIX All forms must use newToken() 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/cashcontrol/cashcontrol_card.php
	htdocs/supplier_proposal/card.php
 2020-03-24 13:14:23 +01:00
Laurent Destailleur
1ff15e1fd9 FIX All forms must use newToken() 2020-03-24 13:10:35 +01:00
Scrutinizer Auto-Fixer
e8083e2a65 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-23 14:54:02 +00:00
Alexandre SPANGARO
d5729e6dcc Work on split module fournisseur 2020-03-23 05:53:33 +01:00
Alexandre SPANGARO
e6a59dcdbb Work on split module fournisseur 2020-03-23 05:43:41 +01:00
Alexandre SPANGARO
6e9a07d119 Work on split module fournisseur 2020-03-22 05:33:30 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Laurent Destailleur
895503d2eb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/index.php
	htdocs/core/class/CMailFile.class.php
 2020-02-20 00:21:25 +01:00
Laurent Destailleur
2cfca2a45e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/comm/index.php
	htdocs/core/boxes/box_fournisseurs.php
	htdocs/core/boxes/box_propales.php
	htdocs/societe/index.php
 2020-02-20 00:18:58 +01:00
root
0dcb83e6bf referer XSS patches 2020-02-18 22:31:24 +01:00
VESSILLER
d1e9f3a505 FIX keep assigned users in session when loading projects and tasks 2020-02-18 11:18:00 +01:00
Jamie Slome
2d9162aedb
Merge branch 'develop' into develop 2020-02-17 10:49:41 +00:00
Scrutinizer Auto-Fixer
17010478ba Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-13 09:44:08 +00:00
Laurent Destailleur
74d3912763 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2020-02-11 16:52:58 +01:00
Laurent Destailleur
644b27bcf9 Fix look and feel v11 2020-02-10 13:34:09 +01:00
Laurent Destailleur
b9a8d82b2f FIX Filter on list of events were lost after "Back to list" 2020-02-10 13:29:26 +01:00
Laurent Destailleur
8645fd8946 FIX CVE-2019–17223 FIX #13053 2020-02-09 18:28:57 +01:00
Laurent Destailleur
716f765ce1 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
 2020-02-08 16:00:06 +01:00
Laurent Destailleur
fe0d1a81eb Fix filter on current user is stupi on the view "per user". 2020-02-06 21:16:48 +01:00
Laurent Destailleur
f3597926c4 Fix missing escape returned by ci 2020-02-06 10:05:13 +01:00
oscim
7cc87423e4
ref_ext is not in sql requete for save 
ref_ext is not in sql requete for save
 2020-02-05 22:31:27 +01:00
root
2419f122c4 referer XSS patches 2020-02-03 23:10:04 +00:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
25f0e893ba Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-29 23:49:43 +01:00
Laurent Destailleur
1144b937eb Fix phpcs 2020-01-29 23:34:54 +01:00
Laurent Destailleur
7b10c2440b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-29 23:08:42 +01:00
kadogo
b2610903a4 NEW enable put for agendaevents api 2020-01-29 22:55:44 +01:00
Laurent Destailleur
51d750cb49
Merge pull request #12865 from TobiasSekan/ExportIcalWithHolidays 
New: Export ical with holidays
 2020-01-28 03:19:34 +01:00
Tobias Sekan
ce9d1a320f
Update actioncomm.class.php after review 2020-01-27 08:27:13 +01:00
Laurent Destailleur
27a0858050 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
 2020-01-23 17:41:31 +01:00
Laurent Destailleur
25665daa40 FIX #11957 2020-01-22 14:53:40 +01:00
Laurent Destailleur
f06f15de2e
Merge pull request #12861 from TobiasSekan/ShowHolidaysInAgenda 
New: Show holidays in the agenda view (month, week, day)
 2020-01-22 14:13:55 +01:00
Laurent Destailleur
d3411a79ef Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-22 14:11:44 +01:00
Laurent Destailleur
d87419f3db FIX #11957 2020-01-22 13:34:07 +01:00
stickler-ci
b47e2e8127 Fixing style errors. 2020-01-16 12:55:08 +00:00
Tobias Sekan
651bf8c1fc
Export ical with holidays 2020-01-16 13:49:05 +01:00
stickler-ci
eca59220d8 Fixing style errors. 2020-01-16 09:44:49 +00:00
Tobias Sekan
72e227a543
Add link to leave request for holidays in agenda 2020-01-16 10:37:16 +01:00
Tobias Sekan
bbd7900fc7
Show holidays in agenda 2020-01-16 10:34:45 +01:00
Laurent Destailleur
3f79c00542
Merge branch 'develop' into actioncomm_category 2020-01-15 14:21:06 +01:00
Laurent Destailleur
97f62c68f2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-08 13:38:03 +01:00
Laurent Destailleur
7ef3ee56bd Fix MRP 2020-01-07 20:28:21 +01:00
Laurent Destailleur
6dcba0f053 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-04 14:27:55 +01:00
Laurent Destailleur
38de69f5a9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/list.php
	htdocs/compta/bank/releve.php
	htdocs/compta/salaries/card.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/boxes.lang
	htdocs/langs/en_US/main.lang
	htdocs/product/class/product.class.php
	htdocs/product/reassort.php
	htdocs/product/stock/product.php
	htdocs/projet/element.php
 2020-01-04 14:20:25 +01:00
Laurent Destailleur
afd32135f2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/invoice.php
 2020-01-01 22:37:13 +01:00
Laurent Destailleur
e4a03e98b7 FIX Do not record resource owner of event when not defined. 
More log to track payment errors.
 2020-01-01 12:47:01 +01:00
Laurent Destailleur
d2efe1d427 Fix SQL injection on type parameter in list of events 2019-12-31 17:52:28 +01:00
Frédéric FRANCE
90235d0528
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-31 13:57:40 +01:00
Laurent Destailleur
945296bb55
Merge pull request #12690 from atm-greg/Hook_on_ics_generation 
NEW hook on ics generation to add more events in eventarray
 2019-12-30 22:03:07 +01:00
Laurent Destailleur
dcf07646cc Fix specimen 2019-12-21 14:02:06 +01:00
Laurent Destailleur
19c14f354e Fix specimen 2019-12-21 14:01:40 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
455178ff73 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-18 14:20:36 +00:00
Scrutinizer Auto-Fixer
c8baaa2995 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-16 12:06:25 +00:00
Laurent Destailleur
d17c177251
Merge pull request #12684 from frederic34/hookagendaperuser 
add hook like for per day/week/month
 2019-12-14 13:52:51 +01:00
Laurent Destailleur
835d22f556
Merge branch 'develop' into doxygen_todo 2019-12-14 13:46:40 +01:00
Frédéric FRANCE
57055bad03
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-13 14:36:00 +01:00
Laurent Destailleur
ce47de453e Fix HTML5 2019-12-12 10:31:08 +01:00
Frédéric FRANCE
307bad1d2a
doxygen todo 2019-12-11 19:11:13 +01:00
atm-greg
caaa95da6a hook on ics generation to add more events in eventarray 2019-12-11 15:33:36 +01:00
Frédéric FRANCE
5c59ddb357
add hook like for per day/week/month 2019-12-10 21:11:52 +01:00
Laurent Destailleur
a4272ab947 Debug v11 2019-12-06 09:20:45 +01:00
Frédéric FRANCE
d9bfa62367
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-05 21:47:42 +01:00
Frédéric FRANCE
4c5c6b6ff1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-03 17:56:43 +01:00
Laurent Destailleur
7a1a932755 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/main.inc.php
 2019-12-03 15:03:10 +01:00
Laurent Destailleur
d153918a10 Fix trans 2019-12-03 15:00:52 +01:00
Scrutinizer Auto-Fixer
36a74cd160 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-03 10:17:29 +00:00
Frédéric FRANCE
25ed2b930f
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-01 16:10:37 +01:00
Frédéric FRANCE
35394639a4
The property ownerid does not exist on ActionComm 2019-11-28 22:26:25 +01:00
Frédéric FRANCE
4c4ae5b6e1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-26 08:10:40 +01:00
Laurent Destailleur
e4d9f99484 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/remx.php
	htdocs/expedition/card.php
	htdocs/fourn/facture/card.php
 2019-11-22 15:04:40 +01:00
ptibogxiv
f73bd0e0a6
FIX display job of contact list 
can see différent contact with same name but different job
 2019-11-20 13:07:26 +01:00
Frédéric FRANCE
2e5f539b2a
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-18 17:45:52 +01:00
Laurent Destailleur
2689f7515c Fix pb with colspan and extrafields. 
Fix remove empty id
 2019-11-16 14:38:05 +01:00
Frédéric FRANCE
6784ea9fae
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-16 09:21:57 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:15 +00:00
Laurent Destailleur
f5da126cff Fix property not defined 2019-11-14 12:01:01 +01:00
Frédéric FRANCE
a3e092b227
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-14 09:21:26 +01:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:24 +01:00
Laurent Destailleur
86094613e8
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:06 +01:00
Frédéric FRANCE
3bac051521
use class CONST 2019-11-14 08:07:16 +01:00
Frédéric FRANCE
9040f6d9c7
can tag actioncomm 2019-11-13 21:18:34 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:02 +00:00
Scrutinizer Auto-Fixer
c85e54b08c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-12 08:46:08 +00:00
Laurent Destailleur
cb1e5954f6 Fix regression 2019-11-08 13:10:41 +01:00
Laurent Destailleur
cb3fd5728b Fix color for not busy events 2019-11-08 13:04:49 +01:00
Laurent Destailleur
dc84d7e844 Code comment 2019-11-08 11:29:56 +01:00
Laurent Destailleur
34564ea084
Merge pull request #12381 from TobiasSekan/FixIcalExportAlwaysSameUser 
Fix ICAL export add a user to all events
 2019-11-08 11:26:57 +01:00
Tobias Sekan
3677855ebc
Fix ICAL export add a user to all events 2019-11-07 15:45:34 +01:00
Tobias Sekan
6fdbe8923f
Fix mixed order of events with same time 2019-11-06 10:33:26 +01:00
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Laurent Destailleur
4909a21f8a Fix css 2019-11-03 22:09:20 +01:00
Laurent Destailleur
9c5e17d676
Merge pull request #12214 from homer8173/patch-8 
Implement new now feature
 2019-11-02 15:09:06 +01:00
Laurent Destailleur
93f3b1d2db Clean APIs 2019-11-02 15:05:14 +01:00
Laurent Destailleur
df750b6a9d
Merge pull request #12287 from TobiasSekan/AddAttendeeToIcal 
NEW Add attendee to ical export + cleanup
 2019-11-02 13:40:27 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid 
replace deprecated user->societe_id by user->socid
 2019-11-02 13:34:21 +01:00
Laurent Destailleur
58ffb73627 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-02 12:59:49 +01:00
Laurent Destailleur
45c77b4560 Renaming some libelle into label 2019-11-02 12:59:38 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
1797b49778
Merge pull request #12288 from frederic34/patch-14 
form_select_status_action returns void
 2019-11-02 11:48:07 +01:00
Frédéric FRANCE
bb9b435875
doxygen for actioncomm class 2019-11-01 17:12:07 +01:00
Frédéric FRANCE
400defd93d
form_select_status_action returns void 2019-11-01 15:04:37 +01:00
Sekan, Tobias
0bfff92032 Add attendee to ical export + cleanup 2019-11-01 11:59:54 +01:00
Laurent Destailleur
c215d534fc Fix phpcs 2019-10-31 21:16:41 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
66a288a343
Merge pull request #12235 from frederic34/scopeindent 
clean indent
 2019-10-30 02:57:59 +01:00
Laurent Destailleur
6073692654
Merge pull request #12243 from TobiasSekan/FixEventSortNonNumeric 
Fix non-numeric error in sort event function
 2019-10-30 02:57:00 +01:00
Tobias Sekan
bfe7ad211f
Fix non-numeric error in sort event function 
Fix non-numeric error in sort event function and fix mixed space and tab indent, use spaces
 2019-10-28 09:53:27 +01:00
Frédéric FRANCE
1a10b30a76
clean indent in comm directory 2019-10-26 14:28:40 +02:00
Norbert Penel
a67b3d8cf5
Implement new now feature 
8d75e83e55
 2019-10-24 18:55:43 +02:00
Laurent Destailleur
b88968520b Move code of extrafields to the new architecture 2019-10-22 17:08:37 +02:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces 2019-10-20 17:17:22 +02:00
Laurent Destailleur
b813dfe3c9
Merge pull request #12172 from TobiasSekan/FixMissingIcalAuthor 
Fix missing organizer and contact on ical export
 2019-10-20 13:49:47 +02:00
Laurent Destailleur
89b0730483
Update actioncomm.class.php 2019-10-20 13:49:36 +02:00
Tobias Sekan
28dea51c4a
Fix missing organizer in ical export 2019-10-18 13:18:09 +02:00
Laurent Destailleur
f85899742b
Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
 2019-10-17 17:48:42 +02:00
Laurent Destailleur
1a021e85f6
Merge pull request #12141 from TobiasSekan/FixNoneNumericValue 
Fix non-numeric value encountered on ical export
 2019-10-17 17:39:25 +02:00
Tobias Sekan
daa7f54295
fix - not removed old code line 2019-10-17 08:10:21 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Tobias Sekan
741627897e
fix interchanged allocation 2019-10-16 13:56:11 +02:00
Laurent Destailleur
a57b456aa6
Merge pull request #12143 from frederic34/patch-19 
NEW Add location into event tooltip. Use full day for fullday events
 2019-10-16 13:21:55 +02:00
Laurent Destailleur
e07e01580d Replace deprecated code with new one 2019-10-16 03:34:32 +02:00
Frédéric FRANCE
ccd9da99f4
Update list.php 2019-10-15 20:11:15 +02:00
Tobias Sekan
199fb3be0f
Fix non-numeric value encountered on ical export 2019-10-15 14:29:27 +02:00
Laurent Destailleur
9ba992b8b6 Work on inventory module 2019-10-12 12:31:35 +02:00
Laurent Destailleur
51ef2cd20a FIX #12058 2019-10-07 20:20:06 +02:00
Laurent Destailleur
d4f4f33122
Merge pull request #12048 from frederic34/patch-17 
Update card.php
 2019-10-07 10:23:51 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Frédéric FRANCE
bfd8bc839e
Update card.php 2019-10-06 10:28:09 +02:00
Laurent Destailleur
b60ee4c18c css 2019-10-03 09:58:49 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Frédéric FRANCE
fec67aade4
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-30 18:44:34 +02:00
Laurent Destailleur
d3eafa86d7
Merge pull request #11988 from frederic34/patch-12 
Add hook beforeAgenda in comm/action/index.php
 2019-09-30 18:03:25 +02:00
Laurent Destailleur
ce7e8c83a3 Use a dedicated css imgforviewmode for button used to switch view 2019-09-30 17:08:57 +02:00
Frédéric FRANCE
4a305ec95c
Add hook beforeAgenda in comm/action/index.php 2019-09-30 15:59:05 +02:00
Laurent Destailleur
d8de78dca9
Merge pull request #11984 from fuhraih/develop 
Fix 11554 and 7533
 2019-09-30 15:31:41 +02:00
Frédéric FRANCE
258424416e
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-30 07:49:52 +02:00
Laurent Destailleur
86e5465197 Standardize extrafields code 2019-09-28 10:55:09 +02:00
fuhraih
5757159c30 FIX #7533 Infinite loop in Agenda per user view if workinghours not set 
correctly
Remove the spaces in the Working_hours and Working_days stored
 2019-09-27 22:29:12 +02:00
Laurent Destailleur
c5e7413ed2
Merge branch 'develop' into fix-resource-event-move-check-busy 2019-09-27 15:35:14 +02:00
Laurent Destailleur
34813a931f
Merge branch 'develop' into patch-10 2019-09-27 14:45:09 +02:00
Laurent Destailleur
f90bfb54d4
Merge pull request #11913 from frederic34/actioncommcarddoaction 
add doaction to actioncommcard
 2019-09-27 14:34:49 +02:00
Frédéric FRANCE
41cb628d05
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-25 08:06:44 +02:00
Laurent Destailleur
961f2b5165 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/takepos/invoice.php
 2019-09-24 14:25:02 +02:00
Laurent Destailleur
5838fa1229 Fix az09 -> aZ09 2019-09-24 14:20:45 +02:00
Laurent Destailleur
db334a3b94 FIX Var not enough sanitized 2019-09-24 14:16:24 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
40f75b16d8 FIX Substitution of __PROJECT_XXX__ not done 2019-09-23 13:04:22 +02:00
VESSILLER
ea5ff59076 FIX check if a resource is in use after a drag and drop from events 2019-09-17 16:43:36 +02:00
Frédéric FRANCE
850b9fd52a
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-17 08:24:31 +02:00
Frédéric FRANCE
155e8fb500
fix syntax 2019-09-17 08:18:01 +02:00
Frédéric FRANCE
0d63c43ccd
add doaction to actioncommcard 2019-09-17 08:15:01 +02:00
Frédéric FRANCE
ecac1f9f40
wip 2019-09-17 08:02:55 +02:00
Frédéric FRANCE
a2d3cde291
some update after night 2019-09-17 07:59:46 +02:00
Frédéric FRANCE
fb7ef3cefc
Update card.php 2019-09-16 23:12:11 +02:00
Frédéric FRANCE
f369c1a80a
Update card.php 2019-09-16 20:59:13 +02:00
Frédéric FRANCE
67b73cf0e6
Update actioncomm.class.php 2019-09-16 20:57:20 +02:00
Laurent Destailleur
434ab2965a
Merge pull request #11820 from OPEN-DSI/new-resource-add-event-check-busy 
NEW check if a resource is in use in an event
 2019-09-15 15:47:07 +02:00
Laurent Destailleur
4d0ef33471 FIX #11857 2019-09-15 15:43:03 +02:00
Frédéric FRANCE
c9c7d60fc0
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-14 16:37:10 +02:00
Laurent Destailleur
56a99f6e6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-12 11:22:13 +02:00
Laurent Destailleur
db900cb5ea FIX EDB-ID:47370 2019-09-11 17:51:50 +02:00
VESSILLER
66611f4097 FIX rename "resource" (reserved) by "dolresource" 2019-09-09 09:29:43 +02:00
Frédéric FRANCE
bd4c9a64a8
wip 2019-09-07 14:48:25 +02:00
Laurent Destailleur
bb81f66a1a Add phpunit test for Lessc 2019-09-06 10:36:49 +02:00
VESSILLER
815d0bbc20 FIX rename "dolresource" into "resource" for compatibility with PR 11822 2019-09-05 11:57:12 +02:00
VESSILLER
9ed09db93c FIX replace "<br />" by "<br>" 2019-09-05 09:41:15 +02:00
VESSILLER
4ef7e755ad FIX only check on busy resources before updating an event 2019-09-05 09:29:40 +02:00
VESSILLER
b70587c150 NEW check if a resource is in use in an event 2019-09-04 15:14:16 +02:00
Laurent Destailleur
750182f9cd Removed deprecated method actioncomm->add(), use create() instead 2019-09-04 13:54:36 +02:00
Laurent Destailleur
da3d230182 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.stickler.yml
	htdocs/takepos/invoice.php
 2019-09-03 17:34:49 +02:00
Laurent Destailleur
6c96478040 Removed deprecated code 2019-09-02 22:57:55 +02:00
florian HENRY
243fca9a1a fix event list with description 2019-08-27 16:12:07 +02:00
Laurent Destailleur
d304749eca Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-19 10:19:14 +02:00
Laurent Destailleur
18886c701d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/core/lib/company.lib.php
 2019-08-19 00:02:26 +02:00
Laurent Destailleur
b1be6bf4f2 FIX #11422 Can't edit his own events with standard rights 2019-08-18 01:24:54 +02:00
John Botella
9b84987cc1 prepare new dashboard 2019-08-01 12:33:19 +02:00
Laurent Destailleur
bef3423764 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-07-22 19:12:27 +02:00
Laurent Destailleur
9f95b10d0e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/comm/action/peruser.php
	htdocs/compta/prelevement/card.php
	htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
 2019-07-22 19:11:27 +02:00
Laurent Destailleur
f39f710fd9
Merge pull request #11538 from atm-maxime/fix_agenda_list_filter 
Fix lost filter in action list
 2019-07-22 18:44:22 +02:00
Maxime Kohlhaas
7ec8b48b18 Fix lost filter in action list 2019-07-21 22:21:11 +02:00
florian HENRY
b046bcc197 fix warning php 2019-07-20 15:19:25 +02:00
florian HENRY
d03d79222e fix warning php 2019-07-20 15:15:48 +02:00
florian HENRY
d88fec52bf fix warining message 2019-07-20 15:07:59 +02:00
Laurent Destailleur
fc31a1182b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-18 18:54:50 +02:00
Laurent Destailleur
58428cefc0 Fix phpcs 2019-07-18 18:53:51 +02:00
Laurent Destailleur
50480bf517 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/index.php
 2019-07-18 18:23:24 +02:00
Laurent Destailleur
3cffd70ed3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/prelevement/create.php
	htdocs/core/class/commonobject.class.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/commande/dispatch.php
	htdocs/fourn/product/list.php
	htdocs/opensurvey/index.php
	htdocs/ticket/index.php
	htdocs/ticket/list.php
 2019-07-18 18:09:37 +02:00
John Botella
b5d348356d Fix socpeople assigned list in action com list 2019-07-17 16:49:41 +02:00
Laurent Destailleur
2fee41f712 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-04 12:27:00 +02:00
Laurent Destailleur
8e3620fce1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/facture/invoicetemplate_list.php
 2019-07-04 12:26:17 +02:00
Laurent Destailleur
ee0a65e7fa Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/comm/action/card.php
 2019-07-04 12:22:40 +02:00
Ferran Marcet
433835860c FIX: When saving an action it didn't save the label based on the type of event if the label is empty and the type is customized 2019-07-03 13:12:41 +02:00
Laurent Destailleur
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
Laurent Destailleur
18348fea93 Fix sort on date on agenda list 2019-06-22 11:34:16 +02:00
Frédéric FRANCE
f1d64ad164
Update peruser.php 2019-06-17 23:02:54 +02:00
Laurent Destailleur
e8b139d1c6 Fix repeated logs and fetch 2019-06-13 22:48:31 +02:00
Laurent Destailleur
900e860f6d Fix list of events for BOM module 2019-06-12 19:32:29 +02:00
Laurent Destailleur
2be5e9615d Fix look and field v10 2019-06-12 19:03:22 +02:00