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
10,013 Commits 6 Branches 99 Tags 484 MiB
4a26f274af
Commit Graph

481 Commits

Author SHA1 Message Date
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
rgilham
c6fd2281d6 Allow BOM pricing to be valid when using internal pricing 2021-06-24 02:13:55 +02:00
Oliver
6d2cd78d29 Fixes for unit tests 2021-06-22 10:36:04 +10:00
Oliver
a38835022a Better management of unique constraint for Part 2021-06-22 09:33:07 +10:00
Oliver
04b216253d Ok, that was a bad idea. 2021-06-21 11:30:20 +10:00
Matthias
4f3bfe569a added in internal prices in price calculations 2021-06-07 05:25:13 +02: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
Oliver Walters
5c71f04360 Add "allow_variants" field to BomItem 2021-06-01 13:59:01 +10:00
Oliver Walters
c2fe5e08b4 Expand possibilities for variant conversion 
- Ref get_conversion_options
 2021-05-27 12:35:55 +10:00
Matthias Mair
e59f467c79
Merge branch 'master' into spaces! 2021-05-08 12:27:19 +02:00
Matthias
f2b0717d10 removes all lines consisting only of spaces 
this really bothers me for some reason - nothing technical
 2021-05-06 12:11:38 +02:00
Matthias
1b7ade9405 adding in missing parts for full saleprice 2021-05-05 23:47:46 +02:00
Oliver Walters
0fbf39f1bc More fixes 2021-04-20 10:59:28 +10:00
Oliver Walters
6b9145ae56 Fixes required for v3.2 compatibility 
- Specify DEFAULT_AUTO_FIELD
- Specify output_field for annotations
 2021-04-20 09:14:08 +10:00
Oliver Walters
e787c853e5 Update logger context 2021-04-10 20:08:13 +10:00
Matthias
32eaf48c12 fixed styling 2021-04-06 18:33:57 +02:00
Matthias
20c455384e added more translation-strings 2021-04-04 22:44:14 +02:00
Matthias
2de6fcbfa4 added missing translation fields #753 2021-04-03 03:59:09 +02:00
eeintech
64a57128bc Return True for BOM valid flag if part does not have BOM items 2021-03-15 10:37:30 -04:00
Oliver Walters
f2da1c990b Simplify process for marking a part as "starred" 2021-02-25 23:27:27 +11:00
Oliver
35b9b17167
Merge pull request #1354 from SchrodingersGat/tree-fix 
Sidenav Fixes
 2021-02-25 09:45:56 +11:00
Oliver Walters
15a59d54ca Abstract template context data for part 2021-02-24 09:05:31 +11:00
Oliver Walters
b64d48544d Bug fix for trackable parts 2021-02-23 16:49:09 +11:00
Oliver Walters
e75b9d04fe PEP fix 2021-02-18 14:38:25 +11:00
Oliver Walters
7a51e6cf78 Implement filtering which accommodates new inheritable BOM feature 
- Can no longer filter bom_items by sub_part
- Adds get_used_in_filter() and get_used_in() for part model (returns a query of other part objects)
 2021-02-18 14:35:21 +11:00
Oliver Walters
abe1018abe Add new fields to BOM item hash 2021-02-18 00:40:30 +11:00
Oliver Walters
8caf6bad10 Fix for duplicating BOM 
- Do not duplicate bom items which are "inherited"
 2021-02-18 00:38:40 +11:00
Oliver Walters
3f30421ba9 bug fix 2021-02-17 23:57:45 +11:00
Oliver Walters
bb3440a8a4 Refactor bom item filter 
- Also updates a number of part functions to make use of inherited BOM items
 2021-02-17 22:53:56 +11:00
Oliver Walters
d692c18274 Add 'inherited' field to BomItem 2021-02-17 21:53:15 +11:00
Oliver Walters
fcc35f2260 Fix display of parts currently being built 2021-02-17 13:14:27 +11:00
Oliver Walters
ba542dcbdb Auto-fill build quantity 2021-02-17 13:06:18 +11:00
Oliver Walters
8780b8435a style fix 2021-02-17 12:46:05 +11:00
Oliver Walters
28c9c80f54 Calculate quantity required for sales orders 
- Cache data going to part detail view
 2021-02-17 10:57:17 +11:00
