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
11,683 Commits 6 Branches 99 Tags 484 MiB
1591597ef9
Commit Graph

1299 Commits

Author SHA1 Message Date
Oliver Walters
4d1eb51bc4 Fixes 2021-04-20 20:42:55 +10:00
Oliver Walters
fd3e59650a Style fixes 2021-04-20 20:15:51 +10:00
Oliver Walters
c5fa0bb459 Improved API filtering for PartCategory 2021-04-20 20:15:06 +10:00
Oliver Walters
38eea21f4f Enable printing of multiple stock location labels 2021-04-20 20:06:13 +10:00
Oliver Walters
412b05d76c Allow API filtering by "cascading" stock locations 2021-04-20 20:00:15 +10:00
Oliver Walters
6986709fb8 Reorganized stock location view 2021-04-20 19:49:07 +10:00
eeintech
2dbd61c611 Stock return to customer fix, stock children item table fix 2021-04-19 11:25:39 -04:00
Oliver
157d58b157
Merge pull request #1481 from matmair/instance-name-in-title 
Instance name in title
 2021-04-18 21:48:37 +10:00
Matthias
5b9c4dc225 sipler translation strings 2021-04-18 01:21:11 +02:00
Matthias
c233e82919 added translatable strings 2021-04-17 23:54:23 +02:00
Matthias
59063bee6b extending translations to the whole sentence 2021-04-17 23:52:21 +02:00
Matthias
20af4c9ba0 template tag for translatable alerts with links 2021-04-17 23:48:47 +02:00
Matthias
b1e08dae78 Merge branch 'master' of https://github.com/inventree/InvenTree into instance-name-in-title 2021-04-17 12:19:38 +02:00
eeintech
09ef85ce9d Fixed stock item template for items without manufacturer part 2021-04-16 11:43:21 -04:00
Oliver
d4529ec1c4
Merge pull request #1464 from matmair/translation_improv 
Translation improvments
 2021-04-16 21:46:07 +10:00
Matthias
098ac0c461 using feature in views 2021-04-15 14:52:08 +02:00
Matthias
cfae92e22b more translated strings for api-titles and filters 2021-04-15 12:15:02 +02:00
Oliver
3e6429cb13
Merge pull request #1462 from eeintech/stock_label 
Added revision and stock item QR code URL for label creation
 2021-04-15 13:00:09 +10:00
eeintech
1bf72ee335 Added revision and stock item URL for label creation 2021-04-14 16:00:28 -04:00
eeintech
3eae70e745 Merged master and company migrations 2021-04-12 11:10:35 -04:00
eeintech
6bf4140e5a Fixed transfer stock action in template 2021-04-09 16:55:05 -04:00
eeintech
f39928368e Merge branch 'master' of github.com:inventree/InvenTree into manufacturer_part 2021-04-07 10:33:55 -04:00
eeintech
2db6af2af6 PO table and stock item template improvements 2021-04-07 10:33:31 -04:00
Matthias
efd14fca64 made translation lazy 2021-04-04 22:47:01 +02:00
Matthias
20c455384e added more translation-strings 2021-04-04 22:44:14 +02:00
Matthias
c68220a597 migrations for all the translated models, totally forgot that 2021-04-03 14:11:28 +02:00
Matthias
0547e1c03b added more translations in html / js 2021-04-03 04:05:59 +02:00
Matthias
446bc06c1b switched translation methode to lazy 2021-04-03 04:01:40 +02:00
Matthias
2de6fcbfa4 added missing translation fields #753 2021-04-03 03:59:09 +02:00
eeintech
0b1f22c7fd Almost there, needs some interface testing and tweaking 2021-03-30 18:08:33 -04:00
Oliver Walters
7a4b90649a HTML / CSS fixes 2021-03-29 16:36:27 +11:00
eeintech
8619af9f09 Template fix for stock actions 2021-03-16 12:32:56 -04:00
eeintech
429f9d0a13 Removed test print 2021-03-12 11:19:20 -05:00
eeintech
89c7c87f1e Add stock filter for parts assemblies 2021-03-12 11:18:19 -05:00
Andreas Kaiser
ca626ead6c german translation 2021-03-09 00:45:37 +01:00
Andreas Kaiser
af0c72d338 german translation 2021-03-08 17:45:22 +01:00
Oliver Walters
d43cfccfc1 Typo fix 2021-03-04 22:11:38 +11:00
Oliver Walters
5ad915a845 More fields 2021-03-04 22:09:46 +11:00
Oliver Walters
a9e3e46b8a Bug fix 
check if self.object.owner is None
 2021-03-03 21:52:02 +11:00
Oliver
3d4cfcf1b6
Merge pull request #1381 from SchrodingersGat/table-name-fix 
Fixes incorrect table name
 2021-03-02 22:03:51 +11:00
Oliver Walters
cd01bb0ad7 Refactor HTML view permission 
- Introspect database model from View
- Automatically get the permission from the View class
 2021-03-02 21:32:32 +11:00
Oliver Walters
1c3b017283 Improve server-side pagination of SalesOrderLineItem 2021-03-02 12:33:41 +11:00
Oliver Walters
478dce449d Fix incorrect javascript call 2021-03-02 08:07:18 +11:00
Oliver
7aed696451
Merge pull request #1373 from SchrodingersGat/server-pagination 
Server pagination
 2021-03-01 13:31:50 +11:00
Oliver Walters
34def10765 Delete un-needed code 2021-02-28 21:44:10 +11:00
Oliver Walters
04dbfbd892 Fix for stock item tracking table 2021-02-28 20:50:19 +11:00
Oliver Walters
90feb6d210 Server-side paginatino for build orders 2021-02-28 20:31:01 +11:00
Oliver Walters
1239d4af16 Fixes result limiting 
- Required for index page
 2021-02-28 20:16:05 +11:00
