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
13,770 Commits 6 Branches 99 Tags 484 MiB
0bab40fe88
Commit Graph

2476 Commits

Author SHA1 Message Date
Oliver
da6c723184 Merge branch 'master' into partial-shipment 
# Conflicts:
#	InvenTree/order/serializers.py
 2021-11-29 22:59:36 +11:00
Oliver
4ee55847f1 Refactor attachment tables 2021-11-28 14:21:20 +11:00
Oliver
0949bac175 serializer fixes 2021-11-28 14:21:09 +11:00
Oliver
6582fd3d04 Add 'link' field to attachment serializer 2021-11-28 12:57:37 +11:00
Oliver
e9ed7bffc9 adds a "link" field to the InvenTree attachment model 
- Allows attachments to also serve as links to external files
 2021-11-28 12:53:01 +11:00
Oliver
ef7a9b5152 Adds a simple endpoint for accessing serial number information for a Part instance 
- This is not included by default in the "part detail" endpoint as it must be calculated!
 2021-11-27 00:11:18 +11:00
Oliver
760c80dbb6 Merge remote-tracking branch 'inventree/master' into partial-shipment 2021-11-26 22:08:17 +11:00
Oliver
2b704ccdc0 Exclude same part from "related" input 2021-11-26 21:09:29 +11:00
Oliver
68e2b0850b Merge branch 'master' into partial-shipment 
# Conflicts:
#	InvenTree/build/serializers.py
#	InvenTree/order/templates/order/so_sidebar.html
 2021-11-26 08:25:51 +11:00
Oliver
4a90786296 PEP code style fixes 2021-11-25 14:55:24 +11:00
Oliver
e6dfe27c57 Add a "related parts table" function 2021-11-25 14:54:21 +11:00
Oliver
9e01bc8ff2 Bug fix for serializer detail 2021-11-25 14:45:28 +11:00
Oliver
88df774aef Add part detail filter to PartRelated serializer 2021-11-25 14:42:44 +11:00
Oliver
4704845a7b Add filter for "relatedpart" API endpoint 2021-11-25 14:42:31 +11:00
Oliver
68f7887379 Related parts are now created via the API 2021-11-25 14:23:27 +11:00
Oliver
2065c05519 Adds API endpoints and serializers 2021-11-25 14:18:21 +11:00
Oliver
a532babde8 Related part table now uses "loadPartTable" function call 2021-11-25 14:13:49 +11:00
Oliver
b497569228 Add Part list API filter for "related" status 
- Adds "related" filter
- Adds "exclude_related" filter
 2021-11-25 14:00:04 +11:00
Oliver
28dc417a9f Add unit testing for 'validated' filter 2021-11-24 10:52:20 +11:00
Oliver
568e606d5b Fix filtering by 'validated' parameter 2021-11-24 10:45:48 +11:00
Oliver
c04ea3e0bb Adds unit test for "validated" filter option on BomItem list 2021-11-24 10:41:19 +11:00
Oliver
e53e3b4a51
Merge pull request #2350 from matmair/matmair/issue2347 
Fix sidebar translation
 2021-11-23 12:57:11 +11:00
Matthias
d884e62be1
[FR] Confirm to W293 
Fixes #2335
 2021-11-23 00:28:23 +01:00
Matthias
d79e9a62b4
fix trans tags 2021-11-22 23:42:29 +01:00
Matthias
c20afad84d
replace sidebar_links 2021-11-22 20:40:01 +01:00
Matthias
933c420844
fix sidebar translation 
Fixes #2347
 2021-11-22 20:24:22 +01:00
Oliver
32a8d247e2 Fix for BomItem import in admin page 2021-11-21 22:12:58 +11:00
Oliver
6a6eae7e54 Bug fix for BOM uploading 
(cherry picked from commit 2e04b311306259e0ead07de9e08b3ba376caf4e4)
 2021-11-20 18:10:51 +11:00
Oliver
f8aa5514ae Fix BOM export for multi-level BOMs 2021-11-20 17:44:54 +11:00
Oliver
521ec4f1e6 Merge branch 'master' into partial-shipment 
# Conflicts:
#	InvenTree/order/serializers.py
 2021-11-18 23:43:36 +11:00
Oliver
7d80387f3c
Merge pull request #2329 from SchrodingersGat/bom-quantity-fix 
Bom quantity fix
 2021-11-18 23:24:44 +11:00
Oliver
7ca36a092e convert remaining serializers 2021-11-18 23:01:19 +11:00
Oliver
c3fb6a6861 Convert BOM quantity field to new field class 2021-11-18 22:50:37 +11:00
Oliver
b726df3a5e style fixes 2021-11-18 20:57:44 +11:00
Oliver
1f5e4a1e6b Adds a template tag for testing if the server is running in demo mode 2021-11-18 20:17:27 +11:00
Oliver
5e04f2acf3 Merge remote-tracking branch 'inventree/master' into partial-shipment 2021-11-17 20:53:26 +11:00
Oliver
9614963f16 Put function into migration file 2021-11-17 08:58:32 +11:00
Oliver
db009189ca remove unused function 2021-11-16 20:07:16 +11:00
Oliver
192cfb80b0 Merge remote-tracking branch 'inventree/master' into partial-shipment 
# Conflicts:
#	InvenTree/InvenTree/version.py
 2021-11-16 17:06:38 +11:00
Oliver
e36b4458bd PEP fixes 2021-11-15 23:58:34 +11:00
Oliver
ca3c3685fe Tweaks 2021-11-15 23:51:21 +11:00
Oliver
01da889c46 Add ability to search "partparametertemplate" API by "name" field 2021-11-15 23:31:56 +11:00
Oliver
00dc7dafe1 Construct "used in" table 2021-11-15 22:39:58 +11:00
Oliver
a9852355c4 Add a unit test 2021-11-15 22:28:09 +11:00
Oliver
1f997d07b6 Update BOM API to allow filtering by "uses" 2021-11-15 22:16:13 +11:00
Oliver
dad097a3ba Merge remote-tracking branch 'inventree/master' into partial-shipment 2021-11-15 10:55:17 +11:00
Oliver
1deb0f2c1b
Merge pull request #2296 from SchrodingersGat/requires-restart 
Requires restart
 2021-11-12 16:02:31 +11:00
