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,481 Commits 6 Branches 99 Tags 484 MiB
710e0e2c3b
Commit Graph

435 Commits

Author SHA1 Message Date
Oliver Walters
a95e77c429 Pre-fill allocation count 2019-05-18 12:17:57 +10:00
Oliver Walters
0ce5240361 More UI stuff for the Build page 2019-05-17 16:35:23 +10:00
Oliver Walters
3a3662ae14 Add part image 2019-05-17 00:31:35 +10:00
Oliver Walters
489d5de9c4 UI tweaks 2019-05-17 00:23:08 +10:00
Oliver Walters
2da3a022bf Add allocation tab 2019-05-17 00:20:48 +10:00
Oliver Walters
bf987f23f3 Add 'tabbed' page set for Build app 2019-05-17 00:14:29 +10:00
Oliver Walters
387711a9a1 Fix help string 2019-05-16 18:08:37 +10:00
Oliver Walters
8c92c2c2a1 Display overage values in BOM table 2019-05-15 07:23:02 +10:00
Oliver Walters
58cc1cda77 Only load api.js once 2019-05-14 23:43:16 +10:00
Oliver Walters
2164cac28a PEP 2019-05-14 18:32:20 +10:00
Oliver Walters
46ab6e40eb Bug fix for build allocation 
- If the part did not have an image file the template failed to render
 2019-05-14 18:31:19 +10:00
Oliver Walters
9986df2074 Add confirmation to cancel a build 2019-05-14 18:20:54 +10:00
Oliver Walters
edc2cc49c2 Fix deletion form for BuildItem 2019-05-13 23:03:32 +10:00
Oliver Walters
1d36ea3e2e Add a 'full_name' field for Part 
- Combines IPN | Name | Variant
- Use this to display in most views
 2019-05-12 12:16:04 +10:00
Oliver
164f98540d
Merge pull request #297 from SchrodingersGat/field-doc 
Field doc
 2019-05-10 20:18:51 +10:00
Oliver Walters
ba2f565e35 docstring improvements 
- Added Attribute docstring to all model objects
 2019-05-10 20:11:52 +10:00
Oliver Walters
763e0a991c Limit user choices in the manual part allocation form 2019-05-10 19:12:56 +10:00
Oliver Walters
bbf46c4580 Display 'take_from' location on build detail page 2019-05-10 19:07:38 +10:00
Oliver Walters
3588161632 Build.getAutoAllocations() only selects parts from the designation location 2019-05-10 19:03:45 +10:00
Oliver Walters
468322fa9d Add field 'take_from' to Build 2019-05-10 19:03:10 +10:00
Oliver Walters
66b729d579 Moved 'complete build' button to the build detail page 2019-05-10 08:44:07 +10:00
Oliver Walters
05f5aa27c5 Add a 'Remove build allocation' function 
- Removes all parts allocated to a given build
 2019-05-10 08:33:54 +10:00
Oliver Walters
345913bc90 Improve rendering of 'Complete Build' form 2019-05-09 23:59:39 +10:00
Oliver Walters
7835562396 Auto-allocation form now working 
- Displays a list of stock items which will be allocated
 2019-05-09 23:55:30 +10:00
Oliver Walters
40ca468b51 Added title for 'Build' app 2019-05-09 18:27:16 +10:00
Oliver
aafc4e367d
Merge pull request #265 from SchrodingersGat/help-text 
Help text
 2019-05-09 00:15:55 +10:00
Oliver Walters
e9c904076f Added help text for model fields 2019-05-08 23:32:57 +10:00
Oliver Walters
d971747404 Improved part thumbnails in build allocation 2019-05-08 23:03:28 +10:00
Oliver Walters
40d8332e7f Add 'allocated' status code to build 
- This means that parts have been taken from stock
 2019-05-08 07:48:39 +10:00
Oliver Walters
cd514bf1db Mark who a build was completed by 2019-05-07 23:39:42 +10:00
Oliver Walters
85869c07f6 Add 'allocated' column to Build detail view 2019-05-07 23:31:41 +10:00
Oliver Walters
29b94c91f3 Display part images in build allocation list 
(CSS needs some work)
 2019-05-07 23:28:46 +10:00
Oliver Walters
7101d9cb7e Add part description to build allocation table 2019-05-07 23:09:36 +10:00
Oliver Walters
7dd7b68ed6 Improve functions 2019-05-07 23:03:05 +10:00
Oliver Walters
4f84febbd1 More intelligent BuildItem allocation 
- Set initial value for quantity based on how many parts are left to allocate
- Auto select the StockItem to take from (if there is only one)
 2019-05-07 22:46:37 +10:00
