Commit Graph

83336 Commits

Author SHA1 Message Date
Laurent Destailleur
f28da6a602 Merge pull request #13041 from ksar-ksar/develop
FIX : Warning on admin/export_files
2020-02-08 15:01:30 +01:00
Laurent Destailleur
9a21aa1722
Merge pull request #13036 from ptibogxiv/patch-301
FIX : short label in shipping pdf
2020-02-08 14:54:44 +01:00
Laurent Destailleur
b66c2a29a2 Merge branch 'develop' into patch-301 2020-02-08 14:54:23 +01:00
Laurent Destailleur
9c12c4be08 Fix customreports 2020-02-08 14:49:26 +01:00
Laurent Destailleur
3a74c3d7e9 Enhance property ->ismulticompanymanaged to define an object with entity
on its parent.
2020-02-08 14:40:30 +01:00
Laurent Destailleur
c3beb854a2 Definition of $fields for member and subscriptions 2020-02-08 13:44:31 +01:00
Laurent Destailleur
56079f928f Label of field 2020-02-08 11:34:25 +01:00
Laurent Destailleur
cffc56b80b Declaration of property fields of thirdparties 2020-02-08 11:32:38 +01:00
Laurent Destailleur
02a96e163f FIX If we can change vendor status, we must be able to chane vendor code 2020-02-08 11:26:16 +01:00
Laurent Destailleur
9f9002d6a6 Update field definition 2020-02-07 16:05:04 +01:00
Laurent Destailleur
f114ca9479 Missing column import_key on ticket table 2020-02-07 15:53:50 +01:00
Laurent Destailleur
fe7b79c83c Fix definition of objects 2020-02-07 15:51:14 +01:00
Laurent Destailleur
9fdef6858b Remove code using a no more used field 2020-02-07 13:37:37 +01:00
Laurent Destailleur
4e4fd4c76c Remove code using a no more used field 2020-02-07 13:15:51 +01:00
Laurent Destailleur
0f1a8a3997 Implement min and max for generic graph 2020-02-07 13:01:07 +01:00
Laurent Destailleur
d9fda71a23 Fix phpcs 2020-02-07 12:51:08 +01:00
Laurent Destailleur
cd58822d98 Can edit a table of resolution code for tickets 2020-02-07 12:48:41 +01:00
Laurent Destailleur
11c6447096 Generic report 2020-02-07 12:13:55 +01:00
Laurent Destailleur
c4204f95d4 FIX Missing include 2020-02-07 12:12:10 +01:00
Laurent Destailleur
54414f7bb0 WIP Generic report 2020-02-07 11:53:09 +01:00
Laurent Destailleur
53e1b80742 FIX Disable ticket status change if ticket close
FIX Use ref into label of ticket message
2020-02-07 11:52:55 +01:00
Laurent Destailleur
ff4ce2e505 WIP Work on generic custom graph 2020-02-07 10:58:17 +01:00
Laurent Destailleur
5e71366ff2 css 2020-02-06 18:06:36 +01:00
Laurent Destailleur
9c73bb1aef NEW Can create an deposit from order using a percentage of qty. 2020-02-06 14:15:41 +01:00
Laurent Destailleur
c8f7b79c48 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/CMailFile.class.php
2020-02-06 13:05:52 +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
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
Laurent Destailleur
05e08b3596 FIX Filenames must not contains non ascii char or we will get non ascii
char into the SMTP header.
FIX Do not encode subject if it is full ascii (not required)
2020-02-06 12:58:02 +01:00
ksar
b5da9763ce Update export_files.php
Remove Warning
2020-02-06 12:15:18 +01:00
ptibogxiv
2ca6b8f633
Update pdf_espadon.modules.php 2020-02-06 10:49:05 +01:00
ptibogxiv
f1cce26ef0
FIX need weight short label in shipping doc
need short label because value + term is too long
2020-02-06 10:47:56 +01:00
Laurent Destailleur
48e6db17bd Fix doc 2020-02-06 10:28:49 +01:00
Laurent Destailleur
2966b2303b Fix phpcs 2020-02-06 10:23:04 +01:00
Laurent Destailleur
48cd8e1314 Fix doc 2020-02-06 10:17:06 +01:00
Laurent Destailleur
857c22cb29 Fix doc 2020-02-06 10:13:10 +01:00
Laurent Destailleur
40b6886e2a Fix params 2020-02-06 10:09:27 +01:00
Laurent Destailleur
f3597926c4 Fix missing escape returned by ci 2020-02-06 10:05:13 +01:00
Laurent Destailleur
4ee760856b
Merge pull request #13034 from oscim/patch-18
ref_ext is not in sql requete for save
2020-02-05 22:47:08 +01:00
oscim
7cc87423e4
ref_ext is not in sql requete for save
ref_ext is not in sql requete for save
2020-02-05 22:31:27 +01:00
Laurent Destailleur
5aa4f9b5ae Fix phpcs 2020-02-05 21:58:53 +01:00
Laurent Destailleur
0e790bd8fc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-05 21:47:54 +01:00
Laurent Destailleur
7411f6468b css 2020-02-05 21:47:41 +01:00
Laurent Destailleur
1344ce06a5
Merge pull request #12317 from OPEN-DSI/new-propal-tooltip-note
NEW add public and private notes in propal list
2020-02-05 21:41:17 +01:00
Laurent Destailleur
66590cca10
Update list.php 2020-02-05 21:40:49 +01:00
Laurent Destailleur
95f1cd0d66 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-05 21:31:41 +01:00
Laurent Destailleur
8ab96447c7 Page of permissions is cleaner now 2020-02-05 21:31:28 +01:00
Laurent Destailleur
dbb731a656
Merge pull request #12957 from TobiasSekan/AddTempWorkFolder
NEW Hidden option MAIN_TEMP_DIR
2020-02-05 20:43:26 +01:00
Laurent Destailleur
4a07740601
Update conf.class.php 2020-02-05 20:42:44 +01:00
Laurent Destailleur
7cc959e316
Update conf.class.php 2020-02-05 20:42:03 +01:00