Laurent Destailleur
|
ebf68ecbe0
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
.travis.yml
htdocs/contrat/class/contrat.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/project/pdf/pdf_baleine.modules.php
|
2015-12-18 21:03:57 +01:00 |
|
Raphaël Doursenaud
|
02e053acc6
|
FIX #4242 Allow disabling dashes in documents
3.7 specific fix since document files have moved
|
2015-12-17 10:26:27 +01:00 |
|
Laurent Destailleur
|
5670e92842
|
Position of field into pdf baleine
|
2015-03-14 12:35:03 +01:00 |
|
Marcos García de La Fuente
|
86100758ff
|
Miscellaneous corrections
|
2014-12-28 20:13:15 +01:00 |
|
Laurent Destailleur
|
5d57c59241
|
Fix: Bad parameter of get_substitutionarray_other
|
2014-10-15 18:16:41 +02:00 |
|
Laurent Destailleur
|
8df8fb2fe0
|
Qual: Removed a lot of duplicate code
New: extrafields for projects and tasks are exported to ODT documents.
|
2014-10-12 16:19:00 +02:00 |
|
Laurent Destailleur
|
97eec37f1c
|
Uniformize code: property "nom" for thirdparty is aliased into "name"
everywhere.
|
2014-10-04 17:20:17 +02:00 |
|
Regis Houssin
|
f1f4fc18e9
|
Fix: use "doc" instead "pdf" dir and uniformize code
|
2014-09-29 11:08:50 +02:00 |
|