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
8,255 Commits 6 Branches 99 Tags 484 MiB
af421a7d35
Commit Graph

1676 Commits

Author SHA1 Message Date
Oliver Walters
34a374ce9a Add try/except around callable default 2021-06-27 01:18:09 +10:00
Oliver Walters
0cc999410b More unit test fixes 2021-06-27 01:03:54 +10:00
Oliver Walters
232899e0c4 Simpler implementation 2021-06-27 00:25:23 +10:00
Oliver Walters
ae1a1e139f Further fixes for default API values 
- Account for callable defaults
- Extra check in is_valid()
 2021-06-27 00:01:40 +10:00
Oliver
ddbf863617 Merge remote-tracking branch 'inventree/master' into api-default-values 
# Conflicts:
#	InvenTree/InvenTree/serializers.py
 2021-06-26 21:04:41 +10:00
Oliver
949c7dd81b Set modal form title 2021-06-26 14:30:14 +10:00
Matthias
d28d66795d linked price break graphs 2021-06-25 07:41:00 +02:00
Matthias
4921cd47f9 refactor for better readabilty 2021-06-25 07:40:01 +02:00
Oliver
76ec51a93b
Merge pull request #1722 from matmair/internal-price-op 
full Internal price coverage
 2021-06-25 07:37:06 +10:00
Oliver
b20af54b76 Create select2 instance for related field 2021-06-25 07:36:37 +10:00
Matthias
b99af16bfd preparing for price breaks diagrams 2021-06-24 22:13:56 +02:00
Matthias
9ce5a9823e added doc for internal price 2021-06-24 21:48:00 +02:00
Matthias
abe00232f3 use internal price in more places 2021-06-24 21:47:11 +02:00
Oliver
04374c71c2 Annotate models with their API list view 
- It will make sense, trust me
 2021-06-25 00:17:58 +10:00
Matthias
9f27a77689 price break js refactor 2021-06-24 01:19:09 +02:00
Matthias
d7d080fb96 adding in manufacturer and supplier tables 2021-06-23 15:30:04 +02:00
Matthias
761aa04aba added bom-table 2021-06-23 12:16:33 +02:00
Matthias
332c0a43fd clearer headings 2021-06-23 12:16:04 +02:00
Oliver
70a073be21 Live update part image 2021-06-23 19:28:23 +10:00
Oliver
2e1ad0c245 Change some warnings to infos 2021-06-23 18:54:01 +10:00
Oliver
36e6b9f164 Set allow_null flag on image fields 2021-06-23 11:40:37 +10:00
Oliver
5ba7aeaa27 Fixes: 
- Use DRF ImageField, not FileField
- Ensure that permissions get updated correctly in 'test' mode
- Allow file upload in the APITester class
 2021-06-23 10:28:21 +10:00
Matthias
522ca161d6 added permissions-check to bom 2021-06-23 01:26:07 +02:00
Matthias
c8ff6ee0e2 removing old views 2021-06-23 01:11:25 +02:00
Matthias
093a181751 initial structure for single pricing view 2021-06-23 01:07:07 +02:00
Oliver
878f26c770 Enable upload of company image via the API 2021-06-23 08:39:06 +10:00
Oliver
f199feb8d9 Use the part detail API for uploading a new image 2021-06-23 08:34:45 +10:00
Oliver
b8e4b58df0 Catch potential error updating image that does not exist... 2021-06-22 22:23:27 +10:00
Oliver
2fc7c3d883 fix typo 2021-06-22 22:16:11 +10:00
Oliver
e29594811b Allow direct upload of images via the API 2021-06-22 22:09:30 +10:00
Oliver
979ef674d6 Update data for unit test fixtures 2021-06-22 13:24:03 +10:00
Oliver
eae9ff7d1d More unit test fixes 2021-06-22 11:54:18 +10:00
Oliver
6d2cd78d29 Fixes for unit tests 2021-06-22 10:36:04 +10:00
Oliver
9475af62ae Style fixes 2021-06-22 10:12:44 +10:00
Oliver
c62ba5eb12 Perform a "full_clean" on serialized model 
- DRF does not by deault run validate_unique on the model
- Need to check if we are "creating" or "updating" a model
- Catch and re-throw errors in the correct format
- Unit tests
 2021-06-22 10:09:19 +10:00
