Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-24 02:11:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
102,261 Commits 36 Branches 191 Tags
af03c38d4cb15bab6c330184cf7c927553c779d9
Commit Graph

25204 Commits

Author SHA1 Message Date
Laurent Destailleur
eeb1c5d884 Replace deprecated code 2021-03-20 21:46:10 +01:00
Laurent Destailleur
2b3599dba5 Clean code 2021-03-20 21:29:36 +01:00
Laurent Destailleur
70be2dbcf0 Fix regression in tests 2021-03-20 20:51:19 +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
8f6f8248a3 Merge pull request #16885 from daraelmin/daraelmin-patch-4 
#Fix #16767 unremovable attached file in mailmodel
 2021-03-20 19:51:26 +01:00
Laurent Destailleur
861a5becf1 Merge pull request #16884 from daraelmin/daraelmin-patch-3 
#Fix #16767 v13 unremovable attached file in mailmodel
 2021-03-20 19:51:07 +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
d2f7d3064d can use $conf->member 2021-03-20 19:09:49 +01:00
Frédéric FRANCE
f6e7285949 rename files from adherent to member 2021-03-20 19:06:15 +01:00
daraelmin
cb71936ccd #Fix #16767 unremovable attached file in mailmodel 
#Fix #16767 make default attached file of a mail model selected removable
 2021-03-20 14:10:56 +01:00
daraelmin
2d7f858c1a #Fix #16767 unremovable attached file in mailmodel 
#Fix #16767 unremovable attached file in mailmodel
 2021-03-20 14:04:20 +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
e1f23105a6 Finally try to follow install per entity instead of per instance. 2021-03-20 12:49:44 +01:00
Laurent Destailleur
65bf47b693 Merge pull request #16845 from hregis/fix_warning_php8 
FIX avoid php8 warning with multicompany
 2021-03-20 12:46:02 +01:00
stickler-ci
625f72303b Fixing style errors. 2021-03-20 11:43:13 +00: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
Regis Houssin
29e090b025 FIX force to entity 0 for all entities 2021-03-20 12:35:41 +01:00
Regis Houssin
573ca669da Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_warning_php8 2021-03-20 12:11:12 +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
2da85a9ca2 Merge pull request #16842 from hregis/fix_avoid_warning_php8 
FIX avoid php8 warning in products list
 2021-03-20 11:48:53 +01:00
Laurent Destailleur
285b166b12 Merge pull request #16849 from frederic34/ecmindex 
fix php8 warnings
 2021-03-20 11:37:00 +01:00
Laurent Destailleur
3cc8a8e2ee Merge pull request #16850 from frederic34/patch-4 
fix php8 warning
 2021-03-20 11:28:47 +01:00
Laurent Destailleur
e54ca79a8c Merge pull request #16854 from frederic34/confglobal 
get conf global function
 2021-03-20 11:26:32 +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
685ec0bc63 Merge pull request #16872 from frederic34/patch-22 
fix doxygen
 2021-03-20 11:15:32 +01:00
Laurent Destailleur
3ce4762710 Merge pull request #16873 from frederic34/patch-23 
fix doxygen
 2021-03-20 11:15:22 +01:00
Laurent Destailleur
bc639045c0 Merge pull request #16874 from frederic34/patch-24 
fix doxygen
 2021-03-20 11:15:12 +01:00
Laurent Destailleur
810b15f73a Merge pull request #16875 from frederic34/patch-25 
fix doxygen
 2021-03-20 11:14:57 +01:00
Laurent Destailleur
1d2b3a0967 Merge pull request #16876 from frederic34/patch-26 
fix doxygen
 2021-03-20 11:12:46 +01:00
Frédéric FRANCE
8142d76394 fix php8 warnings 2021-03-20 10:50:02 +01:00
Frédéric FRANCE
65c3dced1c fix doxygen 2021-03-20 10:34:23 +01:00
Frédéric FRANCE
5da597d947 fix doxygen 2021-03-20 10:32:18 +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
49ff44e414 fix doxygen 2021-03-20 10:21:23 +01:00
Frédéric FRANCE
8af1f278ae fix doxygen 2021-03-20 10:19:03 +01:00
Laurent Destailleur
b5264e978b Merge pull request #16776 from frederic34/boxticket 
fix php8 warnings
 2021-03-20 10:14:34 +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
Frédéric FRANCE
4c5ddc44dc get conf global function 2021-03-19 17:58:01 +01:00
Frédéric FRANCE
93ae7a3fed fix php8 warning 2021-03-19 17:01:14 +01:00
Frédéric FRANCE
239dae03bf fix php8 warnings 2021-03-19 16:57:12 +01:00
Laurent Destailleur
be90f5f2de Fix id of advanced perm 2021-03-19 15:00:22 +01:00
Laurent Destailleur
8462c4d3d3 Clean menu 2021-03-19 13:37:43 +01:00