Commit Graph

6412 Commits

Author SHA1 Message Date
Matthias Mair
c2ce569506
Merge branch 'inventree:master' into bom-internal 2021-07-19 21:51:18 +02:00
Matthias
8d2e910323 style fix 2021-07-19 21:50:06 +02:00
Oliver
af68ea23c3
Merge pull request #1843 from SchrodingersGat/stock-export
Stock export
2021-07-19 17:45:11 +10:00
Oliver
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
Oliver
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
Oliver
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
Oliver
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
Oliver
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
Oliver
f9b7257bdb
Merge pull request #1835 from SchrodingersGat/disable-secondary
Disable secondary modals
2021-07-18 21:46:22 +10:00
Oliver
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
Oliver
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
Oliver
8c1248d74b
Merge pull request #1828 from SchrodingersGat/supplier-reference-fiix
Add supplier_reference field to form
2021-07-18 11:04:14 +10:00
Matthias
eba5512a38 extending form for stock creation 2021-07-18 02:58:39 +02: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
Matthias
44482800e4 switching out icon for setting 2021-07-18 02:27:15 +02:00
Matthias
210a4bccde setting for #1796 2021-07-18 02:20:56 +02:00
Oliver
5ce6dd325d
Merge pull request #1824 from SchrodingersGat/po-currency
Use default curreny code
2021-07-16 13:54:41 +10:00
Oliver
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
Oliver
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
Oliver
db16b23287
Merge pull request #1820 from eeintech/fix_logout_css
Fix logout CSS
2021-07-16 07:33:11 +10:00
eeintech
886d95e467 Easy fix! 2021-07-15 16:31:07 -04: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
Oliver
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