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

78577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
a034ad76f8
Merge pull request #14785 from aspangaro/10.0p53 
FIX Yogosha report 4456 (backport)
 2020-09-20 17:41:35 +02:00
Laurent Destailleur
f27a39bf81
Merge pull request #14771 from aspangaro/10.0p49 
FIX #yogosha transversal path when unzipping file (backport)
 2020-09-20 17:32:48 +02:00
Laurent Destailleur
86a4c6e32c
Merge pull request #14784 from aspangaro/10.0p52 
Fix alpha into alphanohtml (backport)
 2020-09-20 17:31:48 +02:00
Laurent Destailleur
8f712b7245
Merge pull request #14762 from aspangaro/10.0p48 
FIX GETPOST on 'action' (backport)
 2020-09-20 17:29:45 +02:00
Laurent Destailleur
15820a6b1e
Merge pull request #14758 from aspangaro/10.0p44 
FIX Yogosha report 4430 (backport)
 2020-09-20 17:27:03 +02:00
Laurent Destailleur
3ea329fb9b
Merge pull request #14757 from aspangaro/10.0p43 
FIX Yogosha report 4426 (backport)
 2020-09-20 17:26:31 +02:00
Alexandre SPANGARO
d51d169c8a FIX Yogosha report 4456 (backport) 2020-09-19 04:03:32 +02:00
Alexandre SPANGARO
322552d06f Merge branch '10.0' into 10.0p43 2020-09-19 03:45:57 +02:00
Alexandre SPANGARO
1346262836 Merge branch '10.0' into 10.0p44 2020-09-19 03:44:27 +02:00
Alexandre SPANGARO
86e5b9f972 Merge branch '10.0' into 10.0p48 2020-09-19 03:42:44 +02:00
Alexandre SPANGARO
9de89ad178 Merge branch '10.0' into 10.0p49 2020-09-19 03:42:22 +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
Alexandre SPANGARO
6c96d7f240 Fix install hangs 2020-09-19 03:33:01 +02:00
Alexandre SPANGARO
640dc4a64c Fix alpha into alphanohtml 2020-09-19 03:32:52 +02:00
Laurent Destailleur
37c9afebd9 Fix regression 2020-09-18 14:55:32 +02:00
Laurent Destailleur
56a9f5c48b Fix 2020-09-18 14:49:20 +02:00
Alexandre SPANGARO
b861f67e5a FIX #yogosha transversal path when unzipping file (backport) 2020-09-18 01:58:31 +02:00
Alexandre SPANGARO
1661b8ca5d Merge branch '10.0' into 10.0p48 2020-09-18 01:45:05 +02:00
Alexandre SPANGARO
a11ee268d4 Merge branch '10.0' into 10.0p44 2020-09-18 01:37:34 +02:00
Alexandre SPANGARO
f453e43cca FIX Yogosha report 4425 (backport) 2020-09-18 01:37:15 +02:00
Alexandre SPANGARO
5dfb03369a Merge branch '10.0' into 10.0p44 2020-09-18 01:31:58 +02:00
Alexandre SPANGARO
949a16b892 Fix error 2020-09-18 01:29:18 +02:00
Alexandre SPANGARO
5a6d2b2755 Merge branch '10.0' into 10.0p43 2020-09-18 01:24:06 +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
8a84b245ca FIX GETPOST on 'action' (backport) 2020-09-16 21:50:30 +02:00
Alexandre SPANGARO
7697a8610d FIX Yogosha report 4430 (backport) 2020-09-16 21:27:56 +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
be318f679b FIX Yogosha report 4426 (backport) 2020-09-16 21:19:31 +02:00
Alexandre SPANGARO
2ff633a89f Revert "FIX Yogosha report 4425 (backport)" 
This reverts commit 23c4cfe913.
 2020-09-16 21:12:35 +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
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
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
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
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
Laurent Destailleur
ffb3d810de Complete fix for #14580 for v10 (backport of change of develop) 2020-08-31 16:21:59 +02:00
Laurent Destailleur
eb0c76f613 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-08-29 05:08:59 +02:00
Laurent Destailleur
723a263cd3 Fix phpcs 2020-08-29 05:07:23 +02:00
Laurent Destailleur
4d622316a8
Merge pull request #14579 from ATM-Consulting/10.0_FIX_wrong_supplier_unit_price_calculation_when_accepting_supplier_price_proposal 
FIX: unit price divided by quantity when accepting supplier price pro…
 2020-08-28 17:48:11 +02:00
Florian Mortgat
215085e0e6 FIX: unit price divided by quantity when accepting supplier price proposal 2020-08-28 15:51:39 +02:00
Laurent Destailleur
593f3b81e5
Merge pull request #14559 from OPEN-DSI/v10-fix-societe-card-add-sales-representatives 
FIX set sales representatives on create company card
 2020-08-27 20:14:31 +02:00