2
0
forked from Wavyzz/dolibarr
Commit Graph

5768 Commits

Author SHA1 Message Date
UT from dolibit
0241e2d449 Create index.html 2021-03-21 21:38:53 +01:00
UT from dolibit
98c2c59486 Create index.html 2021-03-21 21:36:41 +01:00
UT from dolibit
5b028d192d Create index.html 2021-03-21 21:33:39 +01:00
UT from dolibit
9925cdcbee Create index.html 2021-03-21 21:32:35 +01:00
UT from dolibit
d0cace4f2c Create index.html 2021-03-21 21:32:05 +01:00
UT from dolibit
50672bfe31 Create index.html 2021-03-21 21:19:54 +01:00
UT from dolibit
2a069a0a2c Create index.html 2021-03-21 21:19:12 +01:00
UT from dolibit
4b3b4d072a Create index.html 2021-03-21 21:17:12 +01:00
UT from dolibit
2f957667ed Create index.html 2021-03-21 21:16:32 +01:00
UT from dolibit
163b960da9 Create index.html 2021-03-21 21:15:40 +01:00
UT from dolibit
8ec3c4a5b5 Create index.html 2021-03-21 21:14:52 +01:00
UT from dolibit
21a2b4e222 Create index.html 2021-03-21 21:13:33 +01:00
UT from dolibit
e4921fa843 Create index.html 2021-03-21 21:11:01 +01:00
UT from dolibit
c0e7800251 Create index.html 2021-03-21 21:10:13 +01:00
UT from dolibit
ae91f3be63 Create index.html 2021-03-21 21:07:25 +01:00
Laurent Destailleur
800eeef868 Clean code 2021-03-21 18:20:37 +01:00
Laurent Destailleur
3c8bf2167b Debug permissions 2021-03-21 18:01:43 +01:00
Laurent Destailleur
9900429fd0 Merge pull request #16889 from frederic34/adherent_to_member
rename files from adherent to member
2021-03-20 20:37:44 +01:00
Laurent Destailleur
e330c0f91a Merge pull request #16883 from aspangaro/14a28
Uniformize information on modules
2021-03-20 19:49:33 +01:00
Laurent Destailleur
a2b3afb511 Merge branch 'develop' into 14a22 2021-03-20 19:48:43 +01:00
Laurent Destailleur
46aa01aea0 Fix permission on export of BOM and website 2021-03-20 19:15:15 +01:00
Frédéric FRANCE
f6e7285949 rename files from adherent to member 2021-03-20 19:06:15 +01:00
Alexandre SPANGARO
3669c374c2 Uniformize information on modules 2021-03-20 13:55:43 +01:00
Laurent Destailleur
e334e83a64 Merge branch 'develop' into 14a22 2021-03-20 13:42:54 +01:00
Laurent Destailleur
d8aa5f5eab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-20 12:43:07 +01:00
Laurent Destailleur
3d3a7bfd37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/projet/card.php
	htdocs/projet/contact.php
	htdocs/projet/element.php
	htdocs/projet/tasks.php
	htdocs/projet/tasks/comment.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/document.php
	htdocs/projet/tasks/note.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php
2021-03-20 12:42:46 +01:00
Laurent Destailleur
ee84bef3b2 Merge pull request #16828 from frederic34/membersboxfix
fix new boxes add
2021-03-20 11:52:19 +01:00
Laurent Destailleur
25f1b82c34 Merge pull request #16859 from frederic34/patch-11
fix doxygen
2021-03-20 11:24:50 +01:00
Laurent Destailleur
5f0a2e648b Merge pull request #16871 from frederic34/patch-19
fix doxygen
2021-03-20 11:15:48 +01:00
Laurent Destailleur
3ce4762710 Merge pull request #16873 from frederic34/patch-23
fix doxygen
2021-03-20 11:15:22 +01:00
Frédéric FRANCE
a8d8775328 fix doxygen 2021-03-20 10:30:26 +01:00
Frédéric FRANCE
dad7038a0d fix doxygen 2021-03-20 10:22:34 +01:00
Frédéric FRANCE
8af1f278ae fix doxygen 2021-03-20 10:19:03 +01:00
Frédéric FRANCE
1a2b22def4 fix doxygen 2021-03-20 09:14:52 +01:00
Alexandre SPANGARO
17d3b85ec4 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-20 07:47:54 +01:00
Alexandre SPANGARO
00e21caa42 NEW: Add a sub table to manage accountancy on product/company 2021-03-20 07:42:16 +01:00
Laurent Destailleur
be90f5f2de Fix id of advanced perm 2021-03-19 15:00:22 +01:00
Frédéric FRANCE
7183bfeb94 fix new boxes add 2021-03-19 09:15:35 +01:00
Florian HENRY
df4a243f18 fix: PRODUIT_PDF_MERGE_PROPAL options do not work with new product feature 2021-03-18 17:13:34 +01:00
Alexandre SPANGARO
18d247026d NEW: Add a sub table to manage product/societe 2021-03-18 17:08:55 +01:00
Frédéric FRANCE
1b4b48a634 fix php8 warning when upgrade reloads modules 2021-03-18 13:18:50 +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
Laurent Destailleur
f514dec6ab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/card.php
2021-03-16 14:50:06 +01:00
Alexandre SPANGARO
6e17a588bb Merge remote-tracking branch 'upstream/develop' into 14a22 2021-03-16 03:26:28 +01:00
Florian HENRY
177a6bfe4f conference or booth card and list ok 2021-03-15 20:20:53 +01:00
Florian HENRY
17c49e6ce9 ongoinf card and list 2021-03-15 18:06:23 +01:00
Laurent Destailleur
2129adf129 Add more fields to llx_oauth_token 2021-03-15 13:25:08 +01:00
Christophe Battarel
090dc4f28a Merge branch 'develop' into pr_batch_masks 2021-03-15 11:42:33 +01:00
Laurent Destailleur
382b810ba1 Fix phpcs 2021-03-15 00:18:26 +01:00
Laurent Destailleur
5faecef0e1 Look and feel v14 2021-03-13 18:56:02 +01:00