Matthias
5bb3a95699
Fix theme selector 
Fixes #2298
 2021-11-11 23:04:16 +01:00
Oliver
626637a06a Add "hidden" property to global settings 
- Allows certain settings to be hidden from the javascript files
 2021-11-11 22:16:46 +11:00
Oliver
d5cf2b08ac Merge remote-tracking branch 'inventree/master' into partial-shipment 
# Conflicts:
#	InvenTree/InvenTree/version.py
#	InvenTree/order/models.py
 2021-11-11 12:35:59 +11:00
Matthias
bae28e8207
Add setting for enabeling reports 
Fixes #2278
 2021-11-10 23:54:54 +01:00
Oliver
4a26f274af fixing silly bug I introduced 2021-11-10 14:00:30 +11:00
Oliver
1bb51a7309 Normalize "available stock" quantity before exporting 2021-11-10 13:27:59 +11:00
Oliver
bd81eba380 PEP style fixes 2021-11-10 11:13:30 +11:00
Oliver
6a534e0322 Improve options for installing a part into another part 
- Allow "variant" parts when the BOM specifies that variants are allowed for a particular BOM item
 2021-11-10 11:11:52 +11:00
Oliver
cb075ed2c2 Fix logic for converting stock items to applicable variants 2021-11-08 15:10:41 +11:00
Oliver
bf4de526ac Typo fix 2021-11-05 10:20:47 +11:00
Oliver
f27acde934 More fixes 
- Allow stock item creation for inactive parts
- Better handling of successful stock item creation
- Disable fields rather than hiding them
 2021-11-05 00:02:55 +11:00
Oliver
f0e44f0efd Merge remote-tracking branch 'inventree/master' into stock-item-forms 2021-11-04 17:24:30 +11:00
Oliver
2130b02e7f
Merge pull request #2193 from matmair/matmair/issue2181 
Add missing part import fields
 2021-11-04 16:54:30 +11:00
Oliver
3a7f8c9196 Fix comparison operator 2021-11-04 16:18:49 +11:00
Oliver
5ae6241083 Fixes for low-stock emails 
- Include variant stock in test
- Improve email template
 2021-11-04 16:15:11 +11:00
Oliver
170d8d11d3
Merge pull request #2246 from SchrodingersGat/build-order-notification 
Build order notification
 2021-11-04 15:23:39 +11:00
Oliver
01191d84c5 Only run check stock function when updating an existing part 2021-11-04 14:32:42 +11:00
Oliver
6db6a70fc2 Add task to check required stock for build order 2021-11-04 13:32:14 +11:00
Oliver
9dba3c3f10 Refactored bom export 2021-11-04 12:10:36 +11:00
Oliver
3b56895f4d Merge branch 'master' into stock-item-forms 2021-11-04 10:34:49 +11:00
Oliver
52242e7a00 Catch error 2021-11-04 08:40:38 +11:00
Oliver
a447e22108 Prevent low-stock notifications from overwhelming users 
- Limit to once per day, per part
 2021-11-04 01:18:00 +11:00
Oliver
5542532223 Template tweaks 2021-11-04 00:44:16 +11:00
Oliver
ee7c3ae066 Update index page 2021-11-04 00:38:34 +11:00
Oliver
476a1342c1 Improve notification of 'low stock' parts: 
- Traverse up the variant tree
- Enable subscription by "category"
 2021-11-04 00:28:10 +11:00
Oliver
1c6eb41341 Ability to toggle part category "star" status via the API 2021-11-04 00:01:52 +11:00
Oliver
7567b8dd63 MOAR FEATURES: 
- Add admin view for PartCategoryStar
- Add starred status to partcategory API
- Can filter by "starred" status
- Rename internal functions back to using "starred" (front-end now uses the term "subscribe")
 2021-11-03 23:22:31 +11:00
Oliver
f9a00b7a90 Adds extra subsctiption functionality for Part and PartCategory 
- Allows variants and templates
- Allows categories and sub-categories
- Unit testing
 2021-11-03 22:57:49 +11:00
Oliver
cf023e2cc1 Create new model for "PartCategory" 2021-11-03 18:10:34 +11:00
Oliver
e7f6268640 Improvements for alert notifications 
- Dismissable
- Delete after a certain amount of time
 2021-11-03 17:55:30 +11:00
Oliver
85adf842f6 Change bullhorn icon to bell icon 2021-11-03 16:59:59 +11:00
Oliver
63ec5770f4 Merge remote-tracking branch 'inventree/master' into subscription-refactor 2021-11-03 16:55:54 +11:00
Oliver
e5435df2ba Merge remote-tracking branch 'inventree/master' into stock-item-forms 2021-11-03 15:46:30 +11:00
Oliver
74521b7628
Merge pull request #2239 from SchrodingersGat/more-part-details 
Add more information to the "part details" tab
 2021-11-03 14:18:43 +11:00
Oliver
31ea71d391 Display part category 2021-11-03 14:00:13 +11:00
Oliver
d435689562 Add more information to the "part details" tab 2021-11-03 13:57:50 +11:00
Oliver
ecccae1081 Merge remote-tracking branch 'inventree/master' into stock-item-forms 2021-11-03 13:34:45 +11:00
Oliver
08ffa102c6 Fixes for part category table 
(cherry picked from commit f7ef309995f8a52c213748f4a9226724e288c936)
 2021-11-03 13:34:01 +11:00
Oliver
08719d4d1b
Merge pull request #2236 from SchrodingersGat/badge-fix 
Fix CSS for user badges
 2021-11-03 12:41:10 +11:00
Oliver
b1c23e30f5 Fix CSS for user badges 2021-11-03 11:59:20 +11:00
Oliver
c636f13ba8 Template fix for BOM upload 2021-11-03 11:44:42 +11:00
Oliver
aaf27d4098 Adds new buttons to create a new stock item 2021-11-03 07:27:58 +11:00
Oliver
4bfdf21107 Change "star" icon to "bullhorn" icon 2021-11-02 15:07:20 +11:00
Oliver
6f9ac4a850 - Fixes for construct_absolute_url function 
- Refactor notification email generation
- Update template file
- Add separate templates folder for email
 2021-11-02 00:40:25 +11:00
