Commit Graph

78662 Commits

Author SHA1 Message Date
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
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
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
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
lvessiller
23accef5c2 FIX empty value is needed on filter list 2020-09-08 14:53:40 +02:00
lvessiller
86ce4315be FIX load default linked options for linked sellist extra fields 2020-09-07 15:19:58 +02:00
lvessiller
5dee3b5b2f FIX no empty value in required extrafield 2020-09-07 14:24:09 +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
lvessiller
9268955256 FIX set sales representatives on create company card 2020-08-26 09:40:20 +02:00
Laurent Destailleur
f819509442 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-08-23 19:22:27 +02:00
Laurent Destailleur
74eac1d06a Fix include regression 2020-08-23 19:22:01 +02:00
Laurent Destailleur
49f8a6e733 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-08-23 19:17:12 +02:00
Laurent Destailleur
4fa6d86127 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-08-23 19:17:01 +02:00
Laurent Destailleur
03557b69c2
Merge pull request #14486 from atm-john/9.0_fix_infinite_fetch_loop
FIX : infinite fetch object linked loop
2020-08-23 19:14:08 +02:00
Laurent Destailleur
7a183ea026
Update pdf.lib.php 2020-08-23 19:13:30 +02:00
Laurent Destailleur
b44d6744f9
Update pdf.lib.php 2020-08-23 19:11:40 +02:00
Laurent Destailleur
7eb003c684
Update pdf.lib.php 2020-08-23 19:11:19 +02:00
Laurent Destailleur
7a53e191a9
Merge pull request #14511 from frederic34/patch-6
Use of undefined constant state - assumed 'state'
2020-08-23 18:27:28 +02:00
Frédéric FRANCE
b4d2bf98fa
Use of undefined constant state - assumed 'state' 2020-08-20 12:14:40 +02:00
John Botella
6e1702c1a5 Fix infinite fetch object linked loop 2020-08-17 15:00:31 +02:00
Laurent Destailleur
03e8a0737c
Merge pull request #14481 from OPEN-DSI/v10-html-formfile-add-param-entity
FIX param entity in html form file
2020-08-16 21:16:28 +02:00
lvessiller
d5acc85ef0 FIX param entity in html form file 2020-08-14 12:18:28 +02:00
Laurent Destailleur
6851e24c3b Merge branch '10.0' of https://github.com/dolibarr/dolibarr into 10.0 2020-08-14 12:02:40 +02:00
Laurent Destailleur
fe0b1c5ee4 Fix travis 2020-08-14 11:53:54 +02:00
Laurent Destailleur
52f20a1047 Fix travis 2020-08-14 11:52:21 +02:00