Commit Graph

17662 Commits

Author SHA1 Message Date
Laurent Destailleur
8e69574dee
Merge pull request #14772 from aspangaro/10.0p50
FIX Yogosha report 4465 (backport)
2020-09-23 19:57:29 +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
Alexandre SPANGARO
322552d06f Merge branch '10.0' into 10.0p43 2020-09-19 03:45:57 +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
51a112325f Merge branch '10.0' into 10.0p50 2020-09-19 03:41:54 +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
56a9f5c48b Fix 2020-09-18 14:49:20 +02:00
Alexandre SPANGARO
df28a2844f Fix missing global 2020-09-18 02:07:44 +02:00
Alexandre SPANGARO
8a0702074a FIX Yogosha report 4465 (backport) 2020-09-18 02:02:45 +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
5a6d2b2755 Merge branch '10.0' into 10.0p43 2020-09-18 01:24:06 +02:00
Alexandre SPANGARO
8a84b245ca FIX GETPOST on 'action' (backport) 2020-09-16 21:50:30 +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
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
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
723a263cd3 Fix phpcs 2020-08-29 05:07:23 +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
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
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
John Botella
6e1702c1a5 Fix infinite fetch object linked loop 2020-08-17 15:00:31 +02:00
lvessiller
d5acc85ef0 FIX param entity in html form file 2020-08-14 12:18:28 +02:00
lvessiller
f385e02c53 FIX title button attribute id empty 2020-08-13 17:43:18 +02:00
Laurent Destailleur
5482a3134a
Merge pull request #14355 from fmarcet/10.0
Fix: User can see events that are not assigned to it
2020-08-07 14:54:39 +02:00
Laurent Destailleur
641d9a6565 Fix number to string 2020-08-06 02:58:07 +02:00
Laurent Destailleur
0b7aec1fa0 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/lib/functionsnumtoword.lib.php
2020-08-06 02:52:54 +02:00
Laurent Destailleur
73ea5b0e2d Fix function to convert price to string 2020-08-06 02:50:24 +02:00
Laurent Destailleur
ef0f7cfa6f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-08-06 02:08:15 +02:00
Laurent Destailleur
375fe3f3e8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/fourn/paiement/card.php
2020-08-06 02:08:04 +02:00
Laurent Destailleur
9cb5735165 FIX Bad address used for vendor on PDF standard of supplier payment 2020-08-06 02:05:55 +02:00
stickler-ci
8d88217434 Fixing style errors. 2020-08-04 14:48:15 +00:00
Ferran Marcet
70ad2fcee0 Fix: User can see events that are not assigned to it 2020-08-04 16:45:57 +02:00
Ferran Marcet
7a077a2d99 Fix: User can see events that are not assigned to it 2020-08-04 16:45:04 +02:00
Ferran Marcet
1a62a36b86 Merge remote-tracking branch 'origin/10.0' into 10.0 2020-08-04 16:40:01 +02:00
Ferran Marcet
7b6ef7aca8 Merge branch '10.0up' into 10.0 2020-08-04 16:39:40 +02:00
stickler-ci
9926eac192 Fixing style errors. 2020-08-03 09:26:36 +00:00
quentin
72b2fb442b fix test libelle 2020-08-03 11:17:39 +02:00