Oliver Walters
487794a938 Server side pagination for the part list 2021-02-28 16:29:25 +11:00
Oliver Walters
8ce7b572cc Optionally paginate the StockList table on the server 
- This makes the bootstrap table interface SO FREAKING MUCH FASTER
- Search is now performed on the server too!
 2021-02-28 16:18:45 +11:00
Oliver Walters
6f2ba71339 Refactor side navigation tree 2021-02-28 11:48:20 +11:00
Oliver Walters
f1c8c48d35 Fix API permissions for stock adjustment 2021-02-27 20:17:52 +11:00
Oliver
d5597a3dca
Merge pull request #1363 from SchrodingersGat/api-permissions 
Api permissions
 2021-02-27 08:39:47 +11:00
Oliver Walters
b6d87850dc Hide stock buttons on top-level stock location display 2021-02-27 08:00:00 +11:00
Oliver Walters
b315b958b0 PEP fixes 2021-02-27 07:56:38 +11:00
Oliver Walters
9d099c81a7 Refactor API tests for stock 2021-02-26 21:53:54 +11:00
Oliver Walters
26e80fa0ab Fancify all the menubars 2021-02-25 09:10:20 +11:00
Oliver Walters
89bdfd1c62 StockItem display now uses menubar 2021-02-24 21:27:44 +11:00
Oliver Walters
68f24e97ac Make tree sidenav resizable 2021-02-23 21:09:55 +11:00
Oliver Walters
949a541ee0 Add more options to StockList api 
- Limit query results
- Order by various fields
 2021-02-23 13:43:26 +11:00
Oliver Walters
9159afe9ce Unit test fix 2021-02-22 17:27:48 +11:00
Oliver Walters
dffff89e9d Add option to filter out variants in stock table 2021-02-21 20:08:23 +11:00
Oliver
b95d6a4ab2
Merge pull request #1327 from SchrodingersGat/installed-test-results 
Read test results from installed items
 2021-02-19 16:49:51 +11:00
Oliver Walters
6037f1452a Unit testing for new feature 2021-02-19 15:50:32 +11:00
Oliver Walters
ea4b713eed Allow adjustment for destroyed (or lost) stock 2021-02-19 15:13:56 +11:00
Oliver Walters
e8bacbe45f Edit packaging field 2021-02-19 11:11:22 +11:00
Oliver Walters
644583f636 Display packaging info in stock table 2021-02-19 11:09:24 +11:00
Oliver Walters
556d6455e8 Add "packaging" field for StockItem 2021-02-19 11:08:58 +11:00
Oliver Walters
a9f255be85 Prevent stock item being added as an installed item inside itself 2021-02-18 18:01:41 +11:00
Oliver Walters
ef23ab1abc Adds functionality for traversing "through" installed items to extract test results 2021-02-18 17:59:04 +11:00
Oliver Walters
08cc866e74 Add function to make barcode for build order 2021-02-17 13:47:14 +11:00
Oliver Walters
2fa7c8706b Wrap custom filter validation in try/except blocks 2021-02-10 20:40:15 +11:00
Oliver
af7a627230
Merge pull request #1271 from SchrodingersGat/migration-unit-test 
Migration unit test
 2021-02-04 23:56:12 +11:00
Oliver Walters
74704a7c1e Mark migrations with data operations "non atomic" 
Ref: https://docs.djangoproject.com/en/dev/howto/writing-migrations/#non-atomic-migrations
 2021-02-04 22:19:15 +11:00
Oliver Walters
a0e7d37a19 Add setting for enabling / disabling test reports 2021-02-04 21:15:19 +11:00
Oliver Walters
7d38507785 Merge remote-tracking branch 'inventree/master' into simple-qr-codes 2021-02-01 12:24:16 +11:00
Oliver Walters
8fda2cf745 Fixes for unit tests 2021-01-29 12:47:46 +11:00
Oliver Walters
4ef6a6dc62 Translations for stock transaction notes 2021-01-29 12:23:22 +11:00
Oliver Walters
e8d73c78eb Fixes for unit tests 2021-01-28 22:37:28 +11:00
Oliver Walters
d61ae8532a Dialog for checking multiple items into a stock location 2021-01-28 21:36:57 +11:00
Oliver Walters
7e8def15ed Hide barcode actions if barcode support is disabled 2021-01-28 20:45:42 +11:00
Oliver Walters
5c9dd93ff1 More unit test fix 2021-01-22 12:22:29 +11:00
Oliver Walters
436207b315 Merge remote-tracking branch 'inventree/master' into batch-reports 
# Conflicts:
#	InvenTree/templates/stock_table.html
 2021-01-18 23:23:58 +11:00
Oliver
a5aa90cdf2
Merge pull request #1155 from eeintech/stock_owner 
Stock Locations and Items Ownership
 2021-01-18 22:55:26 +11:00
Oliver Walters
6a7c722efc Stock table button cleanup 2021-01-18 21:52:20 +11:00
Oliver Walters
0a566c062d Add click callback on item test tab 2021-01-18 21:36:37 +11:00
Oliver Walters
ef7cc3f78d Replace existing django form views with API request 2021-01-18 21:33:15 +11:00
Oliver Walters
2b30df1a70 Fix 2021-01-18 14:41:31 +11:00
Oliver Walters
a7baad33ba Fix form error for creating a new stock item 2021-01-18 14:41:31 +11:00
eeintech
72c7ceb553 Merged master and updated stock_table.html 2021-01-17 13:11:59 -05:00
Oliver Walters
fc32d99327 Add "updated_before" and "updated_after" filter for stock API 2021-01-15 16:39:50 +11:00
Oliver Walters
ef3ac43c4a Add "last updated" date to stock table 2021-01-15 15:27:40 +11:00
eeintech
7d5571ba5b Merged changes from master 2021-01-14 08:52:56 -05:00
Oliver Walters
0134597747 Merge remote-tracking branch 'inventree/master' into label-api 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
 2021-01-14 23:56:23 +11:00
