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

83864 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
a6dcf5f1c1 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-09-29 00:51:02 +02:00
Laurent Destailleur
628978be53 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/adherents/card.php
 2020-09-28 21:16:25 +02:00
Laurent Destailleur
0b82860582
Merge pull request #14447 from FHenry/11.0_fixmultidiroutput 
fix document.php external module multidiroutput
 2020-09-27 18:55:21 +02:00
Laurent Destailleur
5c9ad3ec9b
Update files.lib.php 2020-09-27 18:55:09 +02:00
Florian HENRY
5ff7e37696 review code 2020-09-27 18:05:19 +02:00
Florian HENRY
b6b2553501 Merge branch '11.0' into 11.0_fixmultidiroutput 2020-09-27 18:02:22 +02:00
Laurent Destailleur
0dcd85485a Fix migration 2020-09-25 12:36:32 +02:00
Laurent Destailleur
7a9332815c Fix migration 2020-09-25 12:22:24 +02:00
Laurent Destailleur
019a825bf4
Merge pull request #14760 from aspangaro/10.0p46 
FIX Yogosha report 4434 (backport)
 2020-09-23 19:55:08 +02:00
Laurent Destailleur
dd8b5ce023
Merge pull request #14809 from atm-lena/11.0_FIX_DropColumnRank_MysqlPostgresql 
FIX - Backtick not work with postgresql
 2020-09-23 19:26:08 +02:00
atm-lena
0fc6e9b84f FIX - Backtick not work with postgresql 2020-09-23 10:54:49 +02:00
Alexandre SPANGARO
f8065eb4ed Merge branch '10.0' into 10.0p46 2020-09-19 03:43:33 +02:00
Alexandre SPANGARO
74c452678a Merge branch '10.0' of https://github.com/Dolibarr/dolibarr into 10.0 2020-09-19 03:37:58 +02:00
Laurent Destailleur
5d3168c2a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-09-18 14:55:58 +02:00
Laurent Destailleur
37c9afebd9 Fix regression 2020-09-18 14:55:32 +02:00
Laurent Destailleur
f09aea90df Fix bad test 2020-09-18 14:51:04 +02:00
Laurent Destailleur
56a9f5c48b Fix 2020-09-18 14:49:20 +02:00
Laurent Destailleur
07556e061d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/contact/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/document.php
 2020-09-18 14:46:23 +02:00
Alexandre SPANGARO
19c0738b14 Merge branch '10.0' into 10.0p46 2020-09-18 01:41:25 +02:00
Alexandre SPANGARO
f453e43cca FIX Yogosha report 4425 (backport) 2020-09-18 01:37:15 +02:00
Alexandre SPANGARO
142a27d472 Merge branch '10.0' of https://github.com/Dolibarr/dolibarr into 10.0 2020-09-18 01:22:21 +02:00
Laurent Destailleur
5d8b9056b4
Merge pull request #14755 from atm-lena/10.0_FIX_SendMailFromAContact 
FIX - Send mail from contact : select mail model
 2020-09-17 11:15:58 +02:00
Laurent Destailleur
ca52b5755f
Merge pull request #14756 from aspangaro/10.0_p42 
FIX Yogosha report 4425 (backport)
 2020-09-17 11:10:56 +02:00
Alexandre SPANGARO
55e3f8365e FIX Yogosha report 4434 (backport) 2020-09-16 21:36:55 +02:00
Alexandre SPANGARO
6928b6543c Revert "FIX Yogosha report 4425 (backport)" 
This reverts commit 23c4cfe913.
 2020-09-16 21:24:24 +02:00
Alexandre SPANGARO
bc457ebb66 Stickler 2020-09-16 21:22:59 +02:00
Alexandre SPANGARO
23c4cfe913 FIX Yogosha report 4425 (backport) 2020-09-16 20:55:28 +02:00
atm-lena
3182537566 FIX - Send mail from contact : select mail model 2020-09-16 17:19:25 +02:00
Laurent Destailleur
1344874e43 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-09-16 02:54:47 +02:00
Laurent Destailleur
e1d117b52d
Merge pull request #14735 from atm-florianm/10.0_FIX_prelevement_top5_multicompany 
FIX: missing entity check
 2020-09-16 01:21:39 +02:00
Florian Mortgat
06d31e8b9a FIX: missing entity check 2020-09-14 16:09:45 +02:00
Laurent Destailleur
a891211f78 Fix bad link 2020-09-14 02:32:30 +02:00
Laurent Destailleur
709542e27d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-09-12 04:26:00 +02:00
Laurent Destailleur
990af9d5cf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
 2020-09-12 04:25:54 +02:00
Laurent Destailleur
ae857e7008
Merge pull request #14673 from atm-john/11.0_fix_loadlang_cron 
FIX Cron load lang
 2020-09-12 01:32:17 +02:00
Laurent Destailleur
0bdd1c0c17
Merge pull request #14701 from ATM-Nicolas/fix_wrong_redirection 
FIX : Wrong redirection
 2020-09-12 01:13:46 +02:00
Laurent Destailleur
134369ada9
Merge pull request #14707 from aspangaro/10.0_p41 
FIX Problems on FEC format
 2020-09-12 01:11:18 +02:00
Alexandre SPANGARO
8fc9b78b47 FIX Problems on FEC format 2020-09-11 06:55:03 +02:00
ATM-Nicolas
7944c21fe5 FIX : Wrong redirection 2020-09-10 12:32:12 +02:00
John Botella
59d5391c2a Add force reload param to load method 2020-09-10 10:41:16 +02:00
Laurent Destailleur
b517050e17
Merge pull request #14672 from ATM-Nicolas/fix_api_static_property 
FIX : Static property called as non static
 2020-09-09 14:55:22 +02:00
John Botella
87d9dfa009 remove useless comm 2020-09-08 16:17:11 +02:00
John Botella
5a0622c906 FIX cron load lang 2020-09-08 16:14:14 +02:00
ATM-Nicolas
6bd6b285fd FIX : Static property called as non static 2020-09-08 16:03:18 +02:00
Juanjo Menent
9bd5ed627f Fix travis issues 2020-09-04 09:55:02 +02:00
Juanjo Menent
bb92e64e43 FIX: #14474 Error when deleting 2020-09-03 12:43:38 +02:00
Laurent Destailleur
b0a15f958f
Merge pull request #14619 from atm-john/11.0_fix_missing_param_for_hook 
FIX missing param for hook
 2020-09-03 12:24:56 +02:00
John Botella
c17bc8b3c8 Fix missing param for hook 2020-09-03 10:45:03 +02:00
Laurent Destailleur
162da37f1a
Merge pull request #14602 from ATM-Consulting/FIX_10.0_wrong_attachment_filenames_in_swiftmailer 
FIX 10.0 - when the mime file name is different from the filesystem n…
 2020-09-02 18:12:02 +02:00
Florian Mortgat
134a47a93f FIX 10.0 - when the mime file name is different from the filesystem name, the attachment name should be the mime filename 2020-09-01 15:36:35 +02:00