Oliver
c3fc04e872 Unit testing for part duplication 2021-06-22 09:35:34 +10:00
Oliver
a38835022a Better management of unique constraint for Part 2021-06-22 09:33:07 +10:00
Oliver
40fcfe1f47 Reduce noise in logs 2021-06-22 09:32:36 +10:00
Oliver
8fd41f5ecf Unit testing for default values 2021-06-21 21:46:22 +10:00
Oliver
5e5fc35655
Merge pull request #1688 from SchrodingersGat/supplier-part-parameters 
Adds "parameters" for manufacturer parts
 2021-06-21 16:39:15 +10:00
Oliver
04b216253d Ok, that was a bad idea. 2021-06-21 11:30:20 +10:00
Oliver
637033cf7d
Merge pull request #1692 from matmair/part-table-cat-sort 
Support sorting by category in part-table
 2021-06-21 08:33:09 +10:00
Matthias
80e47b6f76 addd in sorting for category 
fixes #1689
 2021-06-20 22:49:06 +02:00
Matthias
a0b83d530c refactor 2021-06-20 20:19:11 +02:00
Matthias
59aae51652 show stock history starting by 1 element 2021-06-20 20:17:01 +02:00
Oliver
8a8b310195 Add some more inlines in the admin interface 2021-06-21 00:46:15 +10:00
Oliver
bea7ab7175 Add python version information to the "about" window 2021-06-21 00:25:27 +10:00
Matthias
b86793703e Merge branch 'part-import' of https://github.com/matmair/InvenTree into part-import 2021-06-18 23:14:48 +02:00
Matthias
59e6cc1a10 Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-18 23:10:59 +02:00
Oliver
778aa0314d Load and display build order allocation items via AJAX 2021-06-18 19:18:35 +10:00
Oliver
10ecddf9b4 Fixes after rebase 2021-06-18 17:25:24 +10:00
Oliver Walters
0b8a50cd92 Add 'location_detail' filter 2021-06-18 16:51:34 +10:00
Oliver
43478a0be7
Merge pull request #1634 from matmair/internal-price 
Internal price
 2021-06-18 10:36:29 +10:00
Oliver
bb910a09fb
Merge pull request #1679 from matmair/fix-for-1678 
fix for part with no bom-price
 2021-06-18 10:35:59 +10:00
Matthias
4c7508cd6b tag to call a method with (multiple)args 2021-06-17 23:11:31 +02:00
Matthias
58b6bbb236 tag to read out dict value 2021-06-17 23:09:50 +02:00
Matthias
789865b996 style-fix 2021-06-17 18:25:05 +02:00
Matthias
997d68694e fix for part with no bom-price #1678 2021-06-17 18:21:11 +02:00
Matthias
6e77029d7d Revert "fix for part with no bom" 
This reverts commit dd58f89977.
 2021-06-17 18:12:41 +02:00
Matthias Mair
44464de2b6
Merge branch 'inventree:master' into internal-price 2021-06-17 16:42:57 +02:00
Matthias Mair
e77e89b16c
Merge branch 'inventree:master' into part-import 2021-06-17 16:42:49 +02:00
Matthias
dd58f89977 fix for part with no bom 2021-06-17 14:51:41 +02:00
Oliver
8766c80233
Merge pull request #1645 from matmair/pricing-reformat 
Pricing reformat
 2021-06-17 22:36:07 +10:00
