Commit Graph

95981 Commits

Author SHA1 Message Date
Florian HENRY
07984d9a6e Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-02-14 15:02:29 +01:00
Florian HENRY
85a450cdd2 setup page feature 2021-02-14 15:02:05 +01:00
Florian HENRY
3d264d8292 nouveau fichier : class/conferenceorbooth.class.php
nouveau fichier : conferenceorbooth_agenda.php
	nouveau fichier : conferenceorbooth_card.php
	nouveau fichier : conferenceorbooth_contact.php
	nouveau fichier : conferenceorbooth_document.php
	nouveau fichier : conferenceorbooth_list.php
	nouveau fichier : conferenceorbooth_note.php
	nouveau fichier : core/modules/eventorganization/doc/doc_generic_conferenceorbooth_odt.modules.php
	nouveau fichier : core/modules/eventorganization/doc/pdf_standard_conferenceorbooth.modules.php
	nouveau fichier : core/modules/eventorganization/mod_conferenceorbooth_advanced.php
	nouveau fichier : core/modules/eventorganization/mod_conferenceorbooth_standard.php
	nouveau fichier : core/modules/eventorganization/modules_conferenceorbooth.php
	nouveau fichier : lib/eventorganization_conferenceorbooth.lib.php
	nouveau fichier : sql/llx_eventorganization_conferenceorbooth.key.sql
	nouveau fichier : sql/llx_eventorganization_conferenceorbooth.sql
	nouveau fichier : sql/llx_eventorganization_conferenceorbooth.sql.back
	nouveau fichier : sql/llx_eventorganization_conferenceorbooth_extrafields.key.sql
	nouveau fichier : sql/llx_eventorganization_conferenceorbooth_extrafields.sql