Oliver
9cbc2b82b5
Merge pull request #2208 from rocheparadox/master 
Email notification for low stock
 2021-11-01 22:45:49 +11:00
rocheparadox
76c1e936db Added post_delete hook to StockItem 
moved the business logic of 'deciding if a low stock notification has to be sent' to part.tasks
 2021-11-01 08:25:59 +05:30
Matthias Mair
c775d030f9
Merge branch 'inventree:master' into matmair/issue2181 2021-11-01 01:06:18 +01:00
Oliver
360f0406b5 CSS updates 
- Add template for filter lists
- Filter lists now layout horizontally
- Change flex-row to flex-wrap
 2021-11-01 08:38:24 +11:00
rocheparadox
40da41959b Created part.tasks file and moved notify_low_stock function to the same from InvenTree.tasks. The argument type is changed from StockItem to Part 
Added trans to headers of table in email template of low_stock_notification.html

added is_part_low_on_stock() function to the part model to check if the part's stock has fallen below the minimum quantity

used offload_task function to run the low stock notification function asynchronously
 2021-10-31 11:26:41 +05:30
Matthias Mair
20a129f396
Merge branch 'inventree:master' into matmair/issue2181 2021-10-30 17:24:03 +02:00
Oliver
eaa315e726 Merge branch 'master' into partial-shipment 
# Conflicts:
#	InvenTree/build/templates/build/build_base.html
#	InvenTree/order/templates/order/order_base.html
#	InvenTree/order/templates/order/sales_order_base.html
#	InvenTree/order/templates/order/sales_order_detail.html
#	InvenTree/order/templates/order/so_navbar.html
 2021-10-30 23:44:06 +11:00
Oliver
75c8faa09f Tweaks 2021-10-30 22:30:04 +11:00
Oliver
a689b77cfb More tweaks 2021-10-30 13:18:11 +11:00
Oliver
c2a8cfd183 PEP style fixes 2021-10-30 12:57:49 +11:00
Oliver
8e1d9c281a Adds tree view for stock locations 2021-10-30 12:53:25 +11:00
Oliver
be23634c5d Refactor display toggle for part list and part category list 2021-10-30 12:45:07 +11:00
Oliver
3bd59728db CSS tweaks 2021-10-30 08:59:40 +11:00
Oliver
4eea8c8193 Remove old tree classes 2021-10-30 00:18:41 +11:00
Oliver
a792903a79 Catch sidebar error 2021-10-30 00:15:19 +11:00
Oliver
a15cc1f3ba linting fixes 2021-10-30 00:07:51 +11:00
Oliver
57240865e8 More tweaking 2021-10-30 00:05:32 +11:00
Oliver
3849ea8057 Rearranging buttons 2021-10-29 23:20:09 +11:00
Oliver
c04118ed8a Driving the refactor tractor around the farm 2021-10-29 22:20:06 +11:00
Oliver
b41d1aed12 Refactor admin button for: 
- build order
- part detail
- stock item
- stock location
- company detail
- manufacturer-part
- purchase order
- sales order
 2021-10-29 17:07:35 +11:00
Oliver
890fd0f1a0 Remove nav tree 2021-10-29 10:54:15 +11:00
Matthias Mair
6e486140c3
Merge branch 'inventree:master' into matmair/issue2181 2021-10-29 00:21:11 +02:00
Oliver
80a41affc1 More sidebar action 2021-10-29 01:20:24 +11:00
Oliver
e0d3facfac Refactor sidebar for "stock item" page 2021-10-29 00:40:16 +11:00
Oliver
59acf45ab9 Implement sidebar for "part category" display 2021-10-29 00:29:09 +11:00
Oliver
f0fe7f2d5c Complete refactoring of part sidebar 2021-10-29 00:20:39 +11:00
Oliver
2778ff55da Remove btn-default 2021-10-28 19:57:17 +11:00
Oliver
f8ac016d60 replace labels with badges 2021-10-28 17:41:40 +11:00
Oliver
05d350b6c8 Tweaks for settings pages 2021-10-28 12:38:33 +11:00
Oliver
ae2c3e8293 remove "panel-inventree" references 2021-10-28 08:31:36 +11:00
Oliver
8535dd7572 part category and stock location views 2021-10-27 23:53:41 +11:00
Oliver
840187f577 refactor stock item page 2021-10-27 23:35:59 +11:00
Oliver
9d2b4af83f Refactor part display 2021-10-27 23:29:10 +11:00
Oliver
e235e5adec Replace "panel-body" with "panel-content" 2021-10-27 23:09:14 +11:00
Oliver
711b3ba923 remove "panel-default" 2021-10-27 23:08:15 +11:00
Oliver
fe25ce8cd1 Refactor "manufacturer_part" view 2021-10-27 22:52:11 +11:00
Oliver
a004f293ff Replace all instances of data-toggle with data-bs-toggle 2021-10-27 22:06:30 +11:00
Oliver
e178a2c370 Refactoring for "stock" pages 2021-10-27 21:50:18 +11:00
Oliver
9df9aaa18f breadcrumbs 2021-10-27 20:17:37 +11:00
Oliver
75845ce1ca Merge branch 'master' into partial-shipment 2021-10-27 01:05:55 +11:00
Oliver
bff9f0828a Adds API endpoint to allocate stock items against a SalesOrder 
- SalesOrderAllocations are no longer created manually
- API endpoint performs data validation
- Multiple line items can be allocated at once
- Adds unit testing for new API endpoint
 2021-10-26 23:51:36 +11:00
Oliver
2d910022ac Fix for supplier price breaks 
- Make "price" field an InvenTreeMoneySerializer instance
- Add client-side validation for number inputs
 2021-10-26 01:55:41 +11:00
Matthias
7f6f22fb03
move part toggle button 
under action buttons to save vertical space when closed
 2021-10-24 00:40:23 +02:00
