Dorian Vabre
c85b75924f
wip on adding a filter for the ics file + fix on class name
2021-05-10 16:57:48 +02:00
Laurent Destailleur
9973085613
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/card.php
htdocs/comm/propal/card.php
htdocs/compta/bank/releve.php
htdocs/compta/paiement/rapport.php
htdocs/core/class/extrafields.class.php
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/reception/card.php
htdocs/societe/societecontact.php
2021-05-03 19:36:49 +02:00
Florian HENRY
9278228e20
FIX: create event from contact card preselect contact correctly
2021-05-03 18:08:49 +02:00
Laurent Destailleur
1c95e2b7c7
FIX #17453
2021-05-03 14:58:29 +02:00
Laurent Destailleur
4926ac1e24
Fix make protected method not visible
2021-04-28 15:25:06 +02:00
Laurent Destailleur
539954f760
Clean code
2021-04-27 01:12:40 +02:00
Laurent Destailleur
d2b91e934a
Clean code
2021-04-27 01:09:46 +02:00
Laurent Destailleur
f54d14bfd6
Add method checkValForAPI to clean data from API input
2021-04-27 01:05:14 +02:00
Laurent Destailleur
d138e7410b
Clean code
2021-04-26 19:12:23 +02:00
Laurent Destailleur
fd2d317b4a
Fix #yogosha5881
2021-04-25 15:55:36 +02:00
Laurent Destailleur
d0cc64479d
Fix protect sql
2021-04-24 20:18:11 +02:00
Laurent Destailleur
61df76dd9a
Fix pb in date format %a %b when using a negative timezone
...
Enhance date management and unit tests.
2021-04-19 12:48:08 +02:00
Laurent Destailleur
a74b237a7b
Add a schedule dtask to send reminder by email on date due.
2021-04-19 10:35:19 +02:00
Laurent Destailleur
9154e07689
Fix picto for tags
2021-04-14 12:33:53 +02:00
Laurent Destailleur
358bb87ae2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/payments.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/projet/card.php
htdocs/public/payment/newpayment.php
htdocs/societe/list.php
htdocs/ticket/document.php
2021-04-13 20:19:05 +02:00
Alexandre SPANGARO
44133166de
Merge remote-tracking branch 'upstream/develop' into 14a36
2021-04-12 21:35:03 +02:00
Alexandre SPANGARO
4b9bf40a8f
move include_once to include when it's a tpl
2021-04-12 21:25:58 +02:00
Laurent Destailleur
8a62d97b89
Remove one thousand of useless files
2021-04-12 15:57:16 +02:00
Alexandre SPANGARO
80c6458faa
Work on split module fournisseur
2021-04-11 22:25:45 +02:00
Laurent Destailleur
91fc78ac9c
FIX #17192 - With tz < 0, event is show in bad day on calendar views
...
Conflicts:
htdocs/comm/action/index.php
2021-04-11 16:18:16 +02:00
Laurent Destailleur
053be7a63c
FIX #17192 - With tz < 0, event is show in bad day on calendar views
2021-04-11 16:02:52 +02:00
Laurent Destailleur
fe7654c067
Complete doc
2021-04-09 13:34:19 +02:00
Laurent Destailleur
de7c3f5e0c
Merge pull request #17139 from OPEN-DSI/fix_00001
...
FIX: Fix when add or modify ressources on events with duplicate entries
2021-04-08 15:50:00 +02:00
kamel
fcc27e9177
Corrections
2021-04-07 09:49:20 +02:00
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