inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-08-02 11:43:05 +00:00
Code Activity
6,296 Commits 8 Branches 165 Tags
cc90c8abbe55dad99db55bb6a662fa7a0cd5c4e7
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver cc90c8abbe Move buttons to separate table column 2021-07-11 21:15:06 +10:00
Oliver 9eb1367d80 Add "location" field 2021-07-11 21:07:56 +10:00
Oliver 3efd7f7777 Add a "notes" field 2021-07-11 20:56:29 +10:00
Oliver ca5d3a57de Set quantity input parameters based on action 2021-07-11 20:49:54 +10:00
Oliver 9e4bc274cf Allow custom code to be run on form submission 2021-07-11 20:40:27 +10:00
Oliver c045a3b6f6 Refactorin' 2021-07-11 20:36:52 +10:00
Oliver 14ab1bef14 Callback to remove row 2021-07-11 00:15:46 +10:00
Oliver 0507e8a3bc Building stock adjustment modal 2021-07-10 23:59:35 +10:00
OliverandGitHub 02214ea713 Merge pull request #1799 from SchrodingersGat/bom-export-fix 
Bug fix for BOM export
 2021-07-10 23:27:17 +10:00
Oliver 7cc1063114 PEP 2021-07-10 23:04:34 +10:00
Oliver 73e03636a2 Add unit tests 2021-07-10 23:04:20 +10:00
OliverandGitHub d9c2d061cc Merge pull request #1797 from SchrodingersGat/bom-validation-fix 
Add numerical validation step for BomItem
 2021-07-10 14:14:52 +10:00
Oliver cf66a386ea Bug fix 2021-07-10 14:13:46 +10:00
Oliver bf2774eb21 Add numerical validation step for BomItem 2021-07-10 13:48:44 +10:00
OliverandGitHub f6d5bd4ed8 Merge pull request #1760 from eeintech/bom_import 
Converted BOM import to new multi-step form framework
 2021-07-10 13:47:25 +10:00
OliverandGitHub fe6da32e64 Merge pull request #1793 from SchrodingersGat/combine-manufacturer-supplier-tables 
Consolidate Manufacturers and Suppliers views
 2021-07-09 16:57:11 +10:00
Oliver 9ae5c241f5 Move part parameters onto the part details page 2021-07-09 16:34:47 +10:00
Oliver ff92210b25 Fix URLs 2021-07-09 16:31:29 +10:00
Oliver 6eec6a0599 Consolidate Manufacturers and Suppliers views 2021-07-09 16:29:58 +10:00
OliverandGitHub b89fe4f9d4 Merge pull request #1789 from SchrodingersGat/supplier-part-table 
Add more fields to ManufacturerPart and SupplierPart tables
 2021-07-09 15:09:39 +10:00
Oliver 47a56f7f5d Fixes for unit tests 2021-07-09 14:54:03 +10:00
Oliver c694c9467b sessionStorage -> localStorage 
OMG
 2021-07-09 14:39:08 +10:00
Oliver 6b73e7a408 Add more fields to ManufacturerPart and SupplierPart tables 2021-07-09 14:28:32 +10:00
OliverandGitHub 5235ad1b0c Merge pull request #1787 from SchrodingersGat/bom-table-additions 
Add sub_part_assembly filter to BOM table
 2021-07-09 13:39:09 +10:00
Oliver 7168607a88 PEP fix 2021-07-09 13:07:01 +10:00
Oliver 079e331bf6 Add sub_part_assembly filter to BOM table 2021-07-09 13:04:48 +10:00
OliverandGitHub 558e24c985 Merge pull request #1783 from SchrodingersGat/build-table-filtering 
Fix for strange table filtering bug
 2021-07-09 12:57:03 +10:00
OliverandGitHub c45e2d682e Merge pull request #1782 from SchrodingersGat/company-rendering 
Improve rendering of "Company" in API form
 2021-07-09 12:31:31 +10:00
Oliver 9d7f9a9aa3 Fix for strange table filtering bug 
- When a table was "refreshed" based on the selectable filters, table ordering was not observed
- This was due to the original query parameter conversion not being observed
- Refactored out the conversion function so it works correctly now
- Also removed some cruft from generated query strings
 2021-07-09 12:31:25 +10:00
Oliver 7539bd47fe Fix rendering issues 2021-07-09 12:10:27 +10:00
Oliver 6a995042c9 Fix bug relating no PurchaseOrderLineItem with null Part reference 2021-07-09 12:10:17 +10:00
Oliver 4b6ca548b6 Improve form rendering for SupplierPart 2021-07-09 12:09:57 +10:00
Oliver 40ac1f39e0 Improve rendering of "Company" in API form 
- Add a thumbnail image
- Refactor select2 thumbnail code