Oliver Walters
df327d4e64 Add stocktake_date field to stock API, and to stock table 2021-01-14 11:29:35 +11:00
Oliver Walters
1316e6bf5b Properly save user data when creating a new StockItem 2021-01-14 11:24:52 +11:00
eeintech
e92e5dfe8f Merged master 2021-01-13 17:08:01 -05:00
eeintech
59c0a50289 Separated category from part permissions and location from stock item permissions 2021-01-13 13:35:49 -05:00
eeintech
28fb1b5fab Added owner model to admin page and added test cases 2021-01-13 11:38:37 -05:00
eeintech
0a0a47a5e4 Added location owner change test case to verify stock item owner in that location is also updated 2021-01-12 17:11:46 -05:00
eeintech
3054c637dd Removed f-string debug 2021-01-12 16:42:09 -05:00
eeintech
5ca03af3e2 Improved Owner.get_owner method and fixed tests (try#2) 2021-01-12 16:36:29 -05:00
eeintech
49c954aa68 Fixed test cases? 2021-01-12 15:02:44 -05:00
eeintech
452d22579a Removed f-string causing build failure 2021-01-12 13:23:14 -05:00
eeintech
b6135fda74 Updated templates and a lot of manual testing 2021-01-12 13:16:04 -05:00
eeintech
6f3cbb4e14 Switched to global owner model, need to validate use-cases table and fix tests 2021-01-11 17:41:29 -05:00
eeintech
6a88bdb37d StockLocation owner is now a GenericForeignKey that can be set to user or group models 2021-01-11 12:56:40 -05:00
Oliver Walters
01e27a0d59 Add simplified 'barcode' function for StockItem 2021-01-12 00:22:58 +11:00
Oliver Walters
b6cd2c215a Adds function to provide simplified barcode for stock location 2021-01-11 21:32:31 +11:00
Oliver Walters
af47b211fd Add dialog for selection of stock location labels 2021-01-11 17:22:04 +11:00
Oliver Walters
21d5440f98 Remove unused views 2021-01-09 21:55:05 +11:00
Oliver Walters
e133fff03e Download PDF for labels 2021-01-09 21:50:42 +11:00
eeintech
587bf26d94 Fixed style 2021-01-08 14:23:35 -05:00
eeintech
2f78c7c036 Updated stock tests quantities 2021-01-08 14:05:53 -05:00
eeintech
67bc86c159 Updated stock owners migration file 2021-01-07 14:05:43 -05:00
eeintech
f26f1c38a2 Merged master 2021-01-07 13:50:29 -05:00
Oliver Walters
bb72658e76 Rearrange button options for StockItem 2021-01-07 00:18:18 +11:00
Oliver Walters
7ac7e8f969 Fixed unit test 2021-01-06 23:38:01 +11:00
Oliver Walters
e5b346e7fa PEP fixes 2021-01-06 23:09:26 +11:00
Oliver Walters
1d6a049c5a Annotate stock queryset with stale status 2021-01-06 23:06:49 +11:00
Oliver Walters
e62873a650 Display "stale" status on StockItem info page 2021-01-06 22:21:18 +11:00
Oliver Walters
ba915da22b Filter StockItem API by staleness 2021-01-06 22:20:54 +11:00
Oliver Walters
33d6396a4e Exclude expired stock from builds 2021-01-06 21:00:45 +11:00
Oliver Walters
d0fb69e67d Add option to enable / disable stock expiry feature 
- Simply hides fields in form views
 2021-01-05 08:50:07 +11:00
Oliver Walters
9dc9c0fcb7 Auto-populate expiry date for stockitem when created via the API 
(Now with unit testing!)
 2021-01-05 00:21:26 +11:00
Oliver Walters
da02ab3eac Add unit testing for view 2021-01-05 00:01:44 +11:00
Oliver Walters
7d7d5d24cc Pre-fill stockitem expiry date in CreateStockItem form 2021-01-04 23:40:51 +11:00
Oliver Walters
d1ce0f062e Improve unit testing for StockItem API 2021-01-04 01:22:43 +11:00
Oliver Walters
a0c95579b4 Display expiry status on StockItem page 
- Also adds ability to filter Stock table by expired status
 2021-01-04 00:21:47 +11:00
Oliver Walters
39b9dcfec9 Add 'expired' flag to StockItem serializer 2021-01-04 00:21:21 +11:00
Oliver Walters
1a930f7f80 Add ability to edit expiry_date for StockItem 2021-01-04 00:20:02 +11:00
Oliver Walters
6d4c81e68b Add ability to filter by 'expired' status in API 2021-01-04 00:19:48 +11:00
Oliver Walters
07cda765f0 Add "expiry_date" field to StockItem model 
- Also adds "is_expired" function
 2021-01-03 23:56:35 +11:00
Oliver Walters
2ad090c224 pop purchase_price field for StockItemEdit form 2021-01-03 13:15:42 +11:00
Oliver Walters
fe0d356675 pops the purchase_price field instead of using a HiddenInput 
Using a HiddenInput on a MoneyFormField causes a validation error, for some reason...
 2021-01-03 13:13:14 +11:00
eeintech
3ff76fbdab Merging master and resolved conflict 2020-12-18 17:08:37 -05:00
eeintech
1a48405491 Keep 'stock actions' button enabled when on children tab 2020-12-17 17:37:54 -05:00
Oliver Walters
297bfd776c Pre-select a template if only one matching one exists 2020-12-15 12:31:02 +11:00
Oliver Walters
648595cf18 Hide purchase price field for non-purchaseable parts 2020-12-14 09:55:39 +11:00
eeintech
33dfecfdef Added create view test cases for stock ownership 2020-12-03 13:29:59 -05:00
eeintech
3aad5111b5 Stock ownership: test case for edit stock location and item 2020-12-03 11:56:45 -05:00
eeintech
f99c83f69d Added test case for stock location ownership 2020-12-03 07:32:01 -05:00
eeintech
5c6939429a Improved handling of stock location owner 2020-12-02 17:19:41 -05:00
eeintech
1a7a460ba8 Hidden owner field when ownership control is disabled 2020-12-02 14:05:45 -05:00
eeintech
de1dfdcc38 Improved naming of new setting and variables 2020-12-02 13:38:53 -05:00
eeintech
2bdd1305ed Fix style 2020-12-02 13:26:26 -05:00
eeintech
c66ac2579e Updated StockItem create/edit view with ownership control 2020-12-02 13:25:33 -05:00
eeintech
2d7461f609 Updated StockLocation create/edit view with ownership control 2020-12-02 12:05:00 -05:00
eeintech
c9b3c16c6f Added help text on owner fields 2020-12-01 17:46:11 -05:00
eeintech
8dac6bb982 Updated template stock item logic and added to stock locations 2020-12-01 17:41:03 -05:00
eeintech
4104e7df8e Fixed template logic 2020-12-01 16:08:27 -05:00
eeintech
2c38be2d13 Added global setting and updated stock item templates 2020-12-01 15:54:05 -05:00
eeintech
e1fb7e5d98 Added owner field to both stock item and location tables and forms 2020-12-01 13:45:01 -05:00
Bjoern Biesenbach
95f62d529f Fix sidenav in stocklist 2020-11-30 18:30:51 +01:00
Oliver Walters
6144d7e209 Fix for StockItem creation form 
- purchase_price field was required (should not be!)
- Fixed some validation issues
- Cleaned up form implementation
 2020-11-17 15:29:44 +11:00
Oliver Walters
ae7fbd6112 Add PEP8-naming extension for flake 
- Enforcing python naming checks
 2020-11-12 21:53:04 +11:00
Oliver Walters
391eeb0e46 Specify default currency when creating a new stock item 2020-11-12 11:50:59 +11:00
Oliver Walters
e4f2eecb3b Remove defunct 'build_order' field from StockItem model 
- This is now handled by the new-and-improved build system, no longer required
 2020-11-10 20:12:39 +11:00
Oliver Walters
734436b02e Add integration of django-money 
- Proper currency support
- Add PurchasePrice field to StockItem model
- This keeps track of both the price and the currency
- Display purchase price on the stockitem detail page
 2020-11-10 16:22:42 +11:00
Oliver Walters
a6028f027a Add setting to allow or prohibit duplicate IPN values 2020-11-10 09:03:26 +11:00
Oliver Walters
56b287b2c8 Logic fix for editing stock item creation form 2020-11-04 08:29:09 +11:00
Oliver Walters
2b91f69c7d Fix unit tests 2020-11-03 20:19:24 +11:00
Oliver Walters
500da8099b Add forms / views for creating a new build output, and completing the build 
- Also some refactoring of how forms are handled and saved
 2020-11-02 22:56:26 +11:00
Oliver Walters
b02c87ea50 Lots of work towards multiple build output 2020-11-02 01:24:31 +11:00
Oliver Walters
f1b83f1c17 Update fixtues for unit testing 2020-11-01 15:34:42 +11:00
Oliver Walters
95fadf1300 Update unit testing 2020-10-30 23:08:12 +11:00
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 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 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
5c5641d884 Update calls to post_save 2020-10-30 10:12:42 +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 Walters
1d6d1121a7 Add some more icons 2020-10-29 13:58:05 +11:00
Oliver Walters
a263d2fdcd Fixes for "auto allocate" concept 2020-10-29 00:49:01 +11:00
Oliver Walters
4a7e9a2278 Update translations and PEP fixes 2020-10-28 23:59:18 +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 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 Walters
d0b7d91ca4 Update multiple templates with fontawesome icons 2020-10-28 18:30:38 +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
b45a11aa3d Refactor: Add "makeIconBadge" javascript function 2020-10-24 00:33:30 +11:00
Oliver Walters
fb7d9a7edf Move "getAvailableStockItems" to the build model 2020-10-23 23:33:27 +11:00
Oliver Walters
e02536071d Add a "completed" field to the Build model 
- Keeps track of how many outputs have been produced
- Will not be directly editable by the user
 2020-10-20 23:59:37 +11:00
Oliver Walters
3bb247a135 Create an initial stockitem output when a new build is created 2020-10-20 23:27:43 +11:00
Oliver Walters
652c2dbcbe Automagically disable 'serial_numbers' field for StockItemCreate form 
- Yay, ajax magic!
 2020-10-20 22:37:55 +11:00
Oliver Walters
28460b3023 Validate that the BuildItem quantity is an integer 2020-10-20 20:42:29 +11:00
Oliver Walters
fdcef7b699 Add "install_into" field for BuildItem 
- Points to which output stock item it will be going into
 2020-10-20 20:37:57 +11:00
Oliver Walters
647e2cf64d Change text for barcode 2020-10-19 16:06:18 +11:00
Oliver Walters
634410294b Display table of items received against a particular purchase order 
- Adds new tab to "Purchase Order" view
- Adds ability to filter StockList API by purchase_order ID
 2020-10-19 11:40:57 +11:00
Oliver Walters
3c175a6c8d Update creation of StockItem via API 
- If no location is specified, but a default location exists for the part, use that
- If a location is specified (even if it is null) then the specified value is used instead
 2020-10-18 22:24:45 +11:00
eeintech
dbee26aaad Fixed insertion of backslash in the barcode button group 2020-10-13 10:29:34 -05:00
eeintech
5bcf8529ff Only users with Part view permission have part URL shown 2020-10-06 09:16:38 -05:00
eeintech
e4ce19d22a Added Test user and all permissions 2020-10-06 09:02:10 -05:00
eeintech
095cfe9845 Updated Stock permission views and templates 2020-10-06 08:55:40 -05:00
Oliver Walters
ab454e5ba4 More template changes: perms -> roles 2020-10-06 16:46:13 +11:00
Oliver Walters
dc2c9aa662 Add InvenTreeRoleMixin 
- Simplifies permission requirements for views
- e.g. 'part.view' rather than 'part.view_partcategory'
 2020-10-06 11:29:38 +11:00
Oliver Walters
3f59ce3f93 Update unit tests 
- requires the user to actually have the necessary permissions!
 2020-10-06 01:30:36 +11:00
Oliver Walters
16d720b62c Update permission requirements for API 
- Automatically use model permissions by default!
-
 2020-10-06 00:36:55 +11:00
Oliver Walters
48e050d317 Add some more unit tests and validation code for the StockItem model 
- Ensure that the build part matches the stockitem part!
 2020-10-05 00:49:00 +11:00
Oliver Walters
c1595396c4 Unit testing: fix PEP issues 2020-10-05 00:29:31 +11:00
Oliver Walters
fe3a72c6cc Add some unit testing 2020-10-05 00:29:06 +11:00
Oliver Walters
26d113e8ad Update IN_STOCK_FILTER to reject stock items which have is_building set to True 2020-10-05 00:14:04 +11:00
Oliver Walters
ee28b4eea5 Add "is_building" field to StockItem model 
- This will be set to TRUE until a stock item has been completed
 2020-10-05 00:12:42 +11:00
Oliver Walters
62734c4b72 Add a custom template for the install item form 2020-10-05 00:01:01 +11:00
Oliver Walters
3fe0886207 Remove a debug statement 2020-10-04 23:49:01 +11:00
Oliver Walters
852da6d696 Fix form validation 2020-10-04 23:48:15 +11:00
Oliver Walters
42a75a8238 Add hidden input to the InstallStockForm form 
- keeps track of "part" object
- so we can filter the stock_items queryset if the form validation fails
- Is there a more djangonic way of doing this??
 2020-10-04 23:45:52 +11:00
Oliver Walters
b9291c6705 Improve transaction note recording for the StockItem model 2020-10-04 23:33:43 +11:00
Oliver Walters
3c5968ef1a Add subrow table to the "installed items" view 
Ah, javascript...
 2020-10-04 22:58:41 +11:00
Oliver Walters
9c27680202 Finish function to install stock item(s) 2020-10-04 21:32:21 +11:00
Oliver Walters
45c888e13d Custom cleaning for form 
Ok, looks like I've been doing this wrong the whole time!
The "djangonic" way is pretty cool
 2020-10-04 21:31:44 +11:00
Oliver Walters
a686500df1 Calculate initial values for the view 2020-10-04 21:02:20 +11:00
Oliver Walters
fd22e713ff Filter available stock items by Part reference 2020-10-04 20:50:06 +11:00
Oliver Walters
f04977e7e1 Add form / view for installing a stock item into another stock item 2020-10-04 20:41:28 +11:00
Oliver Walters
27656633df Update admin links to require specific permissions 2020-09-30 23:57:23 +10:00
Oliver Walters
4f1d087654 PEP fix 2020-09-30 07:56:44 +10:00
Oliver Walters
d1cce7df94 Add direct admin links if the user is staff 2020-09-30 00:02:10 +10:00
Oliver Walters
0e5f10c020 Add some more search terms to the admin interface 2020-09-29 23:41:50 +10:00
Oliver Walters
1f6cbd7408 Add action to uninstall a particular stock item 2020-09-29 23:11:37 +10:00
Oliver Walters
38beaff01b peppy 2020-09-28 22:09:09 +10:00
Oliver Walters
d348d90fbe Cleanup errors in unit testing 2020-09-28 22:08:38 +10:00
Oliver Walters
54bfcff213 CHange "parts" to "items" 2020-09-28 22:03:41 +10:00
Oliver Walters
b2b22762ef style fixes 2020-09-28 22:01:45 +10:00
Oliver Walters
a18886f196 Add some unit tests for the new functions 2020-09-28 22:00:17 +10:00
Oliver Walters
df8d1fb32b Add functions to install and uninstall stock items 2020-09-28 21:52:23 +10:00
Oliver Walters
81ce284264 Select the "default" where we wish to uninstall parts 2020-09-28 21:41:35 +10:00
Oliver Walters
39cfe39172 View / form / url for stock-uninstall form 2020-09-28 21:27:27 +10:00
Oliver Walters
2ef8464a83 Add buttons to remove installed items from a stock item 2020-09-28 20:27:13 +10:00
Oliver Walters
b58f7d7461 Custom table display for installed stock items 2020-09-28 20:19:56 +10:00
Oliver Walters
d684ed076b Improve table filter naming 2020-09-28 20:10:29 +10:00
Oliver Walters
f253bf1843 Add ability for stock API to be filtered by installed status 2020-09-28 20:07:25 +10:00
Oliver Walters
8dd8e69c05 Add "installed parts" tab for stock item 2020-09-28 19:34:43 +10:00
Oliver Walters
97b35d9269 Renamed related name "owned_parts" to "installed_parts" 2020-09-28 19:33:32 +10:00
Oliver Walters
b76e6a5023 Bugfix: Test result ordering was reversed! 2020-09-28 09:02:17 +10:00
Oliver Walters
8a4597be6a Adds ability to filter stock API results by batch code 2020-09-23 09:11:46 +10:00
Oliver Walters
f19a727a02 Allow searching by stock item batch code 2020-09-19 23:40:06 +10:00
Oliver Walters
083bfe05c0 Add ability to search stock API 
- serial number
- part information
 2020-09-19 21:49:07 +10:00
Oliver Walters
32cde5d8f1 Fixx css for multiple button groups 2020-09-13 20:56:05 +10:00
Oliver Walters
87f25eacc5 Add link from stock item to base part 2020-09-06 00:01:14 +10:00
Oliver
22e30903b6
Merge pull request #965 from SchrodingersGat/api-stock-fix 
Major bugfix for multiple annotations in API querysets
 2020-09-05 23:42:25 +10:00
Oliver Walters
db214dfd73 Update queryset annotation for StockItem 
- Query time reduced from 4.1 to 3.5s (for sample data)
 2020-09-05 22:50:17 +10:00
Oliver Walters
f737ad2d38 Bugfix: CreateStockItem form 
- hide the field rather than popping it
 2020-09-05 20:31:18 +10:00
Oliver Walters
bb9e8fa97b Merge remote-tracking branch 'inventree/master' into multi-db-unit-test 
# Conflicts:
#	InvenTree/build/test_build.py
 2020-09-02 20:02:22 +10:00
Oliver Walters
911727f7b7 Update test fixtures 
- Can't assume that pk values will be assigned sensibly!
- Need to hard-code them in
 2020-09-02 19:47:07 +10:00
Oliver Walters
74f25ee7f9 Part: Extend logic for "latest" serial number 
- Return value if it is a string
- Remove 'getNextSerialNumber' function
- Improve functionality of function which returns serial number placeholder string
 2020-09-01 20:16:46 +10:00
Oliver Walters
e6c0a04131 Merge branch 'feature-non-int-serial' of git://github.com/bcc/InvenTree into bcc-feature-non-int-serial 2020-09-01 19:41:48 +10:00
Oliver Walters
1eeaa17085 Merge remote-tracking branch 'inventree/master' 2020-09-01 16:41:07 +10:00
Oliver Walters
ffbdb0317f Add "focus" option when displaying a modal form 2020-09-01 12:43:37 +10:00
Oliver Walters
59e7474f75 Stock: More unit tests 
- Add some more tests (would have caught a bug that was there already, darn it)
 2020-08-31 20:09:43 +10:00
Oliver Walters
8615cad711 Stock: Fix serializers.py 
- Use of read_only PrimaryKeyRelatedField was breaking POST via API
 2020-08-31 20:08:07 +10:00
Ben Charlton
06552832cb Style corrections 2020-08-28 17:30:16 +01:00
Ben Charlton
6b1696f8df Merge branch 'master' into feature-non-int-serial 2020-08-28 17:14:02 +01:00
Oliver Walters
f6d8a3f229 Merge remote-tracking branch 'upstream/master' 2020-08-27 22:50:52 +10:00
Oliver Walters
27f7745231 Follow link to newly created StockItem 2020-08-27 08:37:18 +10:00
Oliver Walters
19329a9627 Merge remote-tracking branch 'inventree/master' 2020-08-27 00:21:42 +10:00
Oliver Walters
146dae6d43 Toot toot - it's the refactor tractor! 
- New function for launching a CreateStockItem form
- Wraps up the previous code improvements into a single function
- Oh, the ease!
 2020-08-27 00:08:02 +10:00
Oliver Walters
72899530cf Add helper function to simplify reloading of field options 2020-08-26 23:43:19 +10:00
Oliver Walters
9dcc23ee4e Hide 'supplier part' options if no part is selected in the form 2020-08-26 23:40:15 +10:00
Oliver Walters
d44ad541eb Add "callback" functionality for modal forms when a given field is changed 
- Attach callback function
- Add a function to retrieve a field by name
 2020-08-26 22:35:36 +10:00
Oliver Walters
54d0c4e8a8 Bugfix: Select test report template 
- Actually, two bugs!
 2020-08-26 14:29:49 +10:00
Ben Charlton
7d6055f06f Merge branch 'master' into feature-non-int-serial 2020-08-25 09:28:42 +01:00
Ben Charlton
9c2d13b487 test non-numeric serials are handled correctly for ranges 2020-08-24 20:04:10 +01:00
Ben Charlton
d5a374f1fd Make serial number suggestion DB independent, handle mixed types more cleanly and test 2020-08-24 19:49:32 +01:00
Ben Charlton
9149aa1536 Fix internal server error when serializing stock with no location 2020-08-24 18:04:22 +01:00
Ben Charlton
471ece136e Merge branch 'master' into feature-non-int-serial 2020-08-24 11:12:07 +01:00
Oliver Walters
78826dc20b Merge remote-tracking branch 'inventree/master' 2020-08-23 21:21:18 +10:00
Oliver
2a4b9c6c5c
Merge pull request #929 from SchrodingersGat/label-enable 
Label enable
 2020-08-23 21:18:11 +10:00
Oliver Walters
c849f618d5 Clean up implementation of test report matching 2020-08-23 21:03:29 +10:00
Oliver Walters
8f1af0f5f9 Add "enabled" field to Label class 
- Only list labels which are enabled
- Allows labels to be hidden / disabled without being deleted
 2020-08-23 09:07:15 +10:00
Ben Charlton
23cc3d9b06 Handle 'next serial' more gracefully 2020-08-21 19:17:58 +01:00
Ben Charlton
c31b30bf83 Fix simple tests 2020-08-21 18:53:51 +01:00
Ben Charlton
f7ed48809c Support non-integer serial numbers 2020-08-21 17:36:49 +01:00
Ben Charlton
eeca3effee Fix disabled form item from preventing stock location moves for items with serial numbers 2020-08-21 16:20:33 +01:00
Oliver Walters
98017cb8bd Merge remote-tracking branch 'inventree/master' 2020-08-21 22:11:02 +10:00
Oliver Walters
59b3d8b5bc Fix stocktake export 
- Exclude MPTT fields
- Fix foreignkey field references
 2020-08-21 20:08:47 +10:00
Oliver Walters
142a1462bb Merge remote-tracking branch 'inventree/master' 2020-08-20 16:02:18 +10:00
Oliver Walters
90d34cdfcf StockItem: Allow customer field to be blank 2020-08-20 14:54:55 +10:00
Oliver Walters
e67327953d Merge remote-tracking branch 'inventree/master' 2020-08-16 15:10:23 +10:00
Oliver
b5b882d3b6
Merge pull request #906 from SchrodingersGat/blabel 
Label Printing Functionality
 2020-08-16 14:02:38 +10:00
Oliver Walters
d52278e423 Icon tweak 2020-08-16 13:45:58 +10:00
Oliver Walters
da079b23dc Fix duplicate label printing menu action 2020-08-16 13:43:59 +10:00
Oliver Walters
a4267f76e8 Fixes for barcode data rendering 2020-08-16 13:39:05 +10:00
Oliver Walters
2bbc65cc59 Add "brief" version of QR codes 
- Use this to render to labels (as it contains much less information)
 2020-08-16 13:29:38 +10:00
Oliver Walters
1807ba4e7b Add form for selecting label template for a StockItem 2020-08-16 12:10:58 +10:00
Oliver Walters
cdde0f8c43 Add URL endpoint for downloading PDF labels 2020-08-16 11:12:21 +10:00
Oliver Walters
18b3fd3256 Add context data to StockItemLabel model 2020-08-16 10:24:15 +10:00
Oliver Walters
2f77007dbe Significant query speed improvements to stock list API 
- Thanks, django-debug-toolbar!
- Gah, django DRF is the worst. Enforcing a PrimaryKeyRelatedSerializer seems to really improve speed
 2020-08-15 21:15:11 +10:00
Oliver Walters
3b01614a38 Merge remote-tracking branch 'inventree/master' 2020-08-09 21:37:06 +10:00
Oliver Walters
cebba6909c Revert thing 2020-08-09 21:21:12 +10:00
Oliver Walters
3336eb9f45 Default stock list behaviour is to only show in_stock items 2020-08-09 21:12:49 +10:00
Oliver Walters
0da9e0f834 Add "sent_to_customer" filter 2020-08-09 21:10:21 +10:00
Oliver
fcfd1f82d6
Merge pull request #898 from SchrodingersGat/filter-depleted 
Filter depleted
 2020-08-08 17:19:28 +10:00
Oliver Walters
402301e165 Add ability to filter stock items by "depleted" status 2020-08-08 17:06:22 +10:00
Oliver Walters
732405f738 Cannot edit quantity for serialized stock when adjusting 2020-08-08 17:01:29 +10:00
Oliver Walters
3831a04ce0 Merge remote-tracking branch 'inventree/master' 2020-08-08 09:52:48 +10:00
Oliver Walters
8d9cfd3678 Migration file for StockStatus codes 2020-08-08 09:44:21 +10:00
Oliver Walters
a2c3c1086c Catch unhandled javascript errors 2020-08-08 09:31:57 +10:00
Oliver Walters
ff71fe6e93 Fix "in_stock" logic for StockItem 
- Not in stock if it is at a customer!
 2020-08-08 09:20:42 +10:00
Oliver Walters
861a2982db Removed "SHIPPED" stock status code 2020-08-08 09:16:53 +10:00
Oliver Walters
bdea29df04 Add functionality to return stock item from customer 2020-08-08 09:05:33 +10:00
Oliver Walters
7b332d93ee Rearrange button layouts 2020-08-08 08:48:27 +10:00
Oliver Walters
d65d76653c Merge remote-tracking branch 'inventree/master' 2020-08-03 20:49:33 +10:00
Oliver Walters
10691b3d03 Allow creation of a stock item with zero quantity 2020-07-30 21:05:37 +10:00
Oliver Walters
d90edab59f Staff users are allowed to delete stock items that otherwise are not able to be deleted 2020-07-30 20:23:46 +10:00
Oliver Walters
5f2ca784c9 Merge branch 'negative-stock-fix' 2020-06-28 19:26:56 +10:00
Oliver Walters
930f903f5d Add ability to display "out of stock" items against a part 2020-06-22 10:48:41 +10:00
Oliver Walters
82433db1ea Merge remote-tracking branch 'inventree/master' 2020-06-12 18:16:23 +10:00
Oliver Walters
1ad4b8b131 Reorganize buttons for "Part" view 2020-06-12 18:11:57 +10:00
Oliver Walters
ab4e6548dc Transfer stock items into a stock location using barcode scanning 2020-06-12 16:29:08 +10:00
Oliver Walters
351a55c9ea Add the concept of "action groups" to the buttons for the Stock Location view 2020-06-12 11:14:33 +10:00
Oliver Walters
e1c503836d Improve barcode icon in navbar 2020-06-12 10:56:52 +10:00
Oliver Walters
6064c6ceb5 Add dialog for linking a barcode with a stock item 2020-06-12 10:26:23 +10:00
Oliver Walters
b559816dca Update translations 2020-06-12 10:25:07 +10:00
Oliver Walters
ba94b340dd Add function to un-link barcode from a stock item 2020-06-12 10:12:31 +10:00
Oliver Walters
2d9b75c6ae Include URL data in barcode scan endpoint 2020-06-11 19:21:38 +10:00
Oliver Walters
bc31cc550e Consolidate buttons for stock item 2020-06-10 15:27:30 +10:00
Oliver Walters
f40a9d1dad Merge remote-tracking branch 'inventree/master' 2020-06-09 16:28:59 +10:00
Oliver Walters
38dcdcad54 Update translation hooks 2020-06-09 16:18:38 +10:00
Oliver Walters
c7586b83e9 Fix display of buttons for stock item 
(cherry picked from commit b23017b6bf)
 2020-06-09 13:15:12 +10:00
Oliver Walters
b23017b6bf Fix display of buttons for stock item 2020-06-09 13:14:29 +10:00
Oliver Walters
a6a58b299b Merge remote-tracking branch 'inventree/master' 2020-06-06 08:59:28 +10:00
Oliver Walters
126e42a022 Add "IPN" column to stock list table 2020-06-06 08:47:06 +10:00
Oliver Walters
7be158722f Merge remote-tracking branch 'inventree/master' 2020-06-05 20:04:41 +10:00
Oliver Walters
16d261d956 Make description fields optional 2020-06-05 19:33:32 +10:00
Oliver Walters
9f599546de Use stock status for determining "in stock" 2020-06-05 09:08:46 +10:00
Oliver Walters
408c6a4040 Filter stock list by "customer" 2020-06-05 09:05:57 +10:00
Oliver Walters
2c7e0bd321 Merge remote-tracking branch 'inventree/master' 2020-06-04 20:07:59 +10:00
Oliver Walters
ca1526405b PEP fixes 2020-06-04 19:51:43 +10:00
Oliver Walters
80019a3ed8 Add forms/views for manually assigning a stock item to a customer 2020-06-04 19:45:41 +10:00
Oliver Walters
d907136264 Display customer in stock item 2020-06-04 19:13:37 +10:00
Oliver Walters
fbd21827fb Add 'customer' field to StockItem 2020-06-04 19:08:33 +10:00
Oliver Walters
4ddabb82ef Add a button to assign stock item to customer 2020-06-04 11:50:55 +10:00
Oliver Walters
dd9584f487 Follow link when a new stock item is created 2020-05-30 20:58:52 +10:00
Oliver Walters
8459de7be2 Display a message if no stock location is set 2020-05-30 20:58:05 +10:00
Oliver Walters
b73044cd44 Merge remote-tracking branch 'inventree/master' 2020-05-29 13:47:19 +10:00
Oliver Walters
59d9e430b4 Remove unique-together requirement 
- This is handled manually via the validate_unique function
 2020-05-28 20:38:24 +10:00
Oliver Walters
774e26eb19 Mark some fields as not-required via the API 2020-05-28 20:33:33 +10:00
Oliver Walters
d0b3e0bd7c Merge remote-tracking branch 'inventree/master' 2020-05-27 09:31:15 +10:00
Oliver Walters
78990a99e5 Fix serializer for stock item 2020-05-26 23:01:30 +10:00
Oliver Walters
fe69a8e7bb Merge remote-tracking branch 'inventree/master' 2020-05-26 21:53:20 +10:00
Oliver Walters
e128410d54 Update 'required' status for new serializers 
(cherry picked from commit 2306e29743eb25266c78bec5357d1194e0778c58)
 2020-05-26 20:29:09 +10:00
Oliver Walters
81e38eeb14 Add some more custom FileField serializers 
(cherry picked from commit 7b9ff27baefacc977fef7852e99d8a9bb46a062a)
 2020-05-26 20:29:04 +10:00
Oliver Walters
861e30e8d6 Add a special serializer class for FileField which has a custom to_representation function 
- This was solving a very subtle bug which will probably only ever apply to a single installation instance
- Future me will most likely not remember what this was for or how it works
- In any case, there we go
- Ref: http://www.cdrf.co/3.9/rest_framework.fields/Field.html

(cherry picked from commit 7305094854)
 2020-05-26 20:29:00 +10:00
Oliver Walters
03cc6892ea Merge remote-tracking branch 'inventree/master' 2020-05-26 12:52:17 +10:00
Oliver Walters
c0f1966a2c Decimal filter on StockItem adjustment form 2020-05-26 12:08:00 +10:00
Oliver Walters
4cbf2099fa Add stock item filtering by serial number range 2020-05-26 11:49:48 +10:00
Oliver Walters
046a00026c remove debug print 2020-05-26 11:42:30 +10:00
Oliver Walters
ae4bfd07da StockItemCreate form now has better logic for auto-detecting the part 2020-05-26 11:31:08 +10:00
Oliver Walters
1bf696a052 Allow API upload of file attachments against StockItemTestResult objects 2020-05-25 22:19:28 +10:00
Oliver Walters
d2c1e9e2b0 Type fixes 2020-05-25 14:24:29 +10:00
Oliver Walters
0d052334e2 Allow stock items to be created for template parts 2020-05-25 14:20:35 +10:00