Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
103,106 Commits 36 Branches 189 Tags
901bab2ca2608559d8865800e8768fc24c29fde4
Commit Graph

1338 Commits

Author SHA1 Message Date
Florian HENRY
b1562cffb1 better doc comment 2021-04-01 17:20:14 +02:00
Florian HENRY
03ee7ec433 fix: Right ID defenition in module builder 2021-04-01 17:08:26 +02:00
Laurent Destailleur
06078f231b NEW Can show the project ref or label into PDF documents 2021-04-01 13:02:44 +02:00
Florian HENRY
73d7eefdcf Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-31 20:09:44 +02:00
Laurent Destailleur
be6bb3a756 FIX #yogosha5746 - next step (work in progress) 2021-03-30 19:12:07 +02:00
Florian HENRY
f25360cc4c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-29 15:49:43 +02:00
Laurent Destailleur
ce1f8289a4 FIX #yogosha5746 2021-03-29 15:07:23 +02:00
Florian HENRY
5fe6aa429d Merge branch 'dev_EventOrganisation_draft' into dev_EventOrganisation 2021-03-29 12:08:02 +02:00
Laurent Destailleur
95a7e13e3a Debug establishment 2021-03-27 14:54:09 +01:00
Florian HENRY
47675d28d7 add filter for select list attendees 2021-03-26 19:47:48 +01:00
Laurent Destailleur
c98f38a209 Fix #yogosha5737 2021-03-25 13:36:43 +01:00
Laurent Destailleur
e3b019f923 Clean code 2021-03-23 01:32:17 +01:00
Laurent Destailleur
3c8bf2167b Debug permissions 2021-03-21 18:01:43 +01:00
Laurent Destailleur
1540f62df0 FIX #yogosha5678 2021-03-19 14:25:59 +01:00
Laurent Destailleur
d83d005284 FIX #yogosha5674 2021-03-19 12:44:59 +01:00
Frédéric FRANCE
3de108aea2 doxygen 2021-03-16 19:07:07 +01:00
Laurent Destailleur
e366d2c379 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/admin/tools/export_files.php
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
	test/phpunit/FilesLibTest.php
 2021-03-16 14:57:04 +01:00
Florian HENRY
177a6bfe4f conference or booth card and list ok 2021-03-15 20:20:53 +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
Laurent Destailleur
1d2929e3f5 Clean code 2021-03-15 00:01:55 +01:00
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +01:00
Florian HENRY
862926316a working on list 2021-03-11 19:09:42 +01:00
Laurent Destailleur
82d5c7289d Add property widgettype 2021-03-10 17:02:39 +01:00
Laurent Destailleur
fbe5ec8bb2 Complete test on setup 2021-03-10 13:12:28 +01:00
Florian HENRY
ccf71cd980 fix modulebuilder boxes showboxes 2021-03-10 11:56:44 +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
Florian HENRY
5221b59539 set correct field name as conference or booth are in actioncomm table 2021-02-27 15:34:28 +01:00
stickler-ci
6aaf1c2962 Fixing style errors. 2021-02-26 17:28:25 +00:00
Frédéric FRANCE
f73c0abec1 code syntax m... directories 2021-02-26 18:26:44 +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
b6211a7990 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-19 14:12:00 +01:00
Laurent Destailleur
5340c30db3 FIX missing security test on payment page 
FIX sql error on group by on payment list
 2021-02-19 12:35:26 +01:00
Laurent Destailleur
36e0deba3f Look and feel v14 2021-02-17 17:56:08 +01:00
Laurent Destailleur
d16276ea2c Clean code 2021-02-16 11:15:42 +01:00
Laurent Destailleur
3d7dfcc043 Merge pull request #16271 from frederic34/doxygencron 
doxygen
 2021-02-14 21:58:40 +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
85a450cdd2 setup page feature 2021-02-14 15:02:05 +01:00
Frédéric FRANCE
fa72021ca8 doxygen 2021-02-12 08:49:29 +01:00
Laurent Destailleur
7f89fea804 Update index.php 2021-02-11 18:31:25 +01:00
stickler-ci
5d4c00edb4 Fixing style errors. 2021-02-11 16:24:38 +00:00
Florian HENRY
eb3659b5b8 fix module builder setup link 2021-02-11 17:20:07 +01:00
David Bensel
a0bbe210a3 Module builder: Don't delete hidden .tx-folder 2021-02-09 14:45:06 +03:00
Laurent Destailleur
ec394a93f6 Merge pull request #16191 from grandoc/develop 
fix typo
 2021-02-07 19:59:54 +01:00
Frédéric FRANCE
eaaefe1382 5.5 to 5.6 2021-02-06 14:12:22 +01:00
Philippe GRAND
b77398b476 fix typo 2021-02-06 13:12:39 +01:00
Laurent Destailleur
fd3354142b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
 2021-02-06 01:17:05 +01:00
werewolf7160
83f24e6fd2 call to createCommon() return int and not bool 
with generated Object, the post request call to createCommon() in it and taht function return a int (id or -1 if error).
but the test on the returned value is a '!', that don't return false on "-1".
a post request with an sql error for example(foreign key error for my test), will always return 200 instead of 500 with the error
 2021-02-06 00:21:53 +01:00