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
5,464 Commits 6 Branches 99 Tags 484 MiB
573f601752
Commit Graph

420 Commits

Author SHA1 Message Date
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
Oliver Walters
34a334236a Part: Alter model fields to fix data import issues 
Without setting 'null=True' on fields which may be empty,
the import subsequently fails if these fields are indeed empty
 2020-09-03 00:11:20 +10:00
Oliver Walters
4613730a19 PEP fixes 2020-09-01 20:24:14 +10:00
Oliver Walters
74f25ee7f9 Part: Extend logic for "latest" serial number 
- Return value if it is a string
- Remove 'getNextSerialNumber' function
- Improve functionality of function which returns serial number placeholder string
 2020-09-01 20:16:46 +10:00
Oliver Walters
e6c0a04131 Merge branch 'feature-non-int-serial' of git://github.com/bcc/InvenTree into bcc-feature-non-int-serial 2020-09-01 19:41:48 +10:00
Oliver Walters
73892e894e Refactoring 2020-08-31 22:30:38 +10:00
Oliver Walters
cd8214ff4a Part: add function to get part attachments for *all* parents of a part 2020-08-31 22:26:46 +10:00
Ben Charlton
06552832cb Style corrections 2020-08-28 17:30:16 +01:00
Ben Charlton
6b1696f8df Merge branch 'master' into feature-non-int-serial 2020-08-28 17:14:02 +01:00
Ben Charlton
e0a744b01d Remove no-longer-needed cast functions 2020-08-24 20:09:06 +01:00
Ben Charlton
0da2682c68 handle non-int serial range suggestions cleanly 2020-08-24 20:00:19 +01:00
Ben Charlton
d5a374f1fd Make serial number suggestion DB independent, handle mixed types more cleanly and test 2020-08-24 19:49:32 +01:00
eeintech
946d824995 Switched to ModelChoiceField 2020-08-24 11:41:14 -05:00
eeintech
6f89f7dc7f Merge branch 'master' into show_potential_bom_items_stock 2020-08-24 10:35:59 -05:00
Ben Charlton
471ece136e Merge branch 'master' into feature-non-int-serial 2020-08-24 11:12:07 +01:00
Oliver Walters
ca1985e11a PEP fixes 2020-08-23 21:10:45 +10:00
Oliver Walters
c849f618d5 Clean up implementation of test report matching 2020-08-23 21:03:29 +10:00
Ben Charlton
23cc3d9b06 Handle 'next serial' more gracefully 2020-08-21 19:17:58 +01:00
Ben Charlton
c31b30bf83 Fix simple tests 2020-08-21 18:53:51 +01:00
Ben Charlton
f7ed48809c Support non-integer serial numbers 2020-08-21 17:36:49 +01:00
eeintech
9fa13aeae3 Show 'available_stock' in Part string representation 2020-08-20 15:38:41 -05:00
Oliver Walters
92ac93aac5 More intelligent checking for circular BOM 
- Check all the way down a BOM "tree"
- Validate BOM tree before allowing BOM submission
 2020-08-18 14:17:59 +10:00
eeintech
685a58b807 Merge remote-tracking branch 'origin/master' into bom_dev 2020-08-17 12:05:54 -05:00
Oliver Walters
a4267f76e8 Fixes for barcode data rendering 2020-08-16 13:39:05 +10:00
Oliver Walters
a7ee323035 PEP fix 2020-08-08 16:59:48 +10:00
Oliver Walters
ad977d4d26 Add default ordering for Company model 
- Now will sort by "name" in choice fields, etc
 2020-08-08 16:54:09 +10:00
Oliver Walters
3a266cf322 Allow default_keywords to be null 2020-08-04 11:10:24 +10:00
eeintech
46586ba960 Corrected typo in part.models, simplified MakeBomTemplate function 2020-07-09 08:47:52 -05:00
Oliver Walters
3d245c7ce3 Improve logic of "quantity_to_order" function 2020-06-28 19:14:51 +10:00
Oliver Walters
a3c0d35b20 Fix for case where BOM item quantity is zero 2020-06-04 11:37:55 +10:00
Oliver Walters
5f3816212f template parts are now allowed to be variants 
- Do not throw an error here!
 2020-05-29 12:40:40 +10:00
