jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

release 2.0 beta 2 (#3757)

Browse Source 
* do not traverse into invoice template subdirectories (#3735)
* fix security open api definition
* fix currency can be null, removed fluent interface
* merged release 1.30.3
* allow to pre-fill timesheet metafields via URL
* fix api description
* added test accounts with simpler names and password
* upgrade to Symfony 6.2
* removed FrameworkExtraBundle (by Sensio) and replaced with new native SF annotations
* fixed symfony 6.2 deprecations
* fixed #3768
This commit is contained in:
Kevin Papst
2023-01-18 14:47:48 +01:00
committed by GitHub
parent 6e0500972e
commit 0e91dd886e
141 changed files with 1600 additions and 1415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/invoice/renderer/default.pdf.twig
View File

@@ -32,10 +32,10 @@
<tr>
<td>
<strong>{{ 'contact'|trans }}</strong>:
{{ model.template.contact|nl2str(' &ndash; ') }}
{{ model.template.contact|nl2str(' – ') }}
<br>
<strong>{{ 'invoice_bank_account'|trans }}</strong>:
{{ model.template.paymentDetails|nl2str(' &ndash; ') }}
{{ model.template.paymentDetails|nl2str(' – ') }}
</td>
<td align="right">
{{ 'export.page_of'|trans({'%page%': '{PAGENO}', '%pages%': '{nb}'}) }}

6
templates/invoice/renderer/invoice.html.twig
View File

@@ -138,11 +138,11 @@
<footer class="footer">
<p>
<strong>{{ 'address'|trans }}</strong>: {{ model.template.company }} &ndash; {{ model.template.address|nl2str(' &ndash; ') }}
<strong>{{ 'address'|trans }}</strong>: {{ model.template.company }} &ndash; {{ model.template.address|nl2str(' – ') }}
<br>
<strong>{{ 'invoice_bank_account'|trans }}</strong>: {{ model.template.paymentDetails|nl2str(' &ndash; ') }}
<strong>{{ 'invoice_bank_account'|trans }}</strong>: {{ model.template.paymentDetails|nl2str(' – ') }}
<br>
<strong>{{ 'contact'|trans }}</strong>: {{ model.template.contact|nl2str(' &ndash; ') }}
<strong>{{ 'contact'|trans }}</strong>: {{ model.template.contact|nl2str(' – ') }}
</p>
</footer>
{% endblock %}

2
templates/invoice/renderer/service-date.pdf.twig
View File

@@ -18,7 +18,7 @@
<table class="header">
<tr>
<td class="text-small">
{{ model.template.company }} &ndash; {{ model.template.address|nl2str(' &ndash; ') }}
{{ model.template.company }} &ndash; {{ model.template.address|nl2str(' – ') }}
{% if model.template.vatId is not empty %}
&ndash; {{ 'vat_id'|trans }}: {{ model.template.vatId }}
{% endif %}

4
templates/user/stats.html.twig
View File

@@ -18,11 +18,11 @@
} %}
{% if user.accountNumber is not empty %}
{% set datagrid = datagrid|merge({
'account_number' : (user.accountNumber ?? '&ndash;'),
'account_number' : (user.accountNumber ?? '–'),
}) %}
{% endif %}
{% set datagrid = datagrid|merge({
'profile.first_entry' : (firstTimesheet is not null ? firstTimesheet|date_short : '&ndash;'),
'profile.first_entry' : (firstTimesheet is not null ? firstTimesheet|date_short : '–'),
'profile.registration_date' : user.registeredAt|date_short,
}) %}
{% set seeOwnRate = false %}