Configurable activity and project number (#4729)
* added configurable activity number * added configurable project number * fix deprecations * added some tests for entity exporter * better configuration of dropdown pattern for customer, project and activity
This commit is contained in:
@@ -71,6 +71,14 @@
|
||||
</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% if activity.number is not empty %}
|
||||
<tr>
|
||||
<th>{{ 'activity_number'|trans }}</th>
|
||||
<td colspan="3">
|
||||
{{ activity.number }}
|
||||
</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% for metaField in activity.visibleMetaFields|filter(field => field.defined)|sort((a, b) => a.order <=> b.order) %}
|
||||
<tr>
|
||||
<th>{{ metaField.label|trans }}</th>
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
{% if form.project is defined %}
|
||||
{{ form_row(form.project) }}
|
||||
{% endif %}
|
||||
{{ form_row(form.number) }}
|
||||
{% if form.budgetType is defined %}
|
||||
<div class="row">
|
||||
{% if form.budget is defined %}
|
||||
|
||||
@@ -20,6 +20,8 @@
|
||||
{% endif %}
|
||||
{% elseif column == 'comment' %}
|
||||
{{ entry.comment|comment1line }}
|
||||
{% elseif column == 'number' %}
|
||||
{{ entry.number }}
|
||||
{% elseif column == 'budget' %}
|
||||
{% if entry.hasBudget() and is_granted('budget', entry) %}
|
||||
{{ entry.budget|money((entry.project is null ? defaultCurrency : entry.project.customer.currency)) }}
|
||||
|
||||
@@ -85,6 +85,14 @@
|
||||
</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% if project.number is not empty %}
|
||||
<tr>
|
||||
<th>{{ 'project_number'|trans }}</th>
|
||||
<td colspan="3">
|
||||
{{ project.number }}
|
||||
</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% if project.hasBudget() and is_granted('budget', project) %}
|
||||
<tr>
|
||||
|
||||
@@ -18,7 +18,14 @@
|
||||
</div>
|
||||
</div>
|
||||
{{ form_row(form.comment) }}
|
||||
{{ form_row(form.customer) }}
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
{{ form_row(form.customer) }}
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
{{ form_row(form.number) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
{{ form_row(form.orderNumber) }}
|
||||
|
||||
@@ -13,6 +13,8 @@
|
||||
{{ entry.comment|comment1line }}
|
||||
{% elseif column == 'orderNumber' %}
|
||||
{{ entry.orderNumber }}
|
||||
{% elseif column == 'number' %}
|
||||
{{ entry.number }}
|
||||
{% elseif column == 'orderDate' %}
|
||||
{% if entry.orderDate is not null %}{{ entry.orderDate|date_short }}{% endif %}
|
||||
{% elseif column == 'project_start' %}
|
||||
|
||||
Reference in New Issue
Block a user