release 1.17.2 (#3135)
* allow to input password interactively in console * added block to simplify overwriting export template parts * prevent installation in PHP 8.1 * composer update * phpunit version to 9 * support negative amounts in excel export * added system configuration actions for calendar, weekly timesheet, users * added method to render text with full markdown support
This commit is contained in:
@@ -35,7 +35,7 @@
|
||||
</div>
|
||||
{{ widgets.user_avatar(comment.createdBy, false, 'direct-chat-img img-sm') }}
|
||||
<div class="direct-chat-text">
|
||||
{{ comment.message|replace(replacer)|md2html }}
|
||||
{{ comment.message|replace(replacer)|comment2html }}
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
@@ -103,15 +103,18 @@
|
||||
<sethtmlpagefooter name="myfooter" value="on" />
|
||||
mpdf-->
|
||||
{% endblock %}
|
||||
{% block body_start %}{% endblock %}
|
||||
{% block summary %}
|
||||
<h2 style="margin-bottom: 4px; padding-bottom: 0">{% block title %}{{ 'export.document_title'|trans }}{% endblock %}</h2>
|
||||
{% if query is defined %}
|
||||
<p>
|
||||
{{ 'export.period'|trans }}:
|
||||
{{ query.begin|date_short }} - {{ query.end|date_short }}
|
||||
</p>
|
||||
{% endif %}
|
||||
<h3>{{ 'export.summary'|trans }}</h3>
|
||||
{% block summary_header %}
|
||||
<h2 style="margin-bottom: 4px; padding-bottom: 0">{% block title %}{{ 'export.document_title'|trans }}{% endblock %}</h2>
|
||||
{% if query is defined %}
|
||||
<p>
|
||||
{{ 'export.period'|trans }}:
|
||||
{{ query.begin|date_short }} - {{ query.end|date_short }}
|
||||
</p>
|
||||
{% endif %}
|
||||
<h3>{{ 'export.summary'|trans }}</h3>
|
||||
{% endblock %}
|
||||
<table class="items">
|
||||
<thead>
|
||||
<tr>
|
||||
@@ -254,7 +257,9 @@ mpdf-->
|
||||
<pagebreak>
|
||||
{% endblock %}
|
||||
{% block items %}
|
||||
<h3>{{ 'export.full_list'|trans }}</h3>
|
||||
{% block items_header %}
|
||||
<h3>{{ 'export.full_list'|trans }}</h3>
|
||||
{% endblock %}
|
||||
|
||||
{% set duration = 0 %}
|
||||
{% set rate = 0 %}
|
||||
@@ -338,5 +343,6 @@ mpdf-->
|
||||
</tbody>
|
||||
</table>
|
||||
{% endblock %}
|
||||
{% block body_end %}{% endblock %}
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
{% import "invoice/macros.html.twig" as macros %}
|
||||
|
||||
{% set columns = {
|
||||
'date': {'class': 'alwaysVisible'},
|
||||
'date': {'class': 'alwaysVisible text-nowrap'},
|
||||
'user': {'class': 'hidden-xs hidden-sm text-nowrap hidden', 'orderBy': false},
|
||||
'customer': {'class': 'hidden-xs hidden-sm text-nowrap', 'orderBy': false},
|
||||
'customer': {'class': 'hidden-xs hidden-sm', 'orderBy': false},
|
||||
'comment': {'class': 'hidden-xs hidden-sm', 'title': 'label.description'|trans},
|
||||
} %}
|
||||
{% for field in metaColumns %}
|
||||
|
||||
Reference in New Issue
Block a user