(cherry picked from commit 2df7c520be)
 2021-07-09 11:14:38 +10:00
OliverandGitHub 19ba9bf93c Merge pull request #1780 from SchrodingersGat/IPN_case 
Fix case for filtering parts by IPN
 2021-07-09 09:26:48 +10:00
Oliver 0c73fa3b58 Add regex filter for part name 2021-07-09 09:11:31 +10:00
Oliver fd5d20ad13 Fix case for filtering parts by IPN 2021-07-09 09:08:55 +10:00
OliverandGitHub 433098ce6e Merge pull request #1778 from SchrodingersGat/build-forms 
Refactor BuildOrderEdit form
 2021-07-09 09:02:39 +10:00
Oliver 0a86d947bc Refactor PartParameterCreate form 2021-07-09 02:03:33 +10:00
Oliver cbf0e0bd4a Refactor forms for editing and deleting a PartParameter 
- PartParameters now loaded using the API, not pre-rendered
 2021-07-09 01:56:04 +10:00
Oliver cbd291849c More unit test fixes 2021-07-09 01:49:17 +10:00
Oliver 6e26bd0b71 Fixes for unit tests 2021-07-09 01:29:17 +10:00
Oliver 337223b8eb Modal form improvements 2021-07-09 01:20:40 +10:00
Oliver ecf47aa69d Fix for BuildOrder reference default value 2021-07-09 01:20:29 +10:00
Oliver 60e8a17f07 bug fix: Prevent API forms from being submitted multiple times 
- A problem if you're a manic clicker
 2021-07-09 01:06:38 +10:00
Oliver 9947a0cf90 PEP fix 2021-07-09 00:59:56 +10:00
Oliver 7e7fe7d63f Refactor buildlist filtering 2021-07-09 00:58:17 +10:00
Oliver bec98d355a Improvements 
- part_detail defaults to True for BuildSerializer
- Handle invalid parent for BuildOrder
 2021-07-09 00:49:19 +10:00
Oliver be6ecd9587 Fixes for BuildOrder forms 2021-07-09 00:36:54 +10:00
Oliver 13ca076f42 Fix for form rendering of "required" fields with a default value 
- Force the "required" parameter to be set
 2021-07-09 00:29:36 +10:00
Oliver 004b36b1df Refactor BuildOrderCreate form 2021-07-09 00:18:03 +10:00
Oliver 5016d44b83 Add default value for BuildOrder reference 2021-07-09 00:15:49 +10:00
Oliver 245c04367b Refactor BuildOrderEdit form 2021-07-08 23:57:42 +10:00
OliverandGitHub 522432f4aa Merge pull request #1776 from SchrodingersGat/part-labels 
Part labels
 2021-07-08 23:34:59 +10:00
Oliver bd4dde2cb7 Add permissions for PartLabel model 2021-07-08 23:22:25 +10:00
Oliver 15cb1e0005 Print part labels 2021-07-08 22:54:41 +10:00
Oliver c39f705ef7 Copy default part label templates 2021-07-08 22:42:31 +10:00
Oliver 1830467487 Add admin / serializer / API for PartLabel model 2021-07-08 22:10:10 +10:00
Oliver a1a4bddcc6 Add model for PartLabel 2021-07-08 21:07:45 +10:00
OliverandGitHub 0599fbaf26 Merge pull request #1773 from SchrodingersGat/ipn-filtering 
API Filtering improvements
 2021-07-08 20:47:07 +10:00
Oliver a985e11aa8 Simplify and add filters for StockList API endpoint 2021-07-08 20:10:22 +10:00
Oliver c7f79a5a08 Fixes 2021-07-08 19:23:01 +10:00
Oliver 79d90b1c4a Additional filtering options for name and IPN fields 2021-07-08 17:46:57 +10:00
Oliver f0e7826fdc Adds some more API filters for the StockItem endpoint 2021-07-08 17:44:52 +10:00
Oliver 81010994e7 Adds regex filtering for "batch" code on StockItem 2021-07-08 17:26:55 +10:00
Oliver a8a21f7c9d Transition "has IPN" filter to django-filters approach 2021-07-08 17:16:02 +10:00
Oliver ba0a13443f PEP fixes 2021-07-08 17:02:55 +10:00
Oliver 376428b80b Add regex IPN filter for Part API 2021-07-08 17:02:45 +10:00
OliverandGitHub 800cb9606a Merge pull request #1772 from SchrodingersGat/part-stock-part-column 
Reintroduces "part" column to part stock
 2021-07-08 15:27:59 +10:00
