lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
95,108 Commits 43 Branches 150 Tags 886 MiB
d787f5cc1a
Commit Graph

95108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
f15696620f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-15 11:51:23 +01:00
Laurent Destailleur
6e21839169 Fix migration 2021-02-15 11:50:59 +01:00
Laurent Destailleur
b2826025f6 Fix missing event type 2021-02-15 11:48:48 +01:00
Laurent Destailleur
67cfa05489 Fix missing event type 2021-02-15 11:48:37 +01:00
stickler-ci
e7c2dcd89c Fixing style errors. 2021-02-15 10:22:22 +00: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
Laurent Destailleur
4e2e5db9de
Merge pull request #16260 from atm-lena/develop_NEW_BankEntries_TaxSalarySocial_DisplayUser 
New bank entries tax salary social display user
 2021-02-15 11:05:28 +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
e56635b329 Fix filter on date on movement list 2021-02-14 23:05:11 +01:00
Laurent Destailleur
5fc36ab736
Merge pull request #16139 from aspangaro/14a14 
NEW: Stock movement list - Add more complete date field
 2021-02-14 22:45:39 +01:00
Laurent Destailleur
5bead8577c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-14 22:44:17 +01:00
Laurent Destailleur
f4c23654f8 FIX #16275 #15604 2021-02-14 22:44:04 +01:00
Laurent Destailleur
a9e7d04536 Fix #16256 2021-02-14 22:18:59 +01:00
Laurent Destailleur
fac38e50d6 Fix #16256 2021-02-14 22:16:15 +01:00
Laurent Destailleur
40c0a0ee26
Merge pull request #16256 from Hystepik/develop#1 
Close #16248 : new column in Stock to date
 2021-02-14 22:00:44 +01:00
Laurent Destailleur
2669de8324
Merge pull request #16272 from AlexisLaurier/13.0 
Add missing comma in contract list.php
 2021-02-14 21:59:07 +01:00
Laurent Destailleur
3d7dfcc043
Merge pull request #16271 from frederic34/doxygencron 
doxygen
 2021-02-14 21:58:40 +01:00
Laurent Destailleur
e0a7ba6bdf
Merge pull request #16276 from frederic34/patch-3 
FIX inverted test
 2021-02-14 21:58:10 +01:00
Laurent Destailleur
3e41f69d3d Fix bad permission check 2021-02-14 21:56:15 +01:00
Laurent Destailleur
4a35600e62
Merge pull request #16278 from bafbes/abb120357 
new : hook context subscriptioncard and restrictedArea block for subscriptions
 2021-02-14 21:53:25 +01:00
Laurent Destailleur
342978005a
Merge pull request #16277 from bafbes/abb120356 
Fix : To use restrictedArea Hook, we need to call initHooks before restrictedArea
 2021-02-14 21:51:53 +01:00
Laurent Destailleur
27ffd5d84f
Merge pull request #16287 from FHenry/dev_modbuilder_feature_setuppage 
NEW : Setup Page for module create with module builder enhancement #FoundationFunding
 2021-02-14 21:48:50 +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
stickler-ci
a830c52156 Fixing style errors. 2021-02-14 16:36:28 +00:00
Florian HENRY
8249a26ec9 remove unit test will be done after 2021-02-14 17:33:31 +01:00
Florian HENRY
5958373f47 set icon fa 2021-02-14 17:31:30 +01:00
Florian HENRY
5d8aaefb26 fix indent 2021-02-14 17:12:36 +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
stickler-ci
d636aa6cfa Fixing style errors. 2021-02-14 15:48:44 +00:00
Florian HENRY
5c8e7b224f add feature to setup pages 2021-02-14 16:44:42 +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
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
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