inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-18 04:33:48 +00:00
Code Activity
6,422 Commits 9 Branches 164 Tags
b0c4a58f3002f2f0971c6b254af443773b965d4e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver b0c4a58f30 Fix URL patterns for ManufacturerPart and SupplierPart 2021-07-20 15:06:09 +10:00
OliverandGitHub 4600b0d337 Update README.md 2021-07-20 11:35:55 +10:00
OliverandGitHub 17c8dc3441 Merge pull request #1844 from eeintech/po_import 
Purchase Order File Upload Update
 2021-07-20 07:58:48 +10:00
OliverandGitHub 8d04acd5f5 Merge pull request #1846 from matmair/bom-internal 
Allow BOM pricing to be valid when using internal pricing - style fix
 2021-07-20 07:53:43 +10:00
OliverandGitHub af68ea23c3 Merge pull request #1843 from SchrodingersGat/stock-export 
Stock export
 2021-07-19 17:45:11 +10:00
OliverandGitHub ca36775f62 Merge pull request #1842 from SchrodingersGat/installed-items 
Add "installed_items" as a context variable to TestReport
 2021-07-19 17:23:56 +10:00
Oliver 4413699844 PEP fixes 2021-07-19 17:23:51 +10:00
Oliver efb4f194b6 Refactor StockExportOptions form 2021-07-19 17:23:18 +10:00
Oliver 87d4a51575 Add "installed items" section to default TestReport 2021-07-19 16:44:56 +10:00
Oliver 4fdb18318a Add "installed_items" as a context variable to the StockItem TestReport template 2021-07-19 16:32:36 +10:00
OliverandGitHub e7d9485c16 Merge pull request #1841 from SchrodingersGat/api-bump 
0.3.1
 2021-07-19 15:56:39 +10:00
Oliver e04bbb016d 0.3.1 
Bumped API version to 8
 2021-07-19 15:10:57 +10:00
OliverandGitHub 44d45050b9 Merge pull request #1840 from SchrodingersGat/bom-table-fix 
Fix duplicate table naming
 2021-07-19 15:03:31 +10:00
Oliver 40c203c123 Ensure BOM pricing table is loaded 2021-07-19 14:40:02 +10:00
Oliver bbada3e873 Fix duplicate table naming 2021-07-19 14:34:58 +10:00
OliverandGitHub fa9ef02d23 Merge pull request #1836 from SchrodingersGat/supplier-part-forms 
Supplier part forms
 2021-07-19 11:17:45 +10:00
Oliver 33e70ec5a7 Unit test fixes 2021-07-19 10:55:23 +10:00
OliverandGitHub efd0caba6e Merge pull request #1829 from matmair/initial-amount 
Initial amount
 2021-07-19 09:53:40 +10:00
Oliver 565fe9a98e Remove custom creation code for SupplierPart serializer 2021-07-19 09:44:48 +10:00
Oliver Walters 0d660e3c69 Unit test fixes 
(cherry picked from commit 787064abc0)
 2021-07-19 00:24:21 +10:00
Oliver Walters 0288a1acbf Refactor edit and delete views for ManufacturerPart 2021-07-18 22:59:34 +10:00
Oliver Walters 0c91691ed2 Refactor SupplierPartEdit and SupplierPartDelete forms 2021-07-18 22:46:23 +10:00
Oliver Walters 29d7cb40e1 Add edit and delete buttons for supplier-part table 2021-07-18 22:31:04 +10:00
Oliver Walters 56fa6c512b Refactor SupplierPartCreate form 2021-07-18 22:21:11 +10:00
OliverandGitHub f9b7257bdb Merge pull request #1835 from SchrodingersGat/disable-secondary 
Disable secondary modals
 2021-07-18 21:46:22 +10:00
OliverandGitHub 14e2cabffa Merge pull request #1834 from SchrodingersGat/add-line-item-fix 
Add 'destination' field to POLineItem API serializer
 2021-07-18 21:41:29 +10:00
OliverandGitHub b1165af3c3 Merge pull request #1833 from SchrodingersGat/part-cat-form-improvements 
Part cat form improvements
 2021-07-18 21:32:31 +10:00
