Oliver Walters
3a702266e6
Merge remote-tracking branch 'inventree/master' into build-fixes
...
# Conflicts:
# InvenTree/InvenTree/views.py
# InvenTree/build/views.py
# InvenTree/locale/de/LC_MESSAGES/django.po
# InvenTree/locale/en/LC_MESSAGES/django.po
# InvenTree/locale/es/LC_MESSAGES/django.po
# InvenTree/order/views.py
# InvenTree/part/api.py
# InvenTree/part/views.py
# InvenTree/templates/js/bom.js
2020-10-30 22:44:25 +11:00
Oliver
ad90adbc04
Merge pull request #1095 from SchrodingersGat/forms
...
Refactor how form errors are handled
2020-10-30 22:12:45 +11:00
Oliver Walters
1caa341f8e
Fixes for unit tests
2020-10-30 21:34:56 +11:00
Oliver Walters
e049ca1a85
More refactoring
2020-10-30 16:54:05 +11:00
Oliver
87903f27ed
Merge pull request #1094 from SchrodingersGat/typo-fix
...
Fixed a typo in bom.js
2020-10-30 16:23:07 +11:00
Oliver Walters
c533f59405
Refactor how form errors are handled
...
- Use form.add_error (as the django gods intended)
2020-10-30 16:04:56 +11:00
Oliver Walters
cabbdbb5cf
Fixed a typo in bom.js
2020-10-30 15:53:13 +11:00
Oliver
fb28204dfd
Merge pull request #1093 from SchrodingersGat/bom-filters
...
Add filtering for BOM table
2020-10-30 12:45:46 +11:00
Oliver Walters
2428e77969
Add filtering for BOM table
2020-10-30 11:45:54 +11:00
Oliver
1311e5fe58
Merge pull request #1092 from SchrodingersGat/copy-bom
...
Copy bom
2020-10-30 11:40:06 +11:00
Oliver Walters
5c5641d884
Update calls to post_save
2020-10-30 10:12:42 +11:00
Oliver Walters
2d583d19c2
Adds function to duplicate a BOM from a parent part
...
- Improves form validation workflow
- More 'djangoesque'
2020-10-30 10:08:06 +11:00
Oliver Walters
90cfb3496a
Merge remote-tracking branch 'inventree/master' into build-fixes
...
# Conflicts:
# InvenTree/locale/de/LC_MESSAGES/django.mo
# InvenTree/locale/de/LC_MESSAGES/django.po
# InvenTree/locale/en/LC_MESSAGES/django.po
# InvenTree/locale/es/LC_MESSAGES/django.po
# InvenTree/templates/js/bom.js
2020-10-29 15:23:51 +11:00
Oliver
a148cfe593
Merge pull request #1088 from SchrodingersGat/tweaks
...
Tweaks
2020-10-29 15:16:49 +11:00
Oliver Walters
1d6d1121a7
Add some more icons
2020-10-29 13:58:05 +11:00
Oliver Walters
f1a7ac3187
Add icon badges to bom.js
2020-10-29 13:26:32 +11:00
Oliver Walters
fda0bff14c
Tweaks to part.js
2020-10-29 13:20:42 +11:00
Oliver Walters
8246e9c802
Add function makeIconBadge for tables
...
- Add filters for part variants table
2020-10-29 13:18:45 +11:00
Oliver Walters
b3ac261746
Add filter for supplier part table:
...
Filter by "active" status
2020-10-29 12:50:17 +11:00
Oliver Walters
60a8ef723b
Simplify display of possible conflicting parts
...
- Round to single digit
- Only show 5 closest matches
(cherry picked from commit ed8be5225d
2020-10-29 12:42:38 +11:00
Oliver Walters
05ce17f8df
Tweaks
2020-10-29 09:45:42 +11:00
Oliver Walters
a263d2fdcd
Fixes for "auto allocate" concept
2020-10-29 00:49:01 +11:00
Oliver Walters
551064b3a4
Bugfix: BOM API now works slightly differently
2020-10-29 00:07:51 +11:00
Oliver Walters
544b63cac5
Merge remote-tracking branch 'inventree/master' into build-fixes
...
# Conflicts:
# InvenTree/locale/de/LC_MESSAGES/django.po
# InvenTree/locale/en/LC_MESSAGES/django.po
# InvenTree/locale/es/LC_MESSAGES/django.po
2020-10-29 00:01:10 +11:00
Oliver Walters
4a7e9a2278
Update translations and PEP fixes
2020-10-28 23:59:18 +11:00
Oliver Walters
ed8be5225d
Simplify display of possible conflicting parts
...
- Round to single digit
- Only show 5 closest matches
2020-10-28 23:48:35 +11:00
Oliver Walters
091a9d9803
Refactor how form errors are handled
...
- When in doubt, refer to the django docs
- There was a *much* better way (thanks, form.add_error)!
- The anti-pattern was deleted, and lo, there was much rejoicing
- Some other refactoring too
2020-10-28 23:33:33 +11:00
Oliver
6dc5ef0cdc
Merge pull request #1085 from SchrodingersGat/more-icons
...
More template updates
2020-10-28 23:29:15 +11:00
Oliver Walters
d8ada930c8
More template updates
...
- Add icons to more action buttons
2020-10-28 22:37:58 +11:00
Oliver Walters
d06b4d7c9f
Merge remote-tracking branch 'inventree/master' into build-fixes
...
# Conflicts:
# InvenTree/InvenTree/urls.py
# InvenTree/locale/de/LC_MESSAGES/django.mo
# InvenTree/locale/de/LC_MESSAGES/django.po
# InvenTree/locale/en/LC_MESSAGES/django.po
# InvenTree/locale/es/LC_MESSAGES/django.po
# InvenTree/part/templates/part/bom.html
# InvenTree/templates/js/build.js
# InvenTree/templates/js/table_filters.js
# InvenTree/templates/stock_table.html
# tasks.py
2020-10-28 22:25:14 +11:00
Oliver
c8ec55a5fe
Merge pull request #1084 from SchrodingersGat/used-in-table
...
Used in table
2020-10-28 21:21:44 +11:00
Oliver Walters
44010fe05b
Translation updates
2020-10-28 18:30:50 +11:00
Oliver Walters
d0b7d91ca4
Update multiple templates with fontawesome icons
2020-10-28 18:30:38 +11:00
Oliver Walters
d272eec384
Update translation files
2020-10-28 18:13:19 +11:00
Oliver Walters
5e70d8df7e
Rename javascript files from .html to .js
2020-10-28 18:13:02 +11:00
Oliver Walters
c63480c65b
Improve table for displaying what parts a particular part is "used in"
2020-10-28 18:12:38 +11:00
Oliver Walters
3ec2396ec1
Updated allocation card view
2020-10-27 23:33:51 +11:00
Oliver Walters
22a5f921b8
Auto-generate build outputs when a build is created
2020-10-27 23:09:17 +11:00
Oliver Walters
170d55d64e
Add custom form validation step
2020-10-27 22:52:01 +11:00
Oliver Walters
4055a36db2
Updated modal forms
2020-10-27 22:29:34 +11:00
Oliver Walters
646fe40950
Require either serial or batch number to be set for trackable part
2020-10-27 22:00:38 +11:00
Oliver Walters
54d5d2899e
Update javascript callbacks
2020-10-27 21:47:24 +11:00
Oliver
43907fb129
Merge pull request #1082 from jnewlands/typo_fix_external_link
...
Fix typo in new / edit part forms ("extenel URL")
2020-10-27 16:43:14 +11:00
James Newlands
c61eeca3e4
Even though nothing happened to the database schema, the field description changed
2020-10-27 15:58:05 +11:00
James Newlands
8bf281e153
Fix typo in new / edit part forms ("extenel URL")
...
Capitalisation consistency in "Create New Part" form title
2020-10-27 14:52:31 +11:00
Oliver Walters
06a3899325
Disable "unallocate" button if there are not any allocations
2020-10-27 09:26:16 +11:00
Oliver Walters
b5e1d3f87a
Sorter fixes
2020-10-27 08:58:29 +11:00
Oliver
9ed787b4da
Merge pull request #1077 from SchrodingersGat/custom-tag-fix
...
Bug fix - re-introduce settings_value custom tag
2020-10-27 07:49:12 +11:00
Oliver Walters
4167e1fdb3
Update translation files
2020-10-26 22:51:57 +11:00
Oliver Walters
210d39c8b7
Bug fix - re-introduce settings_value custom tag
...
(cherry picked from commit 9203f541be
2020-10-26 22:44:49 +11:00