Oliver Walters
e58bed41b0 Visual style improvements 2019-05-07 21:24:09 +10:00
Oliver Walters
7e81d9021f Auto-show the active build table 2019-05-07 21:24:09 +10:00
Oliver Walters
c10ddab30c Improve display of Build index 2019-05-07 21:24:09 +10:00
Oliver Walters
ff14b0b363 Ensure that a StockItem is not already allocated to a Build 2019-05-07 21:24:09 +10:00
Oliver Walters
7c70b31af4 Build no longer auto-allocates on creation 
- Provide 'auto allocation' function which can be run by the user
 2019-05-07 21:24:09 +10:00
Oliver Walters
b9e5afa768 PEP 2019-05-05 22:35:39 +10:00
Oliver Walters
9bbcc35959 Builds can only be made for active parts 2019-05-05 22:34:14 +10:00
Oliver Walters
4ef1e4fc78 Explicitly mark some CharField as non blank 2019-05-04 17:01:31 +10:00
Oliver Walters
b32a9ed597 Add 'About InvenTree' modal 
- Accessible from the top-right dropdown menu
- Add InvenTree/version.py which contains helper functions
 2019-05-04 11:23:30 +10:00
Oliver Walters
9c4a5d10fa PEP fixes 2019-05-03 08:04:30 +10:00
Oliver Walters
019d5aa4ba Add 'completed_by' field to Build 
- On Complete() or Cancel() user field is filled in
 2019-05-03 07:58:46 +10:00
