Commit Graph

10037 Commits

Author SHA1 Message Date
Frédéric FRANCE
c43d3dff92 fix project replace projet 2021-03-18 20:51:40 +01:00
Laurent Destailleur
ac6b6f22e7 Enhance sanitizing of data 2021-03-18 11:39:23 +01:00
Frédéric FRANCE
22ac6c79b3 fix php8 warning 2021-03-17 22:29:33 +01:00
Laurent Destailleur
31478d5ac0 Look and feel v14 2021-03-17 22:01:25 +01:00
Frédéric FRANCE
fced63e93b fix php8 warning 2021-03-17 20:11:22 +01:00
Laurent Destailleur
24576897ef Merge pull request #16750 from frederic34/restrictiononfksoc
fix php8 warnings
2021-03-17 17:05:23 +01:00
Laurent Destailleur
36cb213a83 Merge pull request #16764 from hregis/fix_php_8_warning_again
FIX avoid php 8.x warning
2021-03-17 16:50:21 +01:00
Regis Houssin
4d149dc3fe FIX avoid php 8.x warning 2021-03-17 15:15:51 +01:00
Regis Houssin
bb4c8d9114 FIX avoid warning with php 8 2021-03-17 12:48:59 +01:00
Laurent Destailleur
8de1b4c94e Factorize code 2021-03-17 11:34:19 +01:00
Frédéric FRANCE
4e8ea5c07e fix php8 warnings 2021-03-16 21:13:15 +01:00
Laurent Destailleur
017120f017 Merge pull request #16697 from frederic34/patch-3
fix syntax
2021-03-16 10:42:49 +01:00
Laurent Destailleur
87ab711a0f Merge pull request #16707 from FHenry/dev_EventOrganisation
new: working on conference or booth object and event type #FoundationFunding
2021-03-16 10:34:55 +01:00
Laurent Destailleur
897f4be033 Merge pull request #16712 from frederic34/patch-9
fix php8 warnings
2021-03-16 10:33:01 +01:00
Laurent Destailleur
401aeb8a7f Merge pull request #16706 from frederic34/htmlforcc
decompose code
2021-03-16 10:32:44 +01:00
Laurent Destailleur
462164a5a8 Merge pull request #16709 from frederic34/patch-5
fix php8 warnings
2021-03-16 10:31:53 +01:00
Alexandre SPANGARO
6e17a588bb Merge remote-tracking branch 'upstream/develop' into 14a22 2021-03-16 03:26:28 +01:00
Frédéric FRANCE
2d741a33f0 fix php8 warning 2021-03-15 21:03:54 +01:00
Frédéric FRANCE
f7d43ce4fb fix php8 warnings 2021-03-15 20:55:59 +01:00
Frédéric FRANCE
a0e6f454ff fix php8 warnings 2021-03-15 20:31:55 +01:00
Florian HENRY
177a6bfe4f conference or booth card and list ok 2021-03-15 20:20:53 +01:00
Frédéric FRANCE
e89cfc3753 decompose code 2021-03-15 20:17:01 +01:00
Frédéric FRANCE
910b4f1daf Update html.formmail.class.php 2021-03-15 18:58:35 +01:00
Frédéric FRANCE
dd4b8f2880 Update html.formmail.class.php 2021-03-15 18:22:50 +01:00
Laurent Destailleur
a8c34a5b05 Invert MAIN_EXTRAFIELDS_USE_SELECT2 into
MAIN_EXTRAFIELDS_DISABLE_SELECT2
2021-03-15 14:16:55 +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
Frédéric FRANCE
bbb0d9acc4 fix php8 warning 2021-03-14 20:31:13 +01:00
Laurent Destailleur
cc10106a21 Fix protection on int 2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +01:00
Laurent Destailleur
af5db0f5fa Look and feel v14 2021-03-12 15:34:31 +01:00
Florian HENRY
f17aa47ad6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation_draft 2021-03-11 22:03:51 +01:00
Laurent Destailleur
fc08c48bf3 Merge pull request #16591 from Givriz/dev
Replace gender and civility by a picto
2021-03-11 21:36:16 +01:00
Florian HENRY
862926316a working on list 2021-03-11 19:09:42 +01:00
Damien BENOIT
420a3a73dd Update html.form.class.php 2021-03-11 18:15:22 +01:00
lmarcouiller
9aa20585be Fix #16617 : fix event add when removing boxes 2021-03-11 10:10:20 +01:00
Damien BENOIT
2b33bb2d04 Merge pull request #11 from Dolibarr/develop
Update fork
2021-03-10 16:53:35 +01:00
Damien BENOIT
93675082d7 Update html.form.class.php 2021-03-10 16:42:14 +01:00
Laurent Destailleur
c2200e6ffd Clean code 2021-03-10 16:41:48 +01:00
Givriz
6e46396b17 Ajout de picto pour le genre et la civilité 2021-03-10 16:31:50 +01:00
Laurent Destailleur
9ed128c6fa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/class/html.formaccounting.class.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/langs/en_US/errors.lang
	htdocs/product/card.php
2021-03-10 15:35:09 +01:00
Laurent Destailleur
680f6257a0 FIX warning if setup of chart of account is not yet done. 2021-03-10 11:04:28 +01:00
Laurent Destailleur
b1f4c29fde Fix missing alias 2021-03-09 20:12:14 +01:00
Laurent Destailleur
b778820fe2 Merge pull request #16596 from FHenry/dev_allowAliasInCommonObject_GetFiledList
Dev allow alias in common object get filed list
2021-03-09 16:54:22 +01:00
Laurent Destailleur
3cb072f67a Update commonobject.class.php 2021-03-09 15:13:20 +01:00
Laurent Destailleur
1b3aae1984 Fix regression 2021-03-09 12:17:32 +01:00
Laurent Destailleur
53f8ff060a Fix phpcs 2021-03-09 10:40:22 +01:00
Florian HENRY
ce5324c08c Merge HEAD, branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_allowAliasInCommonObject_GetFiledList 2021-03-09 10:24:07 +01:00
Florian HENRY
bcbf8bb72a allow table alias into commonObject getFieldList 2021-03-09 10:21:32 +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