Oliver Walters b04d6051a4 Disable secondary modals 2021-07-18 21:32:25 +10:00
Oliver Walters e17b92b126 Add 'destination' field to POLineItem API serializer 2021-07-18 21:25:59 +10:00
Oliver Walters c33cfe9503 Small rendering improvements 2021-07-18 21:17:03 +10:00
Oliver Walters 753fe9c80f Ordering and rendering for StockLocation 2021-07-18 21:15:51 +10:00
Oliver Walters 36cf614aed Add "level" to PartCategory serializer 
- Also use tree ordering by default
 2021-07-18 21:11:53 +10:00
OliverandGitHub 8c1248d74b Merge pull request #1828 from SchrodingersGat/supplier-reference-fiix 
Add supplier_reference field to form
 2021-07-18 11:04:14 +10:00
Oliver Walters f4f7514b45 Similar fix for customer_reference field 2021-07-18 10:47:35 +10:00
Oliver Walters 9719a14587 Add supplier_reference field to form 2021-07-18 10:33:27 +10:00
OliverandGitHub 5ce6dd325d Merge pull request #1824 from SchrodingersGat/po-currency 
Use default curreny code
 2021-07-16 13:54:41 +10:00
OliverandGitHub 9ded804707 Merge pull request #1823 from SchrodingersGat/table-fixes 
Link fixes
 2021-07-16 13:43:04 +10:00
Oliver 733951883e Use default curreny code 2021-07-16 13:35:51 +10:00
Oliver 0fcb4e3170 Link fixes 2021-07-16 13:30:11 +10:00
OliverandGitHub 3f3d058bfa Merge pull request #1817 from SchrodingersGat/spa-bug-fix 
Fixes for issues with new SPA approach
 2021-07-16 07:33:28 +10:00
OliverandGitHub db16b23287 Merge pull request #1820 from eeintech/fix_logout_css 
Fix logout CSS
 2021-07-16 07:33:11 +10:00
Oliver cbbd58c743 Fixes for issues with new SPA approach 
- Fix manufacturer part table
- Fix supplier part table
- Consolidate manufacturer and supplier parts onto single page
- CSS fixes
 2021-07-16 01:13:48 +10:00
OliverandGitHub bb60eed897 Merge pull request #1811 from SchrodingersGat/spa 
Dynamically switch between navbar selections on pages
 2021-07-15 23:43:43 +10:00
Oliver 28b3432afe Delete outdated unit test 2021-07-15 23:19:47 +10:00
Oliver e86e15df99 Fix part import form 2021-07-15 23:18:41 +10:00
Oliver e116ef9a8b Fix BOM upload form 2021-07-15 23:14:40 +10:00
Oliver 09d175f7cf Fix purchase order import form 2021-07-15 23:11:59 +10:00
Oliver c61fc7c1df Refactor part pricing page 2021-07-15 23:06:37 +10:00
Oliver 0fc558068f Refactor BuildOrder pages 2021-07-15 22:40:14 +10:00
Oliver 533a3aa368 Refactor StockItem pages 2021-07-15 22:19:13 +10:00
Oliver b1640fcc23 Refactor StockLocation pages 2021-07-15 21:38:05 +10:00
Oliver 676cca89a1 Refactor ManufacturerPart pages 2021-07-15 21:32:46 +10:00
Oliver 52da678636 Refactor SupplierPart page 2021-07-15 21:24:33 +10:00
Oliver 72337dab49 Refactor PartCategory views 2021-07-15 17:26:06 +10:00
Oliver d5bf108fef Remove unused template file 2021-07-15 16:54:49 +10:00
Oliver df89008116 Refactor allocation page(s) 
- Also perform null check on notes before displaying
 2021-07-15 16:53:14 +10:00
Oliver e38d740bbc Refactor "used in" page 2021-07-15 16:44:46 +10:00
Oliver e7c7bdcd00 Refactor BOM page 2021-07-15 16:42:28 +10:00
Oliver 57851b0eaf Refactor build orders display 2021-07-15 16:36:20 +10:00
Oliver c8c7f78ce9 Refactor "related parts" view 2021-07-15 16:28:26 +10:00
Oliver 8607d702c4 Refactor variants page 2021-07-15 16:17:41 +10:00
Oliver 985bd39234 Fix links 2021-07-15 16:14:48 +10:00
Oliver 84149d34a6 Refactor part-supplier view 2021-07-15 16:12:27 +10:00
Oliver 984e16d5af Return all part parameters to the main part edit form 
- refactor purchaseorder view
- refactor salesorder view
 2021-07-15 16:07:46 +10:00
