Commit Graph

82702 Commits

Author SHA1 Message Date
John Botella
02f268ea4e FIX - hasDelay for retained warranty 2020-02-11 16:54:27 +01:00
Laurent Destailleur
03ee488d5f Fix look and feel v11 2020-02-11 10:41:50 +01:00
Laurent Destailleur
7878fe49df Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-10 21:29:05 +01:00
Laurent Destailleur
ee7aa14247 Fix color of status 2020-02-10 21:28:49 +01:00
Laurent Destailleur
453315bc63
Merge pull request #13073 from RubenRuCh/11.0
FIX: #13018 Extrafields Supplier invoice
2020-02-10 15:38:17 +01:00
Laurent Destailleur
644b27bcf9 Fix look and feel v11 2020-02-10 13:34:09 +01:00
Laurent Destailleur
b9a8d82b2f FIX Filter on list of events were lost after "Back to list" 2020-02-10 13:29:26 +01:00
Laurent Destailleur
918e570e7a FIX Picture of contact not visible in tooltip 2020-02-10 12:56:08 +01:00
AdrianDominik
5432ab3b05 FIX: #13018 Extrafields Supplier invoice 2020-02-10 11:18:59 +01:00
Laurent Destailleur
07fbaa02d1 FIX #13050 2020-02-09 19:36:12 +01:00
Laurent Destailleur
d49943ab37 FIX #13019 2020-02-09 18:38:27 +01:00
Laurent Destailleur
94d6fa06dc FIX #13022 2020-02-09 18:34:53 +01:00
Laurent Destailleur
d789dd0366 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-09 18:29:09 +01:00
Laurent Destailleur
8645fd8946 FIX CVE-2019–17223 FIX #13053 2020-02-09 18:28:57 +01:00
Laurent Destailleur
c7736dde41 FIX CVE-2019–17223 2020-02-09 18:28:34 +01:00
Laurent Destailleur
5c000159c1 FIX Mail smtps truncated if content has a line with single . 2020-02-09 16:36:38 +01:00
Laurent Destailleur
6daa10b499 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-08 19:10:52 +01:00
Laurent Destailleur
c2830f9e79 FIX Look and feel v11 2020-02-08 18:18:41 +01:00
Laurent Destailleur
0a912f4e8a Fix missing class 2020-02-08 18:18:22 +01:00
Laurent Destailleur
81df5cd9ab Merge pull request #13032 from atm-florianm/FIX_11.0_select_extrafield_filtering
FIX 11.0 - default filtering for 'select' extrafields should use "=", not "LIKE"
2020-02-08 17:16:01 +01:00
pnueda
c083458adf Update html.formfile.class.php
Corrects a bug that adds a second '?' in the url string. When strpos returns 0 as the initial position for '?', it is (mis)taken as FALSE value, and then replaced by a second '?' in the list of get parameters, resulting in something like:
/compta/facture/card.php?facid=397?action=remove_file...
instead of 
/compta/facture/card.php?facid=397&action=remove_file...
2020-02-08 16:18:52 +01:00
Laurent Destailleur
8bcff9a0f1
Merge pull request #13052 from fappels/11_fix_expedition_ceate_line
FIX expedition ceate line new parameter is not required.
2020-02-08 16:07:36 +01:00
Laurent Destailleur
c27260869b FIX #13046 More complete 2020-02-08 15:59:08 +01:00
Laurent Destailleur
df7cdd1da8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/admin/tools/export_files.php
	htdocs/comm/mailing/class/advtargetemailing.class.php
	htdocs/core/tpl/advtarget.tpl.php
2020-02-08 15:42:35 +01:00
Laurent Destailleur
1a167aa5b4 Update card.php
Conflicts:
	htdocs/compta/tva/card.php
2020-02-08 15:12:55 +01:00
Laurent Destailleur
9b9101dc2f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/admin/tools/export_files.php
2020-02-08 15:09:24 +01:00
Laurent Destailleur
5f5645a184
Merge pull request #13044 from ksar-ksar/10.0
FIX : Warning on admin/export_files
2020-02-08 15:05:44 +01:00
Laurent Destailleur
34192f25f6 Merge pull request #13042 from ksar-ksar/11.0
FIX : Update export_files.php
2020-02-08 15:05:26 +01:00
ksar
e951743077 Update export_files.php
Remove Warning
2020-02-08 15:04:27 +01:00
Laurent Destailleur
2a897ac91a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-08 15:02:49 +01:00
Laurent Destailleur
5fac824824
Merge pull request #13040 from atm-arnaud/FIX_adv_target_emailing
FIX advanced target emailing sql and ergonomy
2020-02-08 14:59:00 +01:00
ptibogxiv
8100708639 Update pdf_espadon.modules.php 2020-02-08 14:57:04 +01:00
ptibogxiv
ae5da164c6 FIX need weight short label in shipping doc
need short label because value + term is too long
2020-02-08 14:56:36 +01:00
Laurent Destailleur
46e7f613fd
Merge pull request #13049 from hregis/11.0
FIX #13028
2020-02-08 14:52:57 +01:00
Laurent Destailleur
85c4013a0d Update card.php 2020-02-08 14:52:02 +01:00
Laurent Destailleur
5f75ae4830 FIX If we can change vendor status, we must be able to chane vendor code 2020-02-08 11:34:57 +01:00
Laurent Destailleur
2eae9a2fa2 FIX Missing include 2020-02-07 12:15:20 +01:00
Laurent Destailleur
84c1228ad4 FIX Disable ticket status change if ticket close
FIX Use ref into label of ticket message
2020-02-07 12:15:15 +01:00
Francis Appels
0e65d08455 Fix set create_line rang parameter not required 2020-02-07 10:16:56 +01:00
Francis Appels
4760e5b1b3 Merge remote-tracking branch 'Dolibarr/11.0' into 11 2020-02-07 10:02:51 +01:00
Regis Houssin
45ba23da3e FIX #13028 2020-02-07 08:53:05 +01:00
Laurent Destailleur
83598a0b53 FIX After import of a website template, home page was not set 2020-02-06 23:35:04 +01:00
Laurent Destailleur
fe0d1a81eb Fix filter on current user is stupi on the view "per user". 2020-02-06 21:16:48 +01:00
Laurent Destailleur
19847ec7ac Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/class/CMailFile.class.php
2020-02-06 13:04:49 +01:00
Laurent Destailleur
78389e6c5d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-06 13:03:47 +01:00
Laurent Destailleur
387db16217 FIX Filenames must not contains non ascii char or we will get non ascii
char into the SMTP header.

Conflicts:
	htdocs/core/class/CMailFile.class.php
2020-02-06 13:03:10 +01:00
Laurent Destailleur
e14612f569 FIX Filenames must not contains non ascii char or we will get non ascii
char into the SMTP header.

Conflicts:
	htdocs/core/class/CMailFile.class.php
2020-02-06 13:02:27 +01:00
Laurent Destailleur
13442ef0df FIX Filenames must not contains non ascii char or we will get non ascii
char into the SMTP header.
2020-02-06 13:01:09 +01:00
ksar
23fc8321d5 FIX : Warning on admin/export_files
#13041
2020-02-06 12:55:35 +01:00
ksar
16fdab6089 Update export_files.php
REmove the Warning
2020-02-06 12:12:20 +01:00