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

1146 Commits

Author SHA1 Message Date
Laurent Destailleur
97292d6843 Fix phpcs 2021-04-13 20:28:25 +02:00
Laurent Destailleur
358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/projet/card.php
	htdocs/public/payment/newpayment.php
	htdocs/societe/list.php
	htdocs/ticket/document.php
 2021-04-13 20:19:05 +02:00
Laurent Destailleur
946a93dcd9 Update myobject_agenda.php 2021-04-13 15:55:50 +02:00
Alexandre SPANGARO
4b9bf40a8f move include_once to include when it's a tpl 2021-04-12 21:25:58 +02:00
UT from dolibit
488e80e959 Update myobject_agenda.php 2021-04-12 19:28:32 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
bbb75bd3c3 Merge pull request #17195 from FHenry/fix_dev_right_def_id 
fix: right definition id in modulebuilder
 2021-04-09 11:55:11 +02:00
Laurent Destailleur
5eb9acf3e1 Update modMyModule.class.php 2021-04-09 11:50:34 +02:00
Dorian Vabre
056143450b NEW: add config type securekey module builder 2021-04-09 10:58:33 +02:00
Florian HENRY
5555807104 fix: right definition id in modulebuilder 2021-04-09 08:51:09 +02:00
Laurent Destailleur
4ef425da69 Merge pull request #17175 from dolibit-ut/patch-248 
Create index.html
 2021-04-08 13:29:59 +02:00
Laurent Destailleur
5ffcc9f5f4 Merge pull request #17174 from dolibit-ut/patch-247 
Create index.html
 2021-04-08 13:18:34 +02:00
Laurent Destailleur
30355d05c9 Merge pull request #17176 from dolibit-ut/patch-249 
Create index.html
 2021-04-08 13:18:26 +02:00
Laurent Destailleur
d395c21152 Merge pull request #17177 from dolibit-ut/patch-250 
Create index.html
 2021-04-08 13:18:14 +02:00
UT from dolibit
2f349146ed Create index.html 2021-04-07 19:44:39 +02:00
UT from dolibit
6d8bbaeeae Create index.html 2021-04-07 19:42:47 +02:00
UT from dolibit
c9c7a55748 Create index.html 2021-04-07 19:42:11 +02:00
UT from dolibit
c910fb7594 Create index.html 2021-04-07 19:40:46 +02:00
UT from dolibit
6fce28e7d0 Create index.html 2021-04-07 19:39:29 +02:00
Laurent Destailleur
a16f70ca09 Enhance sample code 2021-04-06 14:59:03 +02:00
UT from dolibit
fa1e46cc6a Create index.html 2021-04-03 16:48:03 +02:00
Laurent Destailleur
5b22eae3a3 Merge pull request #17071 from FHenry/fix_13_right_definition_ID_in_modulebuilder 
fix: Right ID defenition in module builder
 2021-04-02 01:34:16 +02:00
Laurent Destailleur
17b5228bd3 Update modMyModule.class.php 2021-04-02 01:34:04 +02:00
Laurent Destailleur
5fa6aa0ac1 Update modMyModule.class.php 2021-04-02 01:32:46 +02:00
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
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