2
0
forked from Wavyzz/dolibarr
Commit Graph

23424 Commits

Author SHA1 Message Date
Laurent Destailleur
49f8ff5708 FIX #16286 2021-02-15 12:18:09 +01:00
Florian HENRY
1427f66e10 Merge branch 'dev_EventOrganisation' into dev_EventOrganisation_setuppage 2021-02-15 11:20:07 +01:00
Florian HENRY
e1f503a8cf Merge branch 'develop' into dev_EventOrganisation 2021-02-15 11:19:08 +01:00
Frédéric FRANCE
382123b64a define variable for all execution paths
The variable $filelog does not seem to be defined for all execution paths leading up to this point.
2021-02-15 08:36:40 +01:00
Laurent Destailleur
25230fb4bb Merge pull request #16284 from andreubisquerra/develop
Improve logo printing compatibility with TakePOS connector
2021-02-14 21:41:45 +01:00
Laurent Destailleur
e802dd87f4 Merge branch 'develop' into dev_EventOrganisation_setuppage 2021-02-14 21:37:45 +01:00
Laurent Destailleur
4d526569a7 Merge pull request #16292 from frederic34/patch-5
Use dictionary to display social network icon
2021-02-14 21:34:13 +01:00
Laurent Destailleur
2cc4632a39 Fix js error 2021-02-14 21:32:19 +01:00
Frédéric FRANCE
917f15a781 Use dictionary to display social network icon 2021-02-14 21:30:54 +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
Florian HENRY
5958373f47 set icon fa 2021-02-14 17:31:30 +01:00
Florian HENRY
02b698c128 move files to real diredtory 2021-02-14 17:09:23 +01:00
Florian HENRY
21a8d4d470 ok for setup pages 2021-02-14 17:06:49 +01:00
Florian HENRY
b5055a5edb config pages ok 2021-02-14 16:41:57 +01:00
Florian HENRY
07984d9a6e Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-02-14 15:02:29 +01:00
Florian HENRY
d7dfb9138a working on setup 2021-02-14 15:00:20 +01:00
andreubisquerra
abda9eeb93 Improve compatibility with logo printing with TakePOS connector 2021-02-14 00:02:03 +01:00
Laurent Destailleur
cd4d790d2b Add parameters of batch into comment description 2021-02-12 17:15:23 +01:00
Florian HENRY
f063606f27 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-02-12 11:32:07 +01:00
Florian HENRY
9858aec6d6 on going 2021-02-12 11:31:13 +01:00
Laurent Destailleur
e37a4be1d6 Update html.form.class.php 2021-02-11 20:10:15 +01:00
Laurent Destailleur
4a2cd0d509 Merge pull request #16253 from AlexisLaurier/13.0
contract - uses of multidir_output for file path
2021-02-11 19:00:20 +01:00
Laurent Destailleur
1b11d9d0e9 FIX payment term label on PDF 2021-02-11 17:48:53 +01:00
Anthony Berton
d10e46adca Update commonobject.class.php 2021-02-11 17:46:28 +01:00
Florian HENRY
256e2e1b6e nouveau fichier : ../core/modules/modEventOrganization.class.php
nouveau fichier : ../eventorganization/.editorconfig
	nouveau fichier : ../eventorganization/.gitattributes
	nouveau fichier : ../eventorganization/.gitignore
	nouveau fichier : ../eventorganization/.tx/config
	nouveau fichier : ../eventorganization/COPYING
	nouveau fichier : ../eventorganization/ChangeLog.md
	nouveau fichier : ../eventorganization/README.md
	nouveau fichier : ../eventorganization/eventorganizationindex.php
	nouveau fichier : ../eventorganization/lib/eventorganization.lib.php
	nouveau fichier : ../eventorganization/modulebuilder.txt
	nouveau fichier : ../eventorganization/myobject_contact.php
	nouveau fichier : ../../test/phpunit/EventOrganizationFunctionalTest.php
2021-02-11 17:17:02 +01:00
Florian HENRY
13522fdf5f start module dev 2021-02-11 17:05:04 +01:00
Anthony Berton
55f8d64202 Update commonobject.class.php 2021-02-11 12:16:07 +01:00
Laurent Destailleur
ee6bc80242 Fix phpcs 2021-02-11 01:59:13 +01:00
Laurent Destailleur
a01301c500 Fix regression in color of bar for type = line 2021-02-10 18:44:09 +01:00
Laurent Destailleur
623d7b9819 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-10 18:04:23 +01:00
Laurent Destailleur
88550ab417 Look and feel v14 2021-02-10 18:03:45 +01:00
Laurent Destailleur
8b125d8076 Fix MVC. Actions must be before output. 2021-02-10 16:44:20 +01:00
Laurent Destailleur
72bfa81082 Update html.form.class.php 2021-02-10 14:14:28 +01:00
Laurent Destailleur
0849ce288c Fix phpcs 2021-02-10 14:04:06 +01:00
Alexis LAURIER
5b2779a5f9 contract - use multidir_output 2021-02-10 13:27:42 +01:00
Alexis LAURIER
05b1171e90 Merge branch '13.0' of https://github.com/AlexisLaurier/dolibarr into 13.0 2021-02-10 13:19:47 +01:00
Alexis LAURIER
468f40743d contract - use multidir_output 2021-02-10 13:18:55 +01:00
LAURIER Alexis
cb4295b702 dol_check_secure_access_document contrat multidir_
Use multidir_output for contracts document check to manage entity on each contract
2021-02-10 13:02:13 +01:00
Laurent Destailleur
4f2e7c51fc Fix #16129 autodetect language on public pages 2021-02-10 03:20:50 +01:00
Laurent Destailleur
89154265c6 FIX #16129 2021-02-10 03:12:19 +01:00
Laurent Destailleur
4c3a96da08 FIX #16150 2021-02-10 02:57:08 +01:00
Laurent Destailleur
667963094f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-10 02:17:14 +01:00
Laurent Destailleur
c875ad9a1c FIX #16240 2021-02-10 02:17:01 +01:00
Laurent Destailleur
499ebd73b1 Merge pull request #16192 from FHenry/dev_add_hook_ecm_auto
NEW : add hook addSectionECMAuto method to add cuistom diretory into ECM auto files
2021-02-10 01:32:29 +01:00
Laurent Destailleur
c2df267858 Merge pull request #16242 from frederic34/patch-4
remove deprecated
2021-02-10 01:29:47 +01:00
Laurent Destailleur
e84834d219 Merge pull request #16236 from grandoc/new_branch_09_02_2021
standardisation, internationalisation
2021-02-10 01:28:16 +01:00
Laurent Destailleur
2c30680157 Merge pull request #16244 from AlexisLaurier/13.0
fix regression of #16118 - entity not check on object in checkUserAccessToObject
2021-02-10 01:25:19 +01:00
Laurent Destailleur
afeeb40e2e Fix show property "enabled" of extrafields 2021-02-10 00:18:00 +01:00
abb
17f77b8edb New : Hook selectForFormsListWhere 2021-02-09 23:49:46 +01:00