Oliver Walters
cda97829ab Add function for required build order quantity 2021-02-17 10:27:36 +11:00
Oliver Walters
220777611a Prevent part images from auto deleting 
- Part images can be used for multiple parts
 2021-01-27 22:31:21 +11:00
Oliver Walters
526d81481b Cleanup 2021-01-18 22:25:53 +11:00
Oliver Walters
1dc2636e45 Add option to show part quantity in various forms 
Enabling this option can make BOM item forms *very* slow!
 2021-01-14 15:20:42 +11:00
Oliver Walters
e715ea5d79 Merge remote-tracking branch 'inventree/master' into stock-expiry 
# Conflicts:
#	InvenTree/common/models.py
 2021-01-05 00:58:32 +11:00
Oliver Walters
37dcf1c1cf Add "default_expiry" field to Part model 2021-01-04 23:36:11 +11:00
Oliver Walters
b05504e1c4 Add PART_VIRTUAL setting 2021-01-03 23:13:58 +11:00
Oliver Walters
0aeeba808c PEP fixes 2021-01-03 23:07:21 +11:00
Oliver Walters
6c7b648133 Implement global settings for assembly and template values of Part model 2021-01-03 23:06:51 +11:00
Oliver Walters
298e9cae65 Fix variable scope issue 2021-01-03 10:07:38 +11:00
Oliver Walters
06d9f4f982 Bugfix for duplicate IPN checks when blank IPN is used 2020-12-16 21:02:53 +11:00
Oliver Walters
b5d75d6e6a PEP fixes 2020-11-24 11:56:51 +11:00
Oliver Walters
ce82579930 Cleanup getRequiredParts function 2020-11-24 10:18:07 +11:00
Oliver Walters
af9b88de11 Fix for BomItem clean function 
Handle the case where the sub_part does not exist
 2020-11-24 09:33:26 +11:00
eeintech
d4ac35b9aa Check that category was selected before fetching templates 2020-11-12 16:52:22 -05:00
Francois
a7444a9926
Merge branch 'master' into categories_parameters 2020-11-11 06:40:11 -05:00
Oliver Walters
039a7badd1 A little whoopsie-doo: 
- Part.clean() was incorrectly referencing a BomItem when it should have been referencing BomItem.part
 2020-11-11 16:09:14 +11:00
Oliver Walters
a6028f027a Add setting to allow or prohibit duplicate IPN values 2020-11-10 09:03:26 +11:00
Oliver Walters
c95f124578 Add some helper magic for setting objects 
- If the setting is defined as a "bool" then the returned value is automatically cast to a bool
- Add some more unit testing
 2020-11-09 23:44:54 +11:00
Oliver Walters
75ab7b247b Push part settings into part/settings.py 
- Use the user-configurable defaults in the database model itself
- This means they are observed even when using the API / etc
 2020-11-09 23:16:04 +11:00
eeintech
e401bb8e3c Improved tests, fixed admin, improved naming 2020-11-04 12:06:07 -05:00
eeintech
1c14c2237a Moved category templates processing to Part save() method 2020-11-04 09:52:26 -05:00
eeintech
142cea0cbb Removed custom form save method, remove unused model methods, restored InvenTree CreateAjaxView, improved part related testing 2020-11-04 07:44:06 -05:00
Francois
b1885138de
Merge branch 'master' into categories_parameters 2020-11-03 07:01:56 -05:00
Oliver Walters
083dac1300 Merge remote-tracking branch 'inventree/master' into build-fixes 2020-11-03 21:26:39 +11:00
Oliver
ef2c04baa8
Merge pull request #1048 from eeintech/related_parts 
Related Parts
 2020-11-03 21:18:27 +11:00