Oliver Walters
0be4ee5d92 PEP fix 2019-05-02 21:29:27 +10:00
Oliver Walters
1295390b03 Rendering changes 2019-05-02 21:28:47 +10:00
Oliver Walters
a0ad95ab28 Save the date of Build cancellation 2019-05-02 21:23:53 +10:00
Oliver Walters
b91de1af7b Separate active / complete / cancelled builds 2019-05-02 21:16:35 +10:00
Oliver Walters
38100520df Add 'to_order' and 'to_build' collapsible panels 2019-05-02 20:18:34 +10:00
Oliver Walters
fbb120da53 Use collapse template in allocation page 2019-05-02 18:53:03 +10:00
Oliver Walters
09b7846310 Improve edit form for BuildItem 
- Hide the build field
- Limit the choices for StockItem (don't let user change the allocation!)
 2019-05-02 00:25:19 +10:00
Oliver Walters
a4aec425be Render better build description in complete form 
- List of items to be removed from stock
- Detail of what will be created
 2019-05-02 00:12:28 +10:00
Oliver Walters
905d78e25c Complete build now works 
- Marks build as complete
- Deletes temporary BuildItem objects
- Preselects the part's default_location if there is one
- Creates a new stockitem in the selected location
 2019-05-02 00:04:39 +10:00
Oliver Walters
29f7b1a32b Revert "More intelligent passing of context data in AjaxView" 
This reverts commit fbb9a708f5.
 2019-05-01 22:52:33 +10:00
Oliver Walters
fbb9a708f5 More intelligent passing of context data in AjaxView 
- If context is not explicitly supplied, use default get_context_data() function
 2019-05-01 22:45:41 +10:00
Oliver Walters
7f63a94f15 Cancel build function now works 2019-05-01 22:22:14 +10:00
Oliver Walters
98109bb1a1 Make build allocation much more intuiitive 
- Display current allocation + total allocation requirement
- Color code results
- Required custom 'multiply' template tag
 2019-05-01 22:12:34 +10:00
Oliver Walters
ad1d75c259 Improve table formatting when no allocation items found 2019-05-01 18:54:54 +10:00
Oliver Walters
7dd960a299 PEP fixes 2019-05-01 08:19:57 +10:00
Oliver Walters
fc42cca10e Automatically allocate parts when a Build is created 
- If there is only one StockItem to choose from, allocate parts from that StockItem
 2019-05-01 08:08:50 +10:00
Oliver Walters
b6becbc570 Rework build allocation 
- Each item renders as a collapsible panel with overview data at the top
 2019-05-01 07:48:46 +10:00
Oliver Walters
7e7ac60a1a Tweaks 
- Can't edit build status directly
- Refresh BOM table on reload
- Hide Company tabs that are not yet functional
 2019-04-30 20:55:28 +10:00
Oliver Walters
fb89574c42 Skeleton code for Build cancel() and complete() functions 
- BuildComplete view
 2019-04-30 20:39:01 +10:00
Oliver Walters
d518739643 PEP fixes 2019-04-30 19:17:54 +10:00
Oliver Walters
efbef251b6 Added views / forms to edit and delete BuildItem objects 
- Alter stock allocation
- remove (unallocate) stock from a build
 2019-04-30 18:51:05 +10:00
Oliver Walters
24ed6f393b When adding new item allocations, filter the available stock items 
- Must match the appropriate part
- Remove items that are already allocated
 2019-04-30 16:38:09 +10:00
Oliver Walters
6961d1ec68 Catch BuildItem errors in clean() 2019-04-30 16:35:55 +10:00
Oliver Walters
fbd5a2a270 Register BuildItem in admin interface 2019-04-30 16:35:40 +10:00
Oliver Walters
db5521f02e Limit available choicse in form 
- Only allow selection of StockItem which matches the correct part
 2019-04-30 15:48:26 +10:00
Oliver Walters
0208c6efe6 New Form and View to create a new BuildItem object 
- Allocates stock to a build
 2019-04-30 15:35:35 +10:00
Oliver Walters
aa491e336d Move javascript for Build allocation to build.js 2019-04-30 14:42:48 +10:00
Oliver Walters
a3d4c81939 Display and edit build URL field 2019-04-30 14:04:43 +10:00
Oliver Walters
395db4df38 Pepe fixes 2019-04-30 00:18:58 +10:00
Oliver Walters
5c5411132a First pass at build allocation table 
- Uses bootstrap-table "detailView" function
 2019-04-29 23:56:02 +10:00
Oliver Walters
192f604b76 Override get_queryset for BuildItem API view 
- Special management to allow filtering by part
 2019-04-29 23:45:05 +10:00
Oliver Walters
c29827e45a Add API endpoint and serializer for BuildItem model 2019-04-29 22:59:42 +10:00
Oliver Walters
17d9d25fb9 Require Build and StockItem to be unique_together in BuildItem class 2019-04-29 22:56:40 +10:00
Oliver Walters
f42116c0d9 Renamed 'stock' to 'stock_item' 2019-04-29 22:33:39 +10:00
Oliver Walters
e25579141e Rename BuildItemAllocation to BuildItem 2019-04-29 22:30:21 +10:00
Oliver Walters
989611cae2 Added BuildItemAllocation Model 
- Used to link stock items to a build
 2019-04-29 22:19:13 +10:00
Oliver Walters
a9fbbc3a37 Remove references to get_object_or_404 
- Properly handle DoesNotExist errors
 2019-04-28 11:09:19 +10:00
Oliver Walters
d55ea1a982 PEP fixes 2019-04-28 01:09:48 +10:00
Oliver Walters
aa04941bf1 Add module-level docstrings for each app 2019-04-28 01:05:45 +10:00
Oliver Walters
a499fd325e Docstring for Stock app 2019-04-27 22:49:16 +10:00
Oliver Walters
ed3ae30248 Documentation for Part app 2019-04-27 22:18:07 +10:00
Oliver Walters
c3f0570926 Add docstring to Company app 2019-04-27 20:43:27 +10:00
Oliver Walters
d9169a0dd1 Add docstrings for Build app 2019-04-27 20:35:14 +10:00
Oliver Walters
7b68310d73 PEP fixes 2019-04-25 03:20:25 +10:00
Oliver Walters
5098712d9c Use reverse to get Build URL 
- Add test cases to Build
 2019-04-24 23:47:39 +10:00
Oliver Walters
0654fa7cc9 Deleted unused forms in Build 
- These now use modal forms
- Removed redundant templates
 2019-04-18 23:35:06 +10:00
Oliver Walters
ebcbf9a90e Add status_text to API 2019-04-17 23:33:19 +10:00
Oliver Walters
01bdf2f19b PEP fixes 2019-04-16 22:32:43 +10:00
Oliver Walters
29f33a8eec Move button locations into bootstrap-table headers 
- part category
- stock location
- build list
- company list
- supplier part list
 2019-04-16 11:46:07 +10:00
Oliver Walters
338a30b50e API endpoint for build list 
- Changed part/build table to bootstrap table (ajax)
 2019-04-16 08:31:43 +10:00
Oliver Walters
b9f23554a5 PEP fixes for /build 2019-04-14 09:29:05 +10:00
Oliver Walters
e6e03963c4 Simplified custom button text for modal forms 
- Now only configured from the javascript end
- No server-side configuration of button text
 2019-04-13 23:02:23 +10:00
Oliver Walters
c67dc6f56e Initial updates required to run under django 2.2 
- Change to middleware.py
- Change some URLs formatting
- Fix django version at 2.2
 2019-04-12 20:44:22 +10:00
Oliver
ceea053368 Added part API 
- Build allocation table now makes use of this API
- Further steps towards allocation table
 2018-05-12 12:44:29 +10:00
Oliver
07f16d8891 Small improvements for build display 
Working toward build management
 2018-05-09 22:02:56 +10:00
Oliver
3f1c6e2059 Simplified modal calls 
- Default modal target supplied (can be overridden in options)
 2018-05-08 19:55:39 +10:00
Oliver
c5155d5ac7 Move modal JS file 
- Loaded by base.
 2018-05-08 19:40:29 +10:00
Oliver
a1eeeab64c Build table now bootstrap-table'd 2018-05-04 01:39:20 +10:00
Oliver
211edb23bb Removed footable 
- Now using bootstrap-table
 2018-05-02 22:22:43 +10:00
Oliver
7c3b1f9bb4 Function to test if enough parts for a build 2018-05-01 09:00:09 +10:00
Oliver
dad594dc7a Tweaked build detail page 2018-05-01 08:55:51 +10:00
Oliver
d68b51e007 Add ability to move a stock item 2018-04-30 01:00:18 +10:00
Oliver
bee760d184 Deleted extraneous form code 2018-04-30 00:59:36 +10:00
Oliver
5185173639 Updates for build app 
- Added 'allocate' page (empty thus far)
- Added 'cancel' button and view
 2018-04-30 00:23:44 +10:00
Oliver
aca0d236ee Javascript consolidation 2018-04-29 12:25:07 +10:00
Oliver
55310be393 Display part stock in build detail window 2018-04-28 23:32:03 +10:00
Oliver
095492203f Simplified javascript templating 
- Load js modules in block js_load
- Write $(document).ready script in block js_ready
- Write any other js in block_js
 2018-04-28 12:45:12 +10:00
Oliver
7ebb723d15 Revert "Set initial value fields to disabled for some forms" 
This reverts commit c1271367bd.
 2018-04-28 12:19:50 +10:00
Oliver
c1271367bd Set initial value fields to disabled for some forms 
- Prevent user from changing certain fields
- Only when a form is launched from a particular view
 2018-04-28 12:14:18 +10:00
Oliver
2e7253ebc4 Tweak javascript for category detail pages 2018-04-28 11:43:26 +10:00
Oliver
bc597d7c21 Style fixes 2018-04-28 01:16:47 +10:00
Oliver
0dcdce82f8 Modals dialogs for 'Build' 2018-04-28 01:06:42 +10:00
Oliver
08ed128bea PEP style fixes 2018-04-23 21:18:35 +10:00
Oliver
4bedf0ed4c Finally got migrations working together 2018-04-22 21:54:12 +10:00
Oliver
24f4c95060 Merge branch 'PO' 2018-04-18 01:17:07 +10:00
Oliver
d8d3509b5e Changes 'notes' fields to be textfield - not charfield 2018-04-18 01:16:30 +10:00
Oliver
d00f9f74e4 Added details page for SupplierOrder 2018-04-18 01:13:42 +10:00
James Newlands
cd903112cc Merge branch 'master' of https://github.com/inventree/InvenTree 
# Conflicts:
#	InvenTree/customer/templates/customer/order_index.html
 2018-04-18 00:39:15 +10:00
James Newlands
5bb08053e0 Added table of orders and details for each order showing table of lines 2018-04-18 00:38:06 +10:00
Oliver
192f823b1a PEP fixes (not all yet) 2018-04-18 00:03:42 +10:00
Oliver
81afd3a47d Merge remote-tracking branch 'origin/customer_orders' 2018-04-17 23:18:08 +10:00
Oliver
291992ab7f Added views and pages for Build model 
- Edit / create
- View details
- View build index at /build/
 2018-04-17 23:13:41 +10:00
James Newlands
f2dc7380c2 Merge in some migrations from master 2018-04-17 23:07:55 +10:00
James Newlands
45a14b4350 Merge branch 'master' into customer_orders 2018-04-17 23:06:41 +10:00
James Newlands
bc04ca3727 First rough pass at adding customer orders model and some views/templates/admin stuff for same 2018-04-17 23:05:22 +10:00
Oliver
0b40197cd2 Update 'Build' 
- Part model now has active_builds and inactive_builds properties
-
 2018-04-17 20:25:43 +10:00
Oliver
256f8eb924 Add 'batch' field to BuildOutput object 
This 'batch' output will be copied to any parts produced as part of this build
 2018-04-17 19:10:38 +10:00
Oliver
9dc41ba122 Fix requirements 
>= rather than ==
 2018-04-17 16:58:37 +10:00
Oliver
fa23767150 Added skeleton for 'build' app 2018-04-17 00:32:02 +10:00