2
0
forked from Wavyzz/dolibarr
Commit Graph

2108 Commits

Author SHA1 Message Date
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