eeintech
978b5f869d Added checkbox to add parameter template to all categories 2020-11-02 12:20:29 -05: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
eeintech
3e5d8d2b2d Added form to select category in settings and update context data 2020-10-31 08:35:47 -05:00
eeintech
34ff05d66e Created PartCategoryParameterTemplate model and admin interface 2020-10-30 16:09:27 -05: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
2d583d19c2 Adds function to duplicate a BOM from a parent part 
- Improves form validation workflow
- More 'djangoesque'
 2020-10-30 10:08:06 +11:00
Oliver Walters
60a8ef723b Simplify display of possible conflicting parts 
- Round to single digit
- Only show 5 closest matches

(cherry picked from commit ed8be5225d)
 2020-10-29 12:42:38 +11:00
Oliver Walters
4a7e9a2278 Update translations and PEP fixes 2020-10-28 23:59:18 +11:00
Oliver Walters
ed8be5225d Simplify display of possible conflicting parts 
- Round to single digit
- Only show 5 closest matches
 2020-10-28 23:48:35 +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
James Newlands
8bf281e153 Fix typo in new / edit part forms ("extenel URL") 
Capitalisation consistency in "Create New Part" form title
 2020-10-27 14:52:31 +11:00
Oliver Walters
6aaf178f0b Check "trackable" status of part 
- Where a BomItem connects a trackable sub_part with a non-trackable part, force the Part to be trackable
 2020-10-26 08:29:06 +11:00
Oliver Walters
ea7b1b65d6 Delete a build output entirely 
TODO: Needs to describe in the confirmation dialog what is going to happen!
 2020-10-24 00:14:27 +11:00
Oliver Walters
076d5c4f7f Cleanup get_required_parts function 2020-10-23 22:49:46 +11:00
Oliver Walters
fae516b38e Add build output selection to builditem creation form 2020-10-22 23:28:15 +11:00
eeintech
0b26d68d0f Added admin view, improved validation of part related relationship 2020-10-16 15:29:58 -05:00
eeintech
34e4409e7f Functional checkpoint: add/delete related parts from template 2020-10-16 13:50:31 -05:00
eeintech
8579abb9c2 Added related parts urls, views, form and templates 
Adding related part relationships work but are still not shown in the part detail page
 2020-10-15 16:58:39 -05:00
eeintech
3d9223c2ee Introduced PartRelated model to store part relationships 2020-10-15 14:11:24 -05:00
Oliver Walters
3ee7be1d58 Add "optional" field to BomItem 
- Defaults to False
- Indicates that the BomItem is "optional" for a build
- Will be used in the future when calculating if a Build output is fully allocated!
 2020-10-05 00:42:09 +11:00
Oliver Walters
fe3a72c6cc Add some unit testing 2020-10-05 00:29:06 +11:00
Oliver Walters
f12f8156bd Fix for "next avilable serial number" string 2020-10-02 13:54:23 +10:00
eeintech
496232ed6d Added tests for Category parameters methods, some code clean-up 2020-10-01 13:46:56 -05:00
eeintech
b7d25a75c4 Hide part toolbar, nicer part representation, improved parameters prefetching 2020-10-01 10:03:49 -05:00
eeintech
40d8a07acc Now loading data! Still need to be bonified 2020-09-29 16:49:53 -05:00
eeintech
d05a5978a0 Unique parameters names from category makes it to bootstrap table 2020-09-29 16:13:08 -05:00
Oliver
7dbb6c7c8e
Merge pull request #988 from SchrodingersGat/sell-price 
Sell price
 2020-09-19 23:52:25 +10:00
Oliver Walters
1b6843e72d Cleanup "bom_invalid" filter 
- Allow filtering by bom either valid or invalid
- Use "bom_valid" as the filter (positive tense)
 2020-09-19 21:03:49 +10:00
Oliver Walters
a95dd86540 Limit choices for the 'Part' reference in the new model 2020-09-18 09:16:59 +10:00
Oliver Walters
8f1b018f0a Add table for price breaks for selling a part 2020-09-17 23:22:37 +10:00
eeintech
440a5fafea Implemented part parameters copy from template/original part 2020-09-04 14:02:12 -05:00