Matthias
d97e3cd4e5
create stock on import 2021-10-24 00:19:17 +02:00
Matthias
bec845003d
fix defaults 2021-10-23 23:57:10 +02:00
Matthias
612832c3e7
respect defaults 2021-10-23 23:48:42 +02:00
Matthias
8e6aaa89f9
calculate true / false for fields 2021-10-23 23:40:57 +02:00
Matthias
1556663254
added fields to save step 2021-10-23 23:40:29 +02:00
Matthias
71cc155dc9
Capitalize name 2021-10-23 22:50:01 +02:00
Matthias
da9d2f7467
Added missing fields 
Fixes #2181
 2021-10-23 22:49:06 +02:00
Oliver
a97a918860 cut out the fat 
(removing dead code for outdated form views)
 2021-10-17 21:46:33 +11:00
Oliver
4a6c1e850f Cleanup unused form 2021-10-17 21:40:59 +11:00
Oliver
9b00ede61a Add part queryset filtering to exclude particular ID values 2021-10-14 17:12:08 +11:00
Oliver
05791a8efd
Merge pull request #2138 from rocheparadox/master 
Custom name format for parts - FR InvenTree#2085
 2021-10-14 16:03:58 +11:00
Oliver
0581885ad5 Simplify BOM table buttons 2021-10-14 00:26:34 +11:00
Oliver
be5c5496b2 Improvements to allocation of stock items against build orders 
- Refactor functions for filtering stock using bom_item pk
- Allow selection of substitute items when allocating against build order
- Improvements for modal rendering
- Don't display filter drop-down if there are no filters available
 2021-10-13 23:53:35 +11:00
Oliver
c7cec13076 Bug fix 2021-10-13 23:18:44 +11:00
Oliver
f3074e8f34 Improved unit testing for BomItem 
- tests for allowing variant parts
- tests for allowing substitutes
 2021-10-13 23:18:26 +11:00
Oliver
0f8c279aa2 Add some unit testing for the new model 2021-10-13 22:27:10 +11:00
Oliver
ea4c4c514f Add uniqueness checking for the BomItemSubstitute model 2021-10-13 22:01:32 +11:00
rocheparadox
0742fb063c comment cleanup 2021-10-13 10:58:36 +05:30
rocheparadox
294011a973 Merge remote-tracking branch 'upstream/master' 2021-10-13 10:10:59 +05:30
Oliver
6816071388 Simplify BOM editing view 
- A user with permission to edit BOM data can immediately access the BOM editing tools
 2021-10-13 14:44:59 +11:00
Oliver
37bd5c0507 Add serializer and API endpoint for BomItemSubstitute class 2021-10-13 13:58:41 +11:00
Oliver
324ccd805d Include BomItem substitutes in the serializer 2021-10-13 11:07:44 +11:00
Oliver
7c396f9f39 Enable optional pagination for the BomItem API endpoint 2021-10-13 11:07:34 +11:00
Oliver
a00dc9b0b1 Add migration file for new database model 2021-10-13 10:50:24 +11:00
Oliver
e20ddc289e Merge branch 'master' into bom-substitutes 2021-10-13 10:15:03 +11:00
Oliver
4f985ae225 Revert 1fb76b9 
Removes global functions to enable / disable entire sections of functionality
 2021-10-13 09:40:17 +11:00
rocheparadox
4fddc656c4 removed unused import 
added unit tests for PART_NAME_FORMAT
 2021-10-12 19:51:21 +05:30
rocheparadox
2bf51b0ac3 Added PART_NAME_FORMAT to Inventree settings and exposed the same in settings window with a validator 2021-10-12 19:06:23 +05:30
Oliver Walters
4eb8c60ee0 Add new BomItemSubstitute model 2021-10-12 22:22:49 +11:00
rocheparadox
beadfb4659 Merge remote-tracking branch 'upstream/master' 2021-10-11 22:29:01 +05:30
rocheparadox
2d77b21a4e PART_NAME_FORMAT is introduced to display the names of parts in custom format. - For Feature Request InvenTree#2085 
full_name construction in part.js is obsolete/redundant since the same is constructed in backend and sent through api response
 2021-10-11 22:21:12 +05:30
Oliver
19a8c712d4
Merge pull request #2017 from matmair/fr-1421-sso 
SSO!
 2021-10-11 17:20:08 +11:00