Oliver Walters
7bcf9bf5be Allow template parts to be specified for the BOM item 2020-05-27 10:06:18 +10:00
Oliver Walters
009adaf528 Code to get and test for variants of a part 2020-05-25 13:13:28 +10:00
Oliver Walters
68b9a690f2 Integer value required for trackable bom item 2020-05-24 20:22:15 +10:00
Oliver Walters
01481ef5c9 Add function to get the number of required tests for a part 2020-05-23 14:28:25 +10:00
Oliver Walters
71681bfda1 Add a button if a stock item test report is available 2020-05-22 21:38:05 +10:00
Oliver Walters
1ad7e699a9 PEP 2020-05-22 21:31:21 +10:00
Oliver Walters
0ec880290b Functionality for retrieving test templates associated with a given part 2020-05-22 21:29:58 +10:00
Oliver Walters
e8c402ecd9 Add some more fields to the PartTestTemplate model 2020-05-18 19:00:45 +10:00
Oliver Walters
6cb017bbfd Add functions to test if a stock item has passed all tests 2020-05-17 22:03:55 +10:00
Oliver Walters
95d07cd02b Add unit testing for new API features 2020-05-17 14:14:54 +10:00
Oliver Walters
f791ac9f57 Register test template in the admin interface 2020-05-17 13:50:06 +10:00
Oliver Walters
badf9230a9 Add fixtures / unit testing for the stock item testing framework 2020-05-17 13:46:19 +10:00
Oliver Walters
8c8b704e38 Add PartTestTemplate model 2020-05-17 13:26:51 +10:00
Oliver Walters
8a99062704 PEP fixes 2020-05-16 17:52:25 +10:00
Oliver Walters
3d0bea15ae Refactor function naming 2020-05-16 12:03:18 +10:00
Oliver Walters
10762fc1cf Refactor tractor 2020-05-16 08:55:19 +10:00
Oliver Walters
ea88a03b5a More serial number validation and unit testing 
-
 2020-05-16 08:43:57 +10:00
Oliver Walters
0a78432a0f Convert 'part" to MPTT model - based on the 'variant_of' field 
- Now recursive variants can be implemented properly
 2020-05-15 21:35:53 +10:00
Oliver Walters
0199760e1c Bug fix 2020-05-02 20:10:12 +10:00
Oliver Walters
087001f29d Fix BOM table rendering 
- Price was not being sent in the PartBriefSerializer!
 2020-04-28 23:17:15 +10:00
Oliver Walters
9add3d4409 Much better rendering and calculation of part allocations 2020-04-28 10:43:46 +10:00
Oliver Walters
fb70da0331 Cleanup part allocation calculation functions 2020-04-28 10:35:19 +10:00
Oliver Walters
e768ada83b More work 
- Consolidated "in_stock" filter to single code location
- Improve 'limit_choices_to' for BuildItem and SalesOrderAllocation
- Various template improvements etc
 2020-04-26 16:38:29 +10:00
Oliver Walters
435c13cf7c Separate concept of "OrderStatus" into "SalesOrderStatus" and "PurchaseOrderStatus" 2020-04-23 20:38:09 +10:00
Oliver Walters
4979c690d9 Prevent BOM price calculation from becoming too recursive 2020-04-21 21:38:22 +10:00
Oliver Walters
3d2e907d5e Add a 'sales order' view for each part 2020-04-21 09:15:01 +10:00
Oliver Walters
4a615e05ae Further barcode work 
- Simplify InvenTree barcode format
- Create base-clas for plugin
 2020-04-14 21:30:43 +10:00
Oliver Walters
3c46e12839 Further work on decimal rounding 
- Prevent numbers from being represented in scientific notation
 2020-04-12 00:56:15 +10:00
Oliver Walters
fd8273e3e2 Improve build base rendering 
- Consolidate style
- Fix rendering of part pricing
 2020-04-12 00:31:59 +10:00
Oliver Walters
5e706554b1 Part table filtering 
- Filter by active status
- Filter by 'is_template' status
- Filter by 'has_stock'
- Allow cascading sublocations
- API improvements to allow new features
 2020-04-11 22:10:15 +10:00
Oliver Walters
d06018cbbe PEP fixes 2020-04-07 11:40:10 +10:00