Matthias
447a7dd4e4 style fix 2021-06-13 15:04:57 +02:00
Matthias
3f04a57452 added test for internal prices 2021-06-13 15:01:03 +02:00
Matthias
3fb95bea7e added test for sell price breaks 2021-06-13 13:31:31 +02:00
Matthias
c0e50128dd display latest serial on all part-views #1648 2021-06-11 23:43:23 +02:00
Matthias
4f3bfe569a added in internal prices in price calculations 2021-06-07 05:25:13 +02:00
Matthias
0e8a97acb0 added permissions 2021-06-07 05:23:13 +02:00
Matthias
37c0025399 settings for internal prices added 2021-06-07 04:58:37 +02:00
Matthias
62638f76ed fixing wrong page title 2021-06-07 04:00:12 +02:00
Matthias
6ae9fa716c added internal price to part_pricing 2021-06-07 00:19:37 +02:00
Matthias
27282c8049 Merge branch 'master' of https://github.com/inventree/InvenTree into internal-price 2021-06-06 18:15:41 +02:00
Matthias
413fa2e842 merging in sidebar icon changes fr upstream 2021-06-06 17:50:13 +02:00
Matthias
5a869d247f Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-06 17:46:33 +02:00
Matthias
fcf360f2a3 clearer information text? as in #1577 2021-06-06 14:33:26 +02:00
Matthias
36ff21f11e hide supply part price on start 2021-06-06 14:21:08 +02:00
Matthias
ced7768030 calculate button added 2021-06-06 14:20:30 +02:00
Oliver
573f601752
Merge pull request #1632 from matmair/nav-style 
same nav sidebar distance for everything
 2021-06-06 22:14:20 +10:00
Matthias
81f00753c6 style 2021-06-05 17:24:04 +02:00
Matthias
768080f9a0 Adding internal functions to use internal prices 2021-06-05 17:06:58 +02:00
Matthias
0d93c96f2a adding internal price breaks as in #1606 2021-06-05 17:01:49 +02:00
Matthias
05d79a4c19 same nav sidebar distance for everything 2021-06-05 15:18:08 +02:00
Matthias
44717b646f using new tag for currency 2021-06-05 15:07:42 +02:00
Matthias
0eff7d000a added tag to replace dynamic setting 2021-06-05 15:05:05 +02:00
Matthias
691142ea4c fixing currency display 2021-06-05 13:27:39 +02:00
Matthias
495babe712 Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-02 00:36:15 +02:00
eeintech
ffaa6ee3a9 Fixed price break row actions after sorting 2021-06-01 14:22:00 -04:00
Oliver Walters
9f407df15a Update BOM table display 2021-06-01 14:17:31 +10:00
Oliver Walters
0bd0e57f16 BomList can be filtered by "allow_variants" flag 2021-06-01 14:03:21 +10:00
Oliver Walters
5c71f04360 Add "allow_variants" field to BomItem 2021-06-01 13:59:01 +10:00
Oliver Walters
f1ca17286f Save grid / list selection to local storage settings 2021-05-30 00:38:59 +10:00
Oliver Walters
e846c744f4 Buttons to toggle between list and grid views 2021-05-30 00:23:05 +10:00
Oliver Walters
f08c83d6e5 Fix part page heading 2021-05-29 18:48:18 +10:00
Matthias Mair
9cc81df276 Merge branch 'inventree:master' into price-history 2021-05-28 12:14:03 +02:00
eeintech
cdb453b09c Merge branch 'master' of github.com:inventree/InvenTree into bom_items_purchase_price 2021-05-27 10:20:40 -04:00
Oliver Walters
af1904b6e4 Simplify exhange rate backend 2021-05-27 15:45:38 +10:00
Oliver Walters
c2fe5e08b4 Expand possibilities for variant conversion 
- Ref get_conversion_options
 2021-05-27 12:35:55 +10:00
eeintech
bf83cfb04c Merge branch 'master' of github.com:inventree/InvenTree into bom_items_purchase_price 2021-05-26 09:28:55 -04:00
Matthias Mair
859a3178a4
Merge branch 'master' into part-import 2021-05-26 13:08:58 +02:00