2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-29 20:16:44 +00:00

Merge pull request #1395 from SchrodingersGat/responsible-user

Responsible user
This commit is contained in:
Oliver 2021-03-10 18:27:46 +11:00 committed by GitHub
commit 448c3cc6f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 53 additions and 2 deletions

View File

@ -116,6 +116,7 @@ class EditPurchaseOrderForm(HelperForm):
'description', 'description',
'target_date', 'target_date',
'link', 'link',
'responsible',
] ]
@ -148,7 +149,8 @@ class EditSalesOrderForm(HelperForm):
'customer_reference', 'customer_reference',
'description', 'description',
'target_date', 'target_date',
'link' 'link',
'responsible',
] ]

View File

@ -0,0 +1,25 @@
# Generated by Django 3.0.7 on 2021-03-10 05:19
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('users', '0005_owner_model'),
('order', '0041_auto_20210114_1728'),
]
operations = [
migrations.AddField(
model_name='purchaseorder',
name='responsible',
field=models.ForeignKey(blank=True, help_text='User or group responsible for this order', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='users.Owner', verbose_name='Responsible'),
),
migrations.AddField(
model_name='salesorder',
name='responsible',
field=models.ForeignKey(blank=True, help_text='User or group responsible for this order', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='users.Owner', verbose_name='Responsible'),
),
]

View File

@ -21,6 +21,7 @@ from markdownx.models import MarkdownxField
from djmoney.models.fields import MoneyField from djmoney.models.fields import MoneyField
from users import models as UserModels
from part import models as PartModels from part import models as PartModels
from stock import models as stock_models from stock import models as stock_models
from company.models import Company, SupplierPart from company.models import Company, SupplierPart
@ -46,7 +47,7 @@ class Order(models.Model):
created_by: User who created this order (automatically captured) created_by: User who created this order (automatically captured)
issue_date: Date the order was issued issue_date: Date the order was issued
complete_date: Date the order was completed complete_date: Date the order was completed
responsible: User (or group) responsible for managing the order
""" """
@classmethod @classmethod
@ -109,6 +110,15 @@ class Order(models.Model):
related_name='+' related_name='+'
) )
responsible = models.ForeignKey(
UserModels.Owner,
on_delete=models.SET_NULL,
blank=True, null=True,
help_text=_('User or group responsible for this order'),
verbose_name=_('Responsible'),
related_name='+',
)
notes = MarkdownxField(blank=True, help_text=_('Order notes')) notes = MarkdownxField(blank=True, help_text=_('Order notes'))

View File

@ -129,6 +129,13 @@ src="{% static 'img/blank_image.png' %}"
<td>{{ order.complete_date }}<span class='badge'>{{ order.received_by }}</span></td> <td>{{ order.complete_date }}<span class='badge'>{{ order.received_by }}</span></td>
</tr> </tr>
{% endif %} {% endif %}
{% if order.responsible %}
<tr>
<td><span class='fas fa-users'></span></td>
<td>{% trans "Responsible" %}</td>
<td>{{ order.responsible }}</td>
</tr>
{% endif %}
</table> </table>
{% endblock %} {% endblock %}

View File

@ -129,6 +129,13 @@ src="{% static 'img/blank_image.png' %}"
<td>{{ order.complete_date }}<span class='badge'>{{ order.received_by }}</span></td> <td>{{ order.complete_date }}<span class='badge'>{{ order.received_by }}</span></td>
</tr> </tr>
{% endif %} {% endif %}
{% if order.responsible %}
<tr>
<td><span class='fas fa-users'></span></td>
<td>{% trans "Responsible" %}</td>
<td>{{ order.responsible }}</td>
</tr>
{% endif %}
</table> </table>
{% endblock %} {% endblock %}