Oliver 352a58b373 Can select nav based on URL query parameter 2021-07-15 13:41:26 +10:00
Oliver 3786454e4c Remove URL 2021-07-15 12:56:26 +10:00
Oliver 1a30a5bc16 Merge "test template" page 2021-07-15 12:56:17 +10:00
Oliver 2d2ad91545 Move "stock" part view 2021-07-15 12:52:36 +10:00
Oliver 0667857754 Refactor part base display 2021-07-15 12:04:48 +10:00
OliverandGitHub 94792596e9 Update version.py 
Bumped version number
 2021-07-15 09:54:55 +10:00
OliverandGitHub c816afbe62 Merge pull request #1812 from eeintech/improve_supplier_part_fetch 
Custom SupplierPart object manager and prefetch related models
 2021-07-14 07:59:25 +10:00
Oliver 8fed3b3522 Typo fix 2021-07-13 22:03:49 +10:00
Oliver 8dde89e781 Table fixes 2021-07-13 21:57:49 +10:00
Oliver c1c0a262b2 Refactor Company detail view 2021-07-13 21:53:48 +10:00
Oliver b6227f7d28 Refactor PurchaseOrder display 2021-07-13 21:21:00 +10:00
Oliver 65de52b705 Add javascript to dynamically switch between views 2021-07-13 20:58:05 +10:00
Oliver 9889e314a9 Remove unused templates 2021-07-13 20:04:12 +10:00
Oliver 970f08260c Update navbar 2021-07-13 20:04:02 +10:00
Oliver 39c58e4015 Move all "SalesOrder" content onto a single page 2021-07-13 19:59:11 +10:00
Oliver a0b3359d62 Fix filtering for build orders 2021-07-13 19:58:47 +10:00
OliverandGitHub 2295008944 Merge pull request #1808 from SchrodingersGat/part-page-refactor 
Move "attachments" and "notes" to "Part Detail" page
 2021-07-12 23:56:40 +10:00
Oliver cf23fb6fe8 PEP fixes 2021-07-12 23:32:08 +10:00
Oliver b1af07c8cb Remove stale pages 2021-07-12 23:31:10 +10:00
Oliver 77d80f5c0f Move "attachments" and "notes" to "Part Detail" page 
(cherry picked from commit daf0a082dc04c04cfd68cab70148a7d7cf28460f)
 2021-07-12 23:27:50 +10:00
OliverandGitHub 6af05b2b83 Merge pull request #1807 from SchrodingersGat/forms-cleanup 
Remove unused forms
 2021-07-12 22:40:20 +10:00
OliverandGitHub 374c3676a3 Merge pull request #1806 from SchrodingersGat/manufacturer-part-api-form 
Refactor ManufacturerPartCreate form
 2021-07-12 22:23:15 +10:00
Oliver 0cb2b49333 Remove unused forms 2021-07-12 22:23:08 +10:00
OliverandGitHub bd8b52d7d2 Merge pull request #1804 from SchrodingersGat/api-stock-adjustments 
Api stock adjustments
 2021-07-12 22:16:56 +10:00
Oliver 7c80767414 PEP fixes 2021-07-12 22:06:03 +10:00
Oliver 30fd3c8841 Unit test fixes 2021-07-12 22:03:36 +10:00
OliverandGitHub e9c7937ef4 Merge pull request #1805 from SchrodingersGat/selec2-fix 
Fix dodgy CSS file
 2021-07-12 21:34:14 +10:00
Oliver c3b0593aba Refactor ManufacturerPartCreate form 2021-07-12 21:32:09 +10:00
Oliver ccf17bf4c5 Fix dodgy CSS file 2021-07-12 21:19:00 +10:00
Oliver 77cfadad42 Add 'title' option for contsructed fields 2021-07-12 21:11:29 +10:00
Oliver 52eedef820 remove old StockAdjust view 2021-07-12 21:03:28 +10:00
Oliver edf4aab063 Refactor "showQuestionDialog" function 2021-07-12 21:03:01 +10:00
Oliver a1579eecfd Refactor "showAlertDialog" function 2021-07-12 20:55:28 +10:00
Oliver e9bf4b4cef Add some more functionality to StockLocation page 2021-07-12 20:53:36 +10:00
Oliver 2ea4824030 Add option to move stock for a part 2021-07-12 20:45:45 +10:00
Oliver 9fc7976569 Refactor all "adjustment" forms to use the new API approach 2021-07-12 20:38:54 +10:00