Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #855 from SchrodingersGat/part-table

Browse Source 
Add "IPN" column to part table
This commit is contained in:
Oliver 2020-06-05 19:38:16 +10:00 committed by GitHub
commit f563ac0dcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 99 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
InvenTree/InvenTree/models.py
View File

@ -102,12 +102,14 @@ class InvenTreeTree(MPTTModel):
name = models.CharField(
blank=False,
max_length=100,
validators=[validate_tree_name]
validators=[validate_tree_name],
help_text=_("Name"),
)
description = models.CharField(
blank=False,
max_length=250
blank=True,
max_length=250,
help_text=_("Description (optional)")
)
# When a category is deleted, graft the children onto its parent

24
InvenTree/part/migrations/0044_auto_20200605_0931.py Normal file
View File

@ -0,0 +1,24 @@
# Generated by Django 3.0.5 on 2020-06-05 09:31
import InvenTree.validators
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('part', '0043_auto_20200527_0005'),
]
operations = [
migrations.AlterField(
model_name='partcategory',
name='description',
field=models.CharField(blank=True, help_text='Description', max_length=250),
),
migrations.AlterField(
model_name='partcategory',
name='name',
field=models.CharField(help_text='Name', max_length=100, validators=[InvenTree.validators.validate_tree_name]),
),
]

18
InvenTree/part/migrations/0045_auto_20200605_0932.py Normal file
View File

@ -0,0 +1,18 @@
# Generated by Django 3.0.5 on 2020-06-05 09:32
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('part', '0044_auto_20200605_0931'),
]
operations = [
migrations.AlterField(
model_name='partcategory',
name='description',
field=models.CharField(blank=True, help_text='Description (optional)', max_length=250),
),
]

24
InvenTree/stock/migrations/0046_auto_20200605_0931.py Normal file
View File

@ -0,0 +1,24 @@
# Generated by Django 3.0.5 on 2020-06-05 09:31
import InvenTree.validators
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('stock', '0045_stockitem_customer'),
]
operations = [
migrations.AlterField(
model_name='stocklocation',
name='description',
field=models.CharField(blank=True, help_text='Description', max_length=250),
),
migrations.AlterField(
model_name='stocklocation',
name='name',
field=models.CharField(help_text='Name', max_length=100, validators=[InvenTree.validators.validate_tree_name]),
),
]

18
InvenTree/stock/migrations/0047_auto_20200605_0932.py Normal file
View File

@ -0,0 +1,18 @@
# Generated by Django 3.0.5 on 2020-06-05 09:32
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('stock', '0046_auto_20200605_0931'),
]
operations = [
migrations.AlterField(
model_name='stocklocation',
name='description',
field=models.CharField(blank=True, help_text='Description (optional)', max_length=250),
),
]

10
InvenTree/templates/js/part.html
View File

@ -95,6 +95,8 @@ function loadPartTable(table, url, options={}) {
field: 'pk',
title: 'ID',
visible: false,
switchable: false,
searchable: false,
}
];
@ -103,9 +105,16 @@ function loadPartTable(table, url, options={}) {
checkbox: true,
title: '{% trans 'Select' %}',
searchable: false,
switchable: false,
});
}
columns.push({
field: 'IPN',
title: 'IPN',
sortable: true,
}),
columns.push({
field: 'name',
title: '{% trans 'Part' %}',
@ -231,6 +240,7 @@ function loadPartTable(table, url, options={}) {
original: params,
formatNoMatches: function() { return "{% trans "No parts found" %}"; },
columns: columns,
showColumns: true,
});
if (options.buttons) {