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

search and export from invoice archive (#2408)

Browse Source
This commit is contained in:
Kevin Papst
2021-03-10 01:50:27 +01:00
committed by GitHub
parent c34e9f576d
commit db1344573f
22 changed files with 544 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
templates/invoice/actions.html.twig
View File

@@ -77,19 +77,8 @@
{% macro invoice_listing(view) %}
{% import "macros/widgets.html.twig" as widgets %}
{% set actions = {} %}
{% if is_granted('view_invoice') %}
{% set actions = actions|merge({'back': path('invoice')}) %}
{% endif %}
{% set actions = actions|merge({'visibility': '#modal_invoices'}) %}
{% set actions = actions|merge({'help': {'url': 'invoices.html'|docu_link, 'target': '_blank'}}) %}
{% set event = trigger('actions.invoice_details', {'actions': actions, 'view': view}) %}
{{ widgets.page_actions(actions) }}
{% set event = actions(app.user, 'invoice_details', {'view': view}) %}
{{ widgets.page_actions(event.actions) }}
{% endmacro %}
{% macro invoice_upload(view) %}

1
templates/invoice/listing.html.twig
View File

@@ -21,6 +21,7 @@
{% block page_title %}{{ 'invoice.title'|trans }}{% endblock %}
{% block page_actions %}{{ actions.invoice_listing('index') }}{% endblock %}
{% block page_search %}{{ toolbar.dropDownSearch(toolbarForm) }}{% endblock %}
{% block main_before %}
{{ tables.data_table_column_modal(tableName, columns) }}

4
templates/invoice/templates.html.twig
View File

@@ -8,7 +8,7 @@
'title': {'class': 'hidden-xs text-nowrap', 'orderBy': false},
'company': {'class': 'hidden-xs hidden-sm hidden', 'orderBy': false},
'vat_id': {'class': 'hidden-xs hidden-sm text-nowrap', 'orderBy': false},
'vat': {'class': 'hidden-xs hidden-sm hidden-md text-nowrap', 'orderBy': false},
'tax_rate': {'class': 'hidden-xs hidden-sm hidden-md text-nowrap', 'orderBy': false},
'due_days': {'class': 'hidden-xs hidden-sm hidden-md text-nowrap', 'orderBy': false},
'address': {'class': 'hidden', 'orderBy': false},
'contact': {'class': 'hidden', 'orderBy': false},
@@ -39,7 +39,7 @@
<td class="{{ tables.data_table_column_class(tableName, columns, 'title') }}">{{ entry.title }}</td>
<td class="{{ tables.data_table_column_class(tableName, columns, 'company') }}">{{ entry.company }}</td>
<td class="{{ tables.data_table_column_class(tableName, columns, 'vat_id') }}">{{ entry.vatId }}</td>
<td class="{{ tables.data_table_column_class(tableName, columns, 'vat') }}">{{ entry.vat }}</td>
<td class="{{ tables.data_table_column_class(tableName, columns, 'tax_rate') }}">{{ entry.vat }}</td>
<td class="{{ tables.data_table_column_class(tableName, columns, 'due_days') }}">{{ entry.dueDays }}</td>
<td class="{{ tables.data_table_column_class(tableName, columns, 'address') }}">{{ entry.address|nl2br }}</td>
<td class="{{ tables.data_table_column_class(tableName, columns, 'contact') }}">{{ entry.contact|nl2br }}</td>