Oliver
00275d61eb Auto-focus on the 'sub_part' field 2021-10-11 10:25:36 +11:00
Matthias Mair
848a72604e
Merge branch 'inventree:master' into fr-1421-sso 2021-10-08 22:38:16 +02:00
Oliver
07d05ed000 PEP fix 2021-10-08 12:50:24 +11:00
Oliver
d8b9420d2d Add a query param `?include_pricing' to the BomItem API 
- Set this to false to disable pricing info in BOM
- Drastic reduction in query speed
 2021-10-08 12:47:03 +11:00
Matthias
fe7ab40b48
Merge branch 'master' of https://github.com/inventree/InvenTree into fr-1421-sso 2021-10-07 18:12:25 +02:00
Matthias
c37e40d144
use tag for testing 2021-10-07 17:31:18 +02:00
Oliver
22d3b05dc6 Fix error on BOM export 2021-10-07 11:52:41 +11:00
Oliver
bc3be635ae Reset modal image when a new image is uploaded 2021-10-06 21:03:40 +11:00
Oliver
95e7cc7a5d Fixes for unit tests 2021-10-06 08:56:24 +11:00
Oliver
dd4428464d Receiving items against a purchase order now makes use of the API forms 
- Delete old unused code
- Improve serializer validation
 2021-10-05 16:05:18 +11:00
Oliver
e7d78db87b Fixes for unit tests 2021-10-05 10:53:11 +11:00
Oliver
ae0efe73d1 Further improvements to build allocation form 
- Auto-allocation button ignores outputs which are complete
- StockItem API allows filtering by BomItem
- Quantity inputs are now auto-filled
- Display progress bar in the modal form
 2021-10-05 08:25:10 +11:00
Oliver
0c04bfaa85 Move "rebuild_thumbnails" to being a management command 
- Does not run every time the server reboots
- Has to be called manually
- Normally does not need to be run and is a long-running process!
 2021-10-05 08:05:26 +11:00
Oliver
75a35773c6 More unit tests 2021-10-04 20:44:15 +11:00
eeintech
480ff5e6cb Hide submit button in modal when part is still active 2021-09-30 09:58:23 -04:00
eeintech
1e9ae927d4 Show part delete button when part still active 2021-09-29 11:48:27 -04:00
Oliver
e7963f8a85 test fixes 2021-09-17 21:06:07 +10:00
Oliver
11cc0c7ced Adds a test for non-standard characters via API 2021-09-17 20:53:18 +10:00
Oliver
5bd5c61b9d Fix callback for test template table 2021-09-14 10:43:40 +10:00
Oliver Walters
06c03039da Add version related tags 
- Docs URL points to correct documentation version
- Display if we are in "development" version
 2021-09-12 23:13:55 +10:00
Oliver
9b001cd298 Another fix 2021-09-04 08:48:34 +10:00
Matthias
0ebc45e834
replace i html tags 2021-09-02 00:18:47 +02:00
Matthias
6a420fd95c
replace bold tags 2021-09-02 00:17:12 +02:00
Matthias Mair
2b1279e647 now with closing tags 2021-09-01 08:14:08 +02:00
Matthias Mair
5ad2eabab1 fix html templates 2021-08-31 13:17:38 +02:00
Oliver Walters
ec88415f3d Add "units" to PartBriefSerializer 2021-08-26 21:54:25 +10:00
Oliver
7646535aaf Hide "Sales Orders" tab if part is not salable 2021-08-24 11:48:42 +10:00
eeintech
35738ce026 Updated all 'add' buttons to 'btn-success' CSS class 2021-08-23 14:52:35 -04:00
eeintech
6f742319e5 Corrected color of 'new' orders UI button 2021-08-23 12:48:47 -04:00
Oliver
1fb76b9987
Merge pull request #1999 from matmair/turn-of-functions 
Disable functions in navbars
 2021-08-23 20:29:28 +10:00
Oliver
fd1dd792c6
Merge pull request #1957 from matmair/bpm-purchase-price 
BOM - show purchase price
 2021-08-23 11:07:30 +10:00
Matthias
9fd4b5cce3
use new setting for part-actions 
PR complete for #1999
 2021-08-22 23:36:49 +02:00
Matthias
b674d851f2
disable fucntions in master nav 2021-08-22 22:30:21 +02:00
Matthias
38af66c0de
fix linebreak in tooltip 
found during fixing #1989
 2021-08-21 00:07:45 +02:00
Matthias Mair
e24a158919
Merge branch 'inventree:master' into bpm-purchase-price 2021-08-20 00:42:50 +02:00
Matthias
cb1e7a6cc5
only process purchase_price if prices present 2021-08-19 23:22:58 +02:00
eeintech
ec7392303d Fixed company templates 2021-08-19 10:47:46 -04:00
Guusggg
d8eefec065
Print multi part label (#1963) 
* Added description as list for StockLocation

* Merge pull request #1874 from SchrodingersGat/docker-dev-fix

Copy static files when starting dev server

(cherry picked from commit 50eb70f538)

* Merge pull request #1877 from eeintech/fix_search_js

Fixed missing comma propagating to translated JS files

(cherry picked from commit 2009773d9d)

* Merge pull request #1890 from matmair/fix-for-1888

catch connection errors in exchange update

(cherry picked from commit db57e9516b)

* Merge pull request #1887 from matmair/settings-safety

settings fixes

(cherry picked from commit d154ca08ea)

* 0.4.2

* Merge pull request #1894 from SchrodingersGat/non-int-serial-fix

Fix for non-integer serial numbers

(cherry picked from commit 529742b520)

* 0.4.4

Bump release version

* Bump version number -> 0.4.5

* Added a simple menu item to print multiple part labels. This does not follow the style of the Stock label functions but it works!

* Revert "Added description as list for StockLocation"

This reverts commit f5178e9fc3.

* Added the right version number

Co-authored-by: Oliver <oliver.henry.walters@gmail.com>
 2021-08-17 12:42:40 +10:00
eeintech
99839e78fd Added navbar on part import page 2021-08-16 10:21:57 -04:00
Oliver
ff8dcabb12 New custom serializer for handling attachments 2021-08-15 22:43:52 +10:00
Oliver
8861ffad81 PEP fixes 2021-08-15 12:06:31 +10:00
Oliver
cef09acd54 Partial reversion of some stuff 2021-08-15 12:05:53 +10:00
Oliver
faab1f2464 Provide global_settings and user_settings as context objects 
- Adds a new context middleware
- Refactor the way that settings are provided to the javascript layer
 2021-08-15 11:57:05 +10:00
Oliver
2b13512145 Check that supplier and manufacturer parts are created 2021-08-14 10:43:45 +10:00
Oliver
6fa4e33062 Unit testing for new API form features 2021-08-14 10:39:05 +10:00
Oliver
26c07961cb Bug fix for API 2021-08-14 10:23:57 +10:00
Matthias
00d4efb920
PEP fix 2021-08-13 17:54:17 +02:00
Matthias
f0325fe30f
view BOMpricing range 
Closes #1889
 2021-08-13 17:50:41 +02:00
Matthias
a2ffd06abf
calculate purchase price for part 2021-08-13 17:49:58 +02:00
Oliver Walters
ba1ba67f87 Only add company data if part is purchaseable 2021-08-14 00:46:30 +10:00
Oliver Walters
78340a71a9 Adds support for creation of ManufacturerPart and SupplierPart via the Part creation API 2021-08-14 00:38:08 +10:00
Oliver Walters
cb11df4dba Improve error checking for initial stock creation when creating a new part 
- Use @transaction.atomic
- Raise proper field errors
 2021-08-14 00:09:08 +10:00
Oliver Walters
5b42ab7332 Add "groups" to API forms 2021-08-13 21:48:48 +10:00
Oliver
26ddd36666 PEP fixes 2021-08-12 23:47:42 +10:00
Oliver
537573d0e3 Add extra unit testing for BOM export 2021-08-12 23:40:07 +10:00
Oliver
46fa60953d Refactor part page 2021-08-11 00:12:55 +10:00
Oliver
6620d34f25
Merge pull request #1913 from eeintech/bom_upload 
BOM upload templates fixes
 2021-08-10 09:11:25 +10:00
Matthias
ad656b7ca7
extending API to supply price wihtout formatting 2021-08-09 01:49:55 +02:00
Oliver
5448165ef3
Merge pull request #1920 from SchrodingersGat/label-print-options 
Label print options
 2021-08-07 22:27:34 +10:00
Oliver Walters
ca9536f687 Implement option to display labels "inline" in the browser 2021-08-07 22:09:15 +10:00
Oliver Walters
24638a7229 Add migration file 2021-08-07 21:41:45 +10:00
Oliver Walters
6d42cfab75 Add model validator to prevent illegal names for PartParameterTemplate 
(cherry picked from commit 93805a87e0)
 2021-08-07 21:23:52 +10:00
eeintech
6280ed1ade Moved enableNavbar to part_base template 2021-08-06 11:15:16 -04:00
eeintech
1eb8a9f310 BOM upload templates fixes 2021-08-05 17:39:08 -04:00
Matthias Mair
96378cb556
Merge branch 'inventree:master' into trans-improv 2021-08-05 08:17:21 +02:00
Matthias
d6c6cb96ba
make keyvalue non-existing key tolerant 2021-08-05 01:24:49 +02:00
Oliver Walters
c7712d4235 even more unit tests 2021-08-05 01:13:48 +10:00
Oliver Walters
655e5692e9 More unit test fixes 2021-08-05 00:58:07 +10:00
Oliver Walters
6acff2a26e Fixes unit test 2021-08-05 00:40:02 +10:00
Oliver Walters
aaf394ca7a PEP fixes 2021-08-05 00:26:21 +10:00
Oliver Walters
dd78464a74 remove unused function 2021-08-05 00:25:47 +10:00
Oliver Walters
aa4ed9feb0 Refactor MakeVariant form 
- Now is essentially identical to the DuplicatePart form
- Uses the API form structure
 2021-08-05 00:24:38 +10:00
Oliver Walters
0e8fb6a5ad Refactored DuplicatePart form 
- API endpoint now takes care of duplication of other data
 2021-08-05 00:16:42 +10:00
Oliver Walters
b04f22fc53 CreatePart form now uses the API 
- Simplify the way category parameter templates are copied
 2021-08-04 23:27:16 +10:00
Oliver Walters
2bf3e3ab02 Function to construct part form fields 2021-08-04 23:26:17 +10:00
Oliver Walters
2e8a490ca9 Fixes for unit tests 2021-08-04 17:41:47 +10:00
Oliver Walters
75a1be0284 Use API forms for creating and editing BomItem objects 2021-08-04 17:25:51 +10:00
Oliver
7911801dbf
Merge pull request #1900 from SchrodingersGat/part-image-search 
Make the part thumbnail selection window searchable
 2021-08-04 12:28:52 +10:00
Oliver
56c0e289bd Style fix 2021-08-04 12:13:24 +10:00
Oliver
f95346f214 Make the part thumbnail selection window searchable 2021-08-04 12:10:49 +10:00
Oliver
989983bdb5 Fixed missing import 2021-08-04 11:37:59 +10:00
Oliver
83d8226ad6 Refactor "CreatePartCategory" form to API 
(cherry picked from commit 06ff961564)
 2021-08-04 11:34:42 +10:00
Oliver
8daf601f00
Merge pull request #1897 from matmair/price-terms 
updating language to be clearer
 2021-08-04 09:03:13 +10:00
Matthias
fa3c5ae108 updating language to be clearer 
see https://github.com/inventree/InvenTree/issues/1889#issuecomment-891901070
 2021-08-04 00:45:56 +02:00
eeintech
29c8daed0a 'has_ipn' filter method did not return queryset 2021-08-03 12:21:44 -04:00
eeintech
634e5e0da6 Added toggle for part details 
Added persistence for page refresh or new part page
 2021-07-30 14:55:12 -04:00
eeintech
20b21a2b71 Merge branch 'master' of github.com:inventree/InvenTree into part_main_details 2021-07-30 10:50:28 -04:00
Oliver
4381a16b0e Template cleanup 2021-07-29 12:31:07 +10:00
Oliver
27ec65a002 Add 'settings.js' which provides all settings (global and user) as a dynamic javascript file 
- Minimal database hits required
 2021-07-29 11:28:04 +10:00
Oliver
cd1ecc5e8f style fixes 2021-07-28 14:17:25 +10:00
Oliver
25ff74835d Refactor PartCategoryParameter API 2021-07-28 14:05:49 +10:00
Oliver
7fdc0546b4 Merge remote-tracking branch 'inventree/master' into settings-refactor 2021-07-27 14:28:17 +10:00
Oliver
c63a061cf3 Refactor "theme" selection 2021-07-27 08:31:43 +10:00
Oliver
57551d3ac3 inventreeDelete was not returning the promise 2021-07-27 08:17:53 +10:00
Oliver
0186d23563 inline theme form 2021-07-27 07:56:24 +10:00
eeintech
a6b52a9fae Fix for #1861 2021-07-26 17:02:04 -04:00
eeintech
f61c768bbe Merge branch 'master' of github.com:inventree/InvenTree into part_main_details 2021-07-26 13:59:15 -04:00
Matthias
431b35ed32 new tag for building lists 2021-07-24 00:42:17 +02:00
Matthias
e167f27258 get user settings in templates 2021-07-23 00:46:48 +02:00
Matthias
50356afd41 Merge branch 'master' of https://github.com/inventree/InvenTree into homepage-settings 2021-07-23 00:03:21 +02:00
Matthias
3f6c7df7a8 change template setting behaviour for user setting 2021-07-22 23:48:28 +02:00
Oliver
afde997cf9 Expose part parameters to Part label templates 2021-07-21 22:05:52 +10:00
Oliver
9cf372f633 PEP fixes 2021-07-21 21:24:18 +10:00
Oliver
85a40ec418 Tree exclusion for PartCategory and StockLocation 2021-07-21 21:23:30 +10:00
Oliver
bee0a519ef Allow filtering of PartList by exclude_tree 2021-07-21 21:18:01 +10:00
Oliver
df48df8119 Catch recursive tree error for part / variant relationship 2021-07-21 21:10:31 +10:00
Oliver
dad9239a1c Add instance-specific filters to API OPTIONS data 2021-07-21 20:59:55 +10:00
Oliver
598ea11211 Add manager class for StockItem 2021-07-21 09:28:58 +10:00
Oliver
5e2145e151 Bug fix - delete line which don't belong no more 2021-07-20 22:26:43 +10:00
Oliver
b04a403081 subclass TreeManager 2021-07-20 22:15:49 +10:00
Oliver
cb0b7209ec Add custom "list" function back in 
- Actually does make a significant difference to query speed
 2021-07-20 22:12:01 +10:00
Oliver
4199e7567f Remove duplicate annotation call 2021-07-20 21:46:27 +10:00
Oliver
dbe550a159 Optimizations for PartList API endpoint: 
- Remove custom list() function
- Queryset prefetch now performed by the model manager
 2021-07-20 21:37:32 +10:00
Oliver
84fc2785d6 Create a custom Manager class for the Part model 
- Always perform prefetch_related calls
 2021-07-20 21:26:51 +10:00
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
eeintech
2703ae520e Merge branch 'master' of github.com:inventree/InvenTree into part_main_details 2021-07-19 09:20:06 -04:00
Oliver
efb4f194b6 Refactor StockExportOptions form 2021-07-19 17:23:18 +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
efd0caba6e
Merge pull request #1829 from matmair/initial-amount 
Initial amount
 2021-07-19 09:53:40 +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
56fa6c512b Refactor SupplierPartCreate form 2021-07-18 22:21:11 +10:00
Oliver Walters
36cf614aed Add "level" to PartCategory serializer 
- Also use tree ordering by default
 2021-07-18 21:11:53 +10:00
Matthias
eba5512a38 extending form for stock creation 2021-07-18 02:58:39 +02:00
eeintech
f938e722b9 Another shot at it! 2021-07-16 12:08:26 -04:00
eeintech
86f3f56a60 Merge branch 'master' of github.com:inventree/InvenTree into part_main_details 2021-07-16 10:43:53 -04:00
eeintech
bfc421c50b Cleaner part details 2021-07-15 14:52:33 -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
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
c61fc7c1df Refactor part pricing page 2021-07-15 23:06:37 +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
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
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
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
Oliver
6af05b2b83
Merge pull request #1807 from SchrodingersGat/forms-cleanup 
Remove unused forms
 2021-07-12 22:40:20 +10:00
Oliver
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
Oliver
c3b0593aba Refactor ManufacturerPartCreate form 2021-07-12 21:32:09 +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
Oliver
02214ea713
Merge pull request #1799 from SchrodingersGat/bom-export-fix 
Bug fix for BOM export
 2021-07-10 23:27:17 +10:00
Oliver
7cc1063114 PEP 2021-07-10 23:04:34 +10:00
Oliver
73e03636a2 Add unit tests 2021-07-10 23:04:20 +10:00
Oliver
cf66a386ea Bug fix 2021-07-10 14:13:46 +10:00
Oliver
bf2774eb21 Add numerical validation step for BomItem 2021-07-10 13:48:44 +10:00
Oliver
f6d5bd4ed8
Merge pull request #1760 from eeintech/bom_import 
Converted BOM import to new multi-step form framework
 2021-07-10 13:47:25 +10:00
Oliver
9ae5c241f5 Move part parameters onto the part details page 2021-07-09 16:34:47 +10:00
Oliver
ff92210b25 Fix URLs 2021-07-09 16:31:29 +10:00
Oliver
6eec6a0599 Consolidate Manufacturers and Suppliers views 2021-07-09 16:29:58 +10:00
Oliver
7168607a88 PEP fix 2021-07-09 13:07:01 +10:00
Oliver
079e331bf6 Add sub_part_assembly filter to BOM table 2021-07-09 13:04:48 +10:00
Oliver
0c73fa3b58 Add regex filter for part name 2021-07-09 09:11:31 +10:00
Oliver
fd5d20ad13 Fix case for filtering parts by IPN 2021-07-09 09:08:55 +10:00
Oliver
433098ce6e
Merge pull request #1778 from SchrodingersGat/build-forms 
Refactor BuildOrderEdit form
 2021-07-09 09:02:39 +10:00
Oliver
0a86d947bc Refactor PartParameterCreate form 2021-07-09 02:03:33 +10:00
Oliver
cbf0e0bd4a Refactor forms for editing and deleting a PartParameter 
- PartParameters now loaded using the API, not pre-rendered
 2021-07-09 01:56:04 +10:00
Oliver
004b36b1df Refactor BuildOrderCreate form 2021-07-09 00:18:03 +10:00
Oliver
15cb1e0005 Print part labels 2021-07-08 22:54:41 +10:00
Oliver
f0e7826fdc Adds some more API filters for the StockItem endpoint 2021-07-08 17:44:52 +10:00
Oliver
a8a21f7c9d Transition "has IPN" filter to django-filters approach 2021-07-08 17:16:02 +10:00
Oliver
ba0a13443f PEP fixes 2021-07-08 17:02:55 +10:00
Oliver
376428b80b Add regex IPN filter for Part API 2021-07-08 17:02:45 +10:00
Oliver
2467690111 Reintroduces "part" column to part stock 2021-07-08 13:46:53 +10:00
eeintech
58efc952db Converted BOM import to new multi-step form framework 2021-07-05 14:57:45 -04:00
Oliver
20b0e399c0
Merge pull request #1716 from SchrodingersGat/drf-api-forms 
[WIP] API Forms
 2021-07-03 22:14:26 +10:00
Oliver
45704f7a8d
Merge pull request #1747 from matmair/depleted-stock 
Depleted stock on start page
 2021-07-03 16:23:27 +10:00
Oliver
83256b1014 Refactor BomItemDelete form 2021-07-03 16:10:41 +10:00
Oliver
359e92cd8e Merge remote-tracking branch 'inventree/master' into drf-api-forms 
# Conflicts:
#	InvenTree/InvenTree/static/css/inventree.css
 2021-07-03 12:59:13 +10:00
Oliver
2b32f04af2
Merge pull request #1712 from matmair/one-pricing-view 
One pricing view
 2021-07-03 12:55:34 +10:00
Oliver
90a3a8a288 Merge remote-tracking branch 'inventree/master' into drf-api-forms 2021-07-03 12:35:40 +10:00
Matthias
57ce82de32 show supplier_part in stock-table 
#1323
 2021-07-03 02:04:39 +02:00
Matthias
23bd6acc94 changed doc string 2021-07-03 00:18:41 +02:00
Matthias
54cb8fa736 adds depleted stock to index 2021-07-03 00:08:00 +02:00
Matthias
f8e2d53ad4 Merge branch 'master' of https://github.com/inventree/InvenTree into one-pricing-view 2021-07-02 16:44:43 +02:00
Matthias
628e365c6a fix for bom-pricing chart not showing up 2021-07-02 16:44:25 +02:00
Oliver
993abd9d91 Refactor forms for sales orders 2021-07-03 00:14:36 +10:00
Oliver
72526307ae Renderer for supplier part 2021-07-02 17:11:07 +10:00
Oliver
51ebe30754 Merge remote-tracking branch 'inventree/master' into drf-api-forms 
# Conflicts:
#	InvenTree/company/forms.py
 2021-07-02 11:26:09 +10:00
Oliver
74d2334f36 Merge remote-tracking branch 'inventree/master' into drf-api-forms 2021-07-01 22:08:10 +10:00
Oliver
225162ab8e Add ability to delete multiple selected manufacturer part parameters 2021-07-01 17:20:06 +10:00
Oliver
9bd71c1184 Refactor deletion of multiple manufacturer part objects 
- issues multiple DELETE requests via the API
 2021-07-01 17:01:30 +10:00
Matthias
3c6c9c59d6 added clean migration steps for all price fields 2021-07-01 07:11:15 +02:00
Oliver
bfc5a7dcf8 Refactor forms for PartTestTemplate model: 
- Remove old forms
- Remove old views
- Add detail endpoint for the API
 2021-07-01 14:44:23 +10:00
Oliver
59b794f0e5 Cleanup old forms 2021-07-01 14:25:14 +10:00
Matthias
2c7a4a1246 switching out BASE_CURRENCY 2021-06-30 23:38:48 +02:00
Oliver
30ac5dba55 Display attachment upload date 2021-06-30 17:44:23 +10:00
Oliver
9b4db43232 Refactoring "attachment" tables to use the API 
- Part attachments
- StockItem attachments
- PurchaseOrder attachments
- SalesOrder attachments
- BuildOrder attachments
 2021-06-30 17:40:44 +10:00
Oliver
8f47035a7b Refactor delete view for PartAttachment and StockItemAttachment 2021-06-30 12:58:41 +10:00
Oliver
b946aedb5c Replace PartAttachmentEdit view 2021-06-30 09:49:30 +10:00
Oliver
238dccc071 Replace PartAttachmentCreate form 2021-06-30 09:45:36 +10:00
Oliver
1f75530910 Specify custom help text for fields on the client side 2021-06-30 01:07:36 +10:00
Oliver
621f47e46c Replace "edit part category" form 2021-06-30 01:04:39 +10:00
Oliver
26eafe242c Replace PartImageUpload form 2021-06-30 00:18:25 +10:00
Oliver
6156fffd1d Remove broken URLs 2021-06-29 21:25:20 +10:00
Oliver
170ed37d03 Delete CompanyCreate AJAX view 2021-06-29 21:20:53 +10:00
Matthias
d10169932d option to hide related parts #1733 2021-06-29 12:33:54 +02:00
Oliver
4aed6993d4 Add some more unit tests 2021-06-29 19:48:49 +10:00
Oliver
da6d170ce2 Add 'help_text' for related fields 2021-06-29 19:39:45 +10:00
Oliver
798bc17311 Merge remote-tracking branch 'inventree/master' into drf-api-forms 2021-06-29 09:57:03 +10:00
Matthias
5598f7fad1 added sale price history 2021-06-27 21:32:27 +02:00
Matthias
4462b1e250 order stock histroy items 2021-06-27 21:31:34 +02:00
Matthias
e06397adc1 refactor 2021-06-27 21:31:10 +02:00
Matthias
f479c0cd27 naming refactor 2021-06-27 20:46:52 +02:00
Matthias
ef07c93634 section anchors 2021-06-27 18:31:40 +02:00
Matthias
16f25f54d4 sorting price-breaks on start 2021-06-27 17:45:31 +02:00
Matthias
547f7a8f36 Merge branch 'master' of https://github.com/inventree/InvenTree into one-pricing-view 2021-06-27 14:40:17 +02:00
Matthias
cd6d13fa7d Merge branch 'master' of https://github.com/inventree/InvenTree into bom-pricing 2021-06-27 14:38:23 +02:00
Matthias
e4a9d56ba0 style fixes 2021-06-27 14:26:51 +02:00
Matthias
4f726931a6 adds in money-conversion helper 2021-06-27 14:18:37 +02:00
Matthias
a3ec24fbcc Reenabling prices for BOM items 
Closes #1721
 2021-06-27 13:48:08 +02:00
Matthias
67128c308b fixing typo 2021-06-27 12:26:02 +02:00
Oliver
67f76c8bca Merge remote-tracking branch 'inventree/master' into drf-api-forms 2021-06-27 09:26:23 +10:00
Oliver
42ed95c936
Merge pull request #1588 from matmair/part-import 
Part import
 2021-06-27 09:24:10 +10:00
Matthias Mair
e760aa172a
Merge branch 'master' into part-import 2021-06-26 23:58:41 +02:00
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
rgilham
c6fd2281d6 Allow BOM pricing to be valid when using internal pricing 2021-06-24 02:13:55 +02: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