2021-02-14 15:00:46 +01:00
Florian HENRY
d7dfb9138a working on setup 2021-02-14 15:00:20 +01:00
stickler-ci
fb7e103d65 Fixing style errors. 2021-02-14 06:29:06 +00:00
Alexandre SPANGARO
dc91dbabd1 Fix tzuserrel 2021-02-14 07:26:53 +01:00
andreubisquerra
abda9eeb93
Improve compatibility with logo printing with TakePOS connector 2021-02-14 00:02:03 +01:00
abb
d82c62c40d New:Constant MAIN_SHOW_SOCIETE2EXTERN to allow access to any thirdparty for external users 2021-02-12 23:53:45 +01:00
abb
d92e17aabd new : hook context subscriptioncard and restrictedArea block for subscriptions 2021-02-12 19:21:31 +01:00
abb
b8fde12def Fix : To use restrictedArea Hook, we need to call initHooks before restrictedArea 2021-02-12 17:19:45 +01:00
Laurent Destailleur
50797bf892 Fix typo 2021-02-12 17:17:48 +01:00
Laurent Destailleur
34525f3ba9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-12 17:15:37 +01:00
Laurent Destailleur
cd4d790d2b Add parameters of batch into comment description 2021-02-12 17:15:23 +01:00
Frédéric FRANCE
811c02b970
fix inverted test 2021-02-12 15:45:49 +01:00
lmarcouiller
44f4410c83 buid error repair 2021-02-12 12:31:42 +01:00
stickler-ci
08a21a7408 Fixing style errors. 2021-02-12 11:03:09 +00:00
lmarcouiller
4032c8f877 changes to fix pr + robots.txt 2021-02-12 12:02:17 +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
stickler-ci
6f7a223a8d Fixing style errors. 2021-02-12 10:17:03 +00:00
atm-lena
b3c1bb9706 Merge branch 'NEW_BankEntries_TaxSalarySocial_DisplayUser' of github.com:atm-lena/dolibarr into develop_NEW_BankEntries_TaxSalarySocial_DisplayUser 2021-02-12 11:13:14 +01:00
atm-lena
1f56166801 FIX ret : fetch user instead of search with main sql request 2021-02-12 11:05:15 +01:00
LAURIER Alexis
4b9f71d20e
Add missing comma in contract list.php 2021-02-12 09:00:29 +01:00
Frédéric FRANCE
fa72021ca8
doxygen 2021-02-12 08:49:29 +01:00
Laurent Destailleur
f2f9085fb5 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-11 23:05:17 +01:00
Laurent Destailleur
5392e11370 Add missing ethiopian birr currency 2021-02-11 23:05:01 +01:00
Laurent Destailleur
60ae50abb3
Merge pull request #16270 from frederic34/patch-3
fix unknown variable
2021-02-11 23:00:36 +01:00
Laurent Destailleur
e796c514aa
Merge pull request #16269 from frederic34/doxygentest
doxygen
2021-02-11 22:59:37 +01:00
Frédéric FRANCE
ac40067e88
fix unknown variable 2021-02-11 22:11:16 +01:00
Frédéric FRANCE
bcac4386d6
doxygen 2021-02-11 21:26:21 +01:00
Frédéric FRANCE
79c3670c20
doxygen 2021-02-11 21:12:32 +01:00
Laurent Destailleur
e37a4be1d6
Update html.form.class.php 2021-02-11 20:10:15 +01:00
Laurent Destailleur
7f64af9c90 Doc 2021-02-11 20:08:25 +01:00
Laurent Destailleur
a4b1043f00 Close #16196 #16210 2021-02-11 20:07:29 +01:00
Laurent Destailleur
02edac223f
Merge pull request #16210 from frederic34/patch-1
deprecate api operation
2021-02-11 20:03:05 +01:00
Laurent Destailleur
20f5a05c54
Merge pull request #16262 from bb2a/UPPER
Update commonobject.class.php add in setUpperOrLowerCase
2021-02-11 20:00:57 +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
a848069178
Merge pull request #16258 from ivanmestre/fix-data-filter-reset-payment-various
Fix #16241 Date filter resets on Miscellaneous Payments
2021-02-11 18:59:32 +01:00
Laurent Destailleur
3b5e6b1140
Update bankentries_list.php 2021-02-11 18:45:06 +01:00
Laurent Destailleur
e5d0474c7b
Merge pull request #16259 from ivanmestre/v13-fix-dates-filter-reset-payment-various
V13 Fix #16241 Date filter resets on Miscellaneous Payments
2021-02-11 18:38:51 +01:00
Laurent Destailleur
a779ce36f3
Merge pull request #16257 from ivanmestre/fix-bank-account-filter-reset-payment-various
FIX #16241 Bank Account filter resets on payment various
2021-02-11 18:36:59 +01:00
Laurent Destailleur
c83ce41e1d
Merge pull request #16252 from homer8173/patch-22
Add Hook in stockmouvement
2021-02-11 18:36:27 +01:00
Laurent Destailleur
cd79e3985e
Update mouvementstock.class.php 2021-02-11 18:36:17 +01:00
Laurent Destailleur
73cd5e144b
Merge pull request #16263 from aspangaro/12p11
WIP FIX: Accountancy - Fix some problems on CEGID export
2021-02-11 18:33:40 +01:00
Laurent Destailleur
6dfc6c7edf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/filefunc.inc.php
2021-02-11 18:33:03 +01:00
Laurent Destailleur
8edbc5c3b6
Merge pull request #16265 from Hystepik/develop#2
Fix format error in graph in fourn/commande/index.php
2021-02-11 18:32:29 +01:00
Laurent Destailleur
0d8f138361
Merge pull request #16268 from FHenry/fix_setuplink_modulebuilder
fix: module builder setup link #FoundationFunding
2021-02-11 18:31:52 +01:00
Laurent Destailleur
7f89fea804
Update index.php 2021-02-11 18:31:25 +01:00
Laurent Destailleur
c306e8ebe9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-11 18:23:47 +01:00
Laurent Destailleur
e1334f34b6 Complete repair to clean not correctly available extrafields on proposal 2021-02-11 18:08:01 +01:00