Oliver 2467690111 Reintroduces "part" column to part stock 2021-07-08 13:46:53 +10:00
OliverandGitHub a2870b60d9 Merge pull request #1757 from matmair/stock-next-prev 
Stock previous / next serial
 2021-07-08 11:41:01 +10:00
OliverandGitHub f1797dbe2f Merge pull request #1771 from SchrodingersGat/company-part-search-fix 
API: Allow search of IPN field for ManufacturerPart and SupplierPart
 2021-07-08 11:30:58 +10:00
Oliver ae68463f46 API: Allow search of IPN field for ManufacturerPart and SupplierPart 2021-07-08 11:16:04 +10:00
OliverandGitHub 309097293f Merge pull request #1768 from SchrodingersGat/attachment-fixes 
Fixes for attachment issues
 2021-07-08 11:12:34 +10:00
Oliver fcc244b52f Fixes for BuildOrder attachment API list 2021-07-08 10:50:34 +10:00
Oliver 1deab0c040 Fix for SalesOrder attachment table 2021-07-08 10:48:08 +10:00
Oliver 939d5838fa Fixes for PurchaseOrder attachment table 2021-07-08 10:45:42 +10:00
Oliver 41268d92bf Add missing bootstrap .map file 2021-07-08 10:45:23 +10:00
Oliver 1a979fc113 Filtering fix for StockItem attachments 2021-07-08 10:41:18 +10:00
Oliver ff8ddfbb5c Fix link to select2 2021-07-08 10:38:12 +10:00
OliverandGitHub 1dbdcb6d9c Merge pull request #1763 from eeintech/stock_table_supplier_part_detail 
Fixed supplier part detail handling in stock table
 2021-07-07 07:53:04 +10:00
OliverandGitHub c2df1fcd95 Merge pull request #1749 from matmair/extend-build-order 
Extend build order table
 2021-07-06 11:23:36 +10:00
OliverandGitHub db21ccdb30 Merge pull request #1761 from eeintech/stock_move_modal_notes 
Fixes for stock modal and notes propagation to tracking items
 2021-07-06 08:59:15 +10:00
OliverandGitHub 1d0dd04ca4 Merge pull request #1759 from SchrodingersGat/manufacturer-part-table-fix 
Fix filters for ManufacturerPart and SupplierPart table views
 2021-07-05 17:54:41 +10:00
Oliver f72762ceb7 Fix filters for ManufacturerPart and SupplierPart table views 2021-07-05 17:15:24 +10:00
OliverGitHubgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 		f790d6a6a5 L10 (#1752) 
* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* New Crowdin updates (#1751)

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 2021-07-05 16:54:15 +10:00
OliverandGitHub 20b0e399c0 Merge pull request #1716 from SchrodingersGat/drf-api-forms 
[WIP] API Forms
 2021-07-03 22:14:26 +10:00
Oliver 3cc9299b41 Refactor SOLineItemCreate view 2021-07-03 21:56:29 +10:00
Oliver 699b21f6fd Remove broken URL 2021-07-03 21:46:08 +10:00
Oliver 889834b693 Refactor POLineItemCreate form 2021-07-03 21:43:22 +10:00
Oliver c524f754e9 Allow null values for purchase_price and sale_price 2021-07-03 21:27:03 +10:00
Oliver 25a80d2aa7 Fix form filters 2021-07-03 21:21:32 +10:00
Oliver 8e280b6328 Increment API version 2021-07-03 20:37:50 +10:00
Oliver 2b7805e668 PEP fix 2021-07-03 20:34:30 +10:00
Oliver 8d1928f181 Typo fix 2021-07-03 20:29:23 +10:00
Oliver ce703bf94b Adds detail API endpoint for StcokItemTracking model 2021-07-03 20:26:33 +10:00
Oliver 5c1fddd96d JS bug fix 2021-07-03 16:28:03 +10:00
OliverandGitHub 45704f7a8d Merge pull request #1747 from matmair/depleted-stock 
Depleted stock on start page
 2021-07-03 16:23:27 +10:00
Oliver 83256b1014 Refactor BomItemDelete form 2021-07-03 16:10:41 +10:00
Oliver 359e92cd8e Merge remote-tracking branch 'inventree/master' into drf-api-forms 
# Conflicts:
#	InvenTree/InvenTree/static/css/inventree.css
 2021-07-03 12:59:13 +10:00
OliverandGitHub 2b32f04af2 Merge pull request #1712 from matmair/one-pricing-view 
One pricing view
 2021-07-03 12:55:34 +10:00