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
4,048 Commits 6 Branches 99 Tags 484 MiB
5c6939429a
Commit Graph

857 Commits

Author SHA1 Message Date
Oliver Walters
fb70da0331 Cleanup part allocation calculation functions 2020-04-28 10:35:19 +10:00
Oliver Walters
440fe155ff Change glyphicons for fontawesome 
I think I gottem all
 2020-04-28 09:31:51 +10:00
Oliver Walters
b338834146 Merge remote-tracking branch 'inventree/master' 2020-04-27 22:18:45 +10:00
Oliver Walters
489dfa1823 Bug fix for a code path which resulted in a form failing validation but not showing any errors! 
This one has been here for a while!
 2020-04-27 20:45:01 +10:00
Oliver Walters
5e309a62f7 Display "Fulfilled" items 
- Once a salesorder has been marked as "shipped" then the table is displayed differently
- The sub rows show stock items which have been fulfilled against the sales order
 2020-04-27 10:31:38 +10:00
Oliver Walters
5167117067 Calculate 'fulfilled' quantity once a sales order is marked as shipped 
- This allows us to delete the SalesOrderAllocation objects from the database
 2020-04-27 08:58:18 +10:00
Oliver Walters
3c5ba75d27 PEP fixes 2020-04-26 16:44:35 +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
4147163418 Improve status code label rendering 2020-04-26 15:29:21 +10:00
Oliver Walters
0892b160c6 "Fixes" for completing a build 
- This will require a lot of unit testing to get right
 2020-04-26 00:32:09 +10:00
Oliver Walters
4f0efec39f PEP and unit testing fixes 2020-04-25 23:24:00 +10:00
Oliver Walters
01a68270ea Add verbose names for multiple Build model fields 
- Improve methods for different models
 2020-04-25 23:17:07 +10:00
Oliver Walters
b351976ae9 Mark a SalesOrder as "shipped" 
- Option to hide non-stock items from stock list
- Update models with new feature
 2020-04-25 08:46:28 +10:00
Oliver Walters
77471cb89c Form for shipping a SalesOrder 
- Returns "False" for now
 2020-04-24 10:20:56 +10:00
Oliver Walters
b45fec221c Expose more status code data to the templates 
- Status codes are now exposed globally to every page
- Much simplified so wow
- https://stackoverflow.com/questions/3221592/how-to-pass-common-dictionary-data-to-every-page-in-django
 2020-04-24 09:27:42 +10:00
Oliver Walters
7f020cbbf6 Enbiggen a whole lotta buttons 2020-04-23 19:41:14 +10:00
Oliver Walters
b70e79b778 Optionally add all SalesOrderAllocations to the SalesOrderLineItem serializer 2020-04-22 20:10:23 +10:00
Oliver Walters
5d1754ec32 Better display of where a StockItem is allocated 2020-04-22 17:39:59 +10:00
Oliver Walters
eb7b49784b StockItem serializer now includes the allocated quantity 2020-04-22 15:24:11 +10:00
Oliver Walters
d9698b10cc PEP fixes 2020-04-22 13:21:45 +10:00
Oliver Walters
1373425c29 Update definition for StockItemAllocation model 
- Limit foreignkey choices
- Error checking
- Check if a StockItem is over-allocated
- Fix API serialization and filtering
 2020-04-22 13:11:19 +10:00
Oliver Walters
2cb1b076f6 Create "SalesOrderAllocation" object 
- Links multiple StockItem objects to a single SalesOrderLineItem
 2020-04-22 12:12:48 +10:00
Oliver Walters
3a71a4f63a Fix for StockItem model 
- Allow sales_order_line to be blank
 2020-04-22 10:16:54 +10:00
Oliver Walters
6dd79af0b6 Expose "is_allocated" parameter on StockItem API 2020-04-22 10:11:40 +10:00
Oliver Walters
372958d939 Migrate more pages to the two_column template 2020-04-22 09:50:10 +10:00
Oliver Walters
09ccd6c5e2 PEP style fixes 2020-04-21 22:37:35 +10:00
Oliver Walters
cb636e000d Display a sub-list of stock items which are allocated to a SalseOrderLineItem 2020-04-21 21:38:04 +10:00
Oliver Walters
2c6e8da90e Ability to filter StockItemList API by sales_order or sales_order_line 2020-04-21 17:33:02 +10:00
Oliver Walters
0d1919f10b Display an alert on a stock item page if that stock item is allocated to a salesorder 2020-04-21 16:59:14 +10:00
Oliver Walters
89ede3e103 Fix for SalesOrderLineItem allocation calculation 
Also function to render a progress bar
 2020-04-21 16:45:44 +10:00
Oliver Walters
a1376eeb9e The 'StockItem' model now has a reference to a SalesOrderLineItem 2020-04-21 15:04:21 +10:00
Oliver Walters
87d8b4674a Merge remote-tracking branch 'inventree/master' 2020-04-20 09:58:49 +10:00
Oliver Walters
4ec5e9a907 Consolidate StockItem serializer 2020-04-20 08:24:43 +10:00
Oliver Walters
c49cd9ffde Merge remote-tracking branch 'inventree/master' 2020-04-20 01:28:31 +10:00
Oliver Walters
c72fce0cc5 Add "tracking items" back in 2020-04-20 01:14:19 +10:00
Oliver Walters
b2c40c91b7 PEP fixes 2020-04-20 01:11:25 +10:00
Oliver Walters
0334035e77 Simplify StockItem serializer 
- Some more work needed here to cut down on database hits
 2020-04-20 01:09:37 +10:00
Oliver Walters
6a89e0089d Updates for stock serializer 2020-04-20 00:49:13 +10:00
Oliver Walters
762d735618 Merge remote-tracking branch 'inventree/master' 2020-04-16 21:55:59 +10:00
Oliver Walters
d57fed6142 Change fingerprint icon to barcode 2020-04-15 00:30:00 +10:00
Oliver Walters
e56c018a4a Display StockItem UID if one exists 2020-04-14 23:28:46 +10:00
Oliver Walters
977316cb3a Include UID field in StockItem API 2020-04-14 22:57:46 +10:00
Oliver Walters
ba4a1fd771 Add a 'uid' field to StockItem model 
- To be used for barcode asociation and lookup
 2020-04-14 22:54:05 +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
2e1c4e9792 Merge remote-tracking branch 'inventree/master' 2020-04-13 20:43:00 +10:00
Oliver Walters
2506aa110b API changes 
- Allow SupplierPart to be filtered by 'company' in addition to 'supplier' and 'manufacturer'
- Stock can now also be filtered by 'company'

(cherry picked from commit 1b1cd944be)
 2020-04-13 20:20:33 +10:00
Oliver Walters
a8ceddc8e4 Merge remote-tracking branch 'inventree/master' 2020-04-12 01:05:42 +10:00
Oliver Walters
7503596ea4 More fixes 
- Add a set of template tags for rendering status codes
- Improve build API filtering
- Remove some outdated files
- Fix unit testing
 2020-04-12 00:10:33 +10:00
Oliver Walters
e3102900b6 Allow stock API to filter by parts which are not active 2020-04-11 14:41:07 +10:00
Oliver Walters
ba2b1ce581 Merge remote-tracking branch 'inventree/master' 2020-04-10 01:12:11 +10:00
Oliver Walters
bc91975f2c Fixes for Stocktransfer API endpoint 2020-04-10 01:01:39 +10:00
Oliver Walters
5b2665edb1 Better API validation 2020-04-10 00:53:04 +10:00
Oliver Walters
41b3f1d39c API cleanup 
Add / Remove / Count endpoints now work
 2020-04-10 00:03:43 +10:00
Oliver Walters
3e5dc65c49 Bugfix for notes field 2020-04-10 00:03:21 +10:00
Oliver Walters
58a0f40889 Simplifiy stock adjustment APIs 
- Separate API endpoints for count / add / remove / transfer
- Unit testing
 2020-04-09 22:24:05 +10:00
Oliver Walters
1b3f8a9309 Unit testing for the stocktake API 2020-04-09 21:19:13 +10:00
Oliver Walters
f6a1ddf8e7 Re-enable stocktake API 2020-04-09 21:18:55 +10:00
Oliver Walters
97f605ef55 Remove some weird trailing zeros 2020-04-07 00:19:51 +10:00
Oliver Walters
4a02a90954 Merge remote-tracking branch 'inventree/master' 2020-04-07 00:08:44 +10:00
Oliver Walters
96547b885e Include supplier-part information in Stock API 2020-04-06 22:02:23 +10:00
Oliver Walters
93eeeec2f3 Merge remote-tracking branch 'inventree/master' 2020-04-06 21:15:06 +10:00
Oliver Walters
44c10c45cd visual consolidation 2020-04-06 20:50:33 +10:00
Oliver Walters
b8f7555a73 Merge remote-tracking branch 'inventree/master' 2020-04-06 16:25:48 +10:00
Oliver Walters
bbe714c8f7 Bugs! 
Thanks, unit testing
 2020-04-06 11:21:34 +10:00
Oliver Walters
bd407cd226 Rename "URL" to "link" for StockItem and StockItemTracking models 2020-04-06 10:43:06 +10:00
Oliver Walters
2530313e68 Add part_detail and location_detail to the StockItem detail class 2020-04-06 08:38:10 +10:00
Oliver Walters
94b9878c8d Bug fix for stock api 
- If a part had an empty image, the thumbnail was improperly encoded
 2020-04-05 22:57:42 +10:00
Oliver Walters
efaa532162 Merge remote-tracking branch 'inventree/master' 2020-04-05 22:07:57 +10:00
Oliver Walters
7b494c08ec Translations 2020-04-05 20:40:46 +10:00
Oliver Walters
c170d3f87a More icons 2020-04-05 20:40:41 +10:00
Oliver Walters
c427f173ed Nav link icon improvements 2020-04-05 20:04:12 +10:00
Oliver Walters
428b52693a Merge remote-tracking branch 'inventree/master' 2020-04-05 01:00:00 +11:00
Oliver Walters
0cfb293ca9 List API now uses the thumbnail image 2020-04-05 00:19:37 +11:00
Oliver Walters
55e831f4b4 Merge remote-tracking branch 'inventree/master' 2020-04-03 14:24:35 +11:00
Oliver Walters
92f5648656 Fix API endpoints for Stock app 2020-04-03 12:20:43 +11:00
Oliver Walters
ccb637773f Add item count to StockLocation serializer 2020-04-03 11:41:51 +11:00
Oliver Walters
d4da6211be StockItem: filtering improvements 
- Optional 'cacade' param
- Filter by null parent
 2020-04-03 11:40:37 +11:00
Oliver Walters
fb94949538 Allow StockLocation filtering of null parent 2020-04-03 11:34:42 +11:00
Oliver Walters
ed6abcdf32 Merge remote-tracking branch 'inventree/master' 2020-03-22 20:20:22 +11:00
Oliver Walters
5af2fae120 Simplify URLs for purchase orders 2020-03-22 19:47:08 +11:00
Oliver Walters
7424cc1352 Merge remote-tracking branch 'inventree/master' 2020-03-18 21:33:09 +11:00
Oliver Walters
8eaaf62eda Limit choices for Part selection 
Based on is_template / virtual / active status
 2020-03-18 21:28:11 +11:00
Oliver Walters
ef83480f65 Merge remote-tracking branch 'inventree/master' 2020-02-19 00:03:32 +11:00
Oliver Walters
068c237c6e remove failing test 2020-02-18 23:59:37 +11:00
Oliver Walters
49118d8083 Do not let a StockItem be deleted if child items exist 2020-02-18 10:41:06 +11:00
Oliver Walters
49d5573f8b Bug fix: Update child/parent relationship when a StockItem is deleted 
- Pass the child items up to the parent of the deleted item
- Fix unit tests
 2020-02-18 08:42:55 +11:00
Oliver Walters
9e456f5a11 Flake fix 2020-02-18 08:15:05 +11:00
Oliver Walters
0f4d60dceb StockItem LIST API can now be filtered by StocKItem status 2020-02-17 23:32:43 +11:00
Oliver Walters
23aebab6d0 Display list of build outputs in the Build tab 
- Allow StockList api to be filtered by Build id
 2020-02-17 23:31:23 +11:00
Oliver Walters
e483b42df6 Logic fix for StockItem splitting 
- The original is left in place
- The new item is moved
 2020-02-17 22:56:54 +11:00
Oliver Walters
3715c5d637 Set the parent relationship when serializing StockItem object 
- Keep track of which StockItem is came from
 2020-02-17 22:44:41 +11:00
Oliver Walters
ae4ebab957 Display table of StockItems which have been split from the current item 
- The StockItem list api now allows filtering by 'ancestor'
- Add 'children' tab for StockItem
- Needed to tweak the unit testing fixtures (yay thanks MPTT)
 2020-02-17 22:37:55 +11:00
Oliver Walters
4f266958e3 Add custom migration 
- Required to initialize the MPTT fields for the StockItem model
 2020-02-17 22:11:44 +11:00
Oliver Walters
750dfcda07 Add 'parent' field for StockItem 
- Allows StockItem to be tracked when it is split into multiple items
- Uses MPTT field
 2020-02-17 21:52:31 +11:00
Oliver Walters
0498fd633a Merge remote-tracking branch 'inventree/master' 2020-02-12 12:56:17 +11:00
Oliver Walters
33d21594da Create new stock item from supplierpart stock page 
- Allow stock-item-create form to have supplierpart passed as initial data
- Add some translations too
 2020-02-12 11:32:01 +11:00
Oliver Walters
6d80788618 Allow stock-filtering and export using SupplierPart ID 2020-02-12 11:16:00 +11:00
Oliver Walters
8dd8505a2c More tab updates 
- Add Stock tab
- Add Stock table for supplier part
- Allow stock API to be filtered by supplier-part ID
- Add Orders tab
 2020-02-12 11:09:37 +11:00
Oliver Walters
265ed5115a Float parsing on StockItem tracking page 2020-02-12 08:19:08 +11:00
Oliver Walters
bb4c25ba68 Merge remote-tracking branch 'inventree/master' 2020-02-11 20:36:13 +11:00
Oliver Walters
4bd4f2a0a3 Fix for bug b) 
- Don't attempt to save if there are duplicates
- Fix overwritten variable name
- Provide correct return data to the form
 2020-02-06 23:22:55 +11:00
Oliver Walters
2949289fab Fix for bug a) 
- Would not create new StockItem for trackable part if Serial Numbers not provided
 2020-02-06 23:11:47 +11:00
Oliver Walters
8412885e09 Merge remote-tracking branch 'inventree/master' 2020-02-02 22:26:18 +11:00
Oliver Walters
5264f816f1 Allow PartCategory and StocKLocation names to be non-unique 
- As long as they are unique in the current tree level
 2020-02-02 21:40:03 +11:00
Oliver Walters
40037d826d Merge remote-tracking branch 'inventree/master' 2020-02-02 12:48:04 +11:00
Oliver Walters
1a32e441b7 Add //TODO entry in stock tabs 2020-02-02 12:42:35 +11:00
Oliver Walters
1bdcbd1974 Markdownify the 'notes' field for StockItem 
- New tab interface for the StockItem page
- Display / editing of notes field with markdown
 2020-02-02 12:11:18 +11:00
Oliver Walters
07de23f120 Merge remote-tracking branch 'inventree/master' 2020-01-06 10:11:18 +11:00
Oliver Walters
b3ec748123 Display current stock item quantity in stock-adjust modal form 2020-01-06 08:52:28 +11:00
Oliver Walters
b29e1ded64 Merge branch 'decimal-quantity' 2019-11-19 21:47:22 +11:00
Oliver Walters
dbdbe69f7f Bug fix for test cases 2019-11-19 10:19:52 +11:00
Oliver Walters
9da8189899 Allow non-integer stock movement 2019-11-19 10:17:20 +11:00
Oliver Walters
e4bfe43c04 More rendering improvements 2019-11-19 10:10:23 +11:00
Oliver Walters
003a2d9f3c Allow creation of stockitem with non-integer quantity 
-  Also provided more translation strings
 2019-11-19 10:00:08 +11:00
Oliver Walters
75774771dc Changes to StockItem model 
- Stock adjustments need to accept decimal values
 2019-11-19 09:18:41 +11:00
Oliver Walters
20755a6dac Rendering of decimal value on stockitem page 2019-11-19 09:10:47 +11:00
Oliver Walters
6e90ac367e Massaging unit tests 
- Decimal fields are useful but VERY ANNOYING to use
- Needed to fix some test cases
 2019-11-19 08:59:56 +11:00
Oliver Walters
400941c10f Change item quantity field from PositiveInteger to Decimal 
- Allow 'partial' quantity e.g. '0.45kg'
- Need to change some maths functions as Decimal type is pernickity
 2019-11-19 08:49:54 +11:00
Oliver Walters
81a226c760 Added translation strings for stock.models 2019-11-19 08:46:25 +11:00
Oliver Walters
6e54c49142 Merge remote-tracking branch 'inventree/master' 2019-11-16 20:45:34 +11:00
Oliver Walters
16f3dfb678 Removed old migration file 2019-11-16 20:39:10 +11:00
Oliver Walters
b7473be8ef Update stock adjustment dialog 2019-11-16 20:29:05 +11:00
Oliver Walters
2261973331 Ability to delete multiple stock items 2019-11-16 20:19:10 +11:00
Oliver Walters
789515e39d Add translations for the StockItem detail page 2019-11-16 20:14:08 +11:00
Oliver Walters
0effb584b9 Remove 'active' field 
- Will work this change in at a later date
 2019-11-16 20:13:51 +11:00
Oliver Walters
339126b27a Add new field "active" to StockItem model 
- True by default
- Set to 'false' to mark a stockitem as 'deleted'
 2019-11-16 19:41:36 +11:00
Oliver Walters
e891f117f3 Merge remote-tracking branch 'inventree/master' 2019-09-27 10:25:11 +10:00
Oliver Walters
3e2a5263a5 Add stock information for top-level stock page 2019-09-27 09:59:14 +10:00
Oliver Walters
14217ff648 Merge remote-tracking branch 'inventree/master' 2019-09-24 08:06:11 +10:00
Oliver Walters
7c1615a2b6 Fix user recording when serializing stock 2019-09-24 07:59:59 +10:00
Oliver Walters
41c07fc423 Save user who created a stock item 
- Handled differently for batch or serialized parts
 2019-09-24 07:54:18 +10:00
Oliver Walters
d6749dfb24 Merge remote-tracking branch 'inventree/master' 2019-09-22 22:34:34 +10:00
Oliver Walters
6f54091354 Improve display of stock location 2019-09-20 00:03:59 +10:00
Oliver Walters
b3ea2bfb9a Update badges 2019-09-19 23:38:15 +10:00
Oliver Walters
3c98cd87a7 Use localStorage rather than sessionStorage for storing user prefs 
- Also create some helper functions
 2019-09-19 23:29:03 +10:00
Oliver Walters
119cccc318 Merge remote-tracking branch 'inventree/master' 2019-09-17 20:32:30 +10:00
Oliver Walters
cb77506111 Simplify 2019-09-17 20:19:05 +10:00
Oliver Walters
4a0be0dfb8 Simplify 2019-09-17 20:15:50 +10:00
Oliver Walters
d0ad3f0e37 Merge remote-tracking branch 'inventree/master' 2019-09-15 22:28:55 +10:00
Oliver Walters
194ae49914 Export full_name for parts 2019-09-15 22:23:34 +10:00
Oliver Walters
204cd967aa Include status label text when exporting stocktake data 2019-09-15 20:14:27 +10:00
Oliver Walters
03043e67c7 Perform full validation when importing data 2019-09-15 19:58:05 +10:00
Oliver Walters
9c84e9076f Consolidate stock export code 
- Now defined in stock.admin as StockItemResource
- Much more control over format of exported data
- Exported data can be re-imported!
 2019-09-15 19:29:18 +10:00
Oliver Walters
5fde9777fb Merge remote-tracking branch 'inventree/master' 2019-09-14 00:19:17 +10:00
Oliver Walters
70e07470db Custom URL validators for more fields 2019-09-14 00:08:49 +10:00
Oliver Walters
4b33b15dd2 Merge remote-tracking branch 'inventree/master' 2019-09-13 23:38:07 +10:00
Oliver Walters
8578a3b8d1 Add searching to other admin views 2019-09-13 23:32:49 +10:00
Oliver Walters
cb5db332d3 Manager for import/export of StockItem data 2019-09-13 23:00:21 +10:00
Oliver Walters
23b814569a Manager for importing StockLocation data 2019-09-13 22:44:50 +10:00
Oliver Walters
a6e850e39f Merge remote-tracking branch 'inventree/master' 2019-09-09 15:03:57 +10:00
Oliver Walters
53c5324df6 Fix uniqueness test for stock item 2019-09-09 08:49:27 +10:00
Oliver Walters
108382cc89 Prefecth related data for stock export 
- Example export reduced from 1,024 queries to 7
 2019-09-09 08:17:26 +10:00
Oliver Walters
abecb4856f Merge remote-tracking branch 'inventree/master' 2019-09-09 00:09:58 +10:00
Oliver Walters
11c946be4d Export human-readable status code 2019-09-09 00:02:08 +10:00
Oliver Walters
231a669fe5 Export stock based on supplier 2019-09-08 23:53:09 +10:00
Oliver Walters
3d5542181a Move "Export" button onto stock table 2019-09-08 23:40:51 +10:00
Oliver Walters
8817b4d692 Icer button rendering for PurchaseOrder page 2019-09-08 23:27:54 +10:00
Oliver Walters
9212d6047f Add supplier information to exported data 2019-09-08 23:10:13 +10:00
Oliver Walters
cc452bc270 Export stock data 2019-09-08 23:01:16 +10:00
Oliver Walters
faf8b9f2f0 Form / view for downloading stocktake info 2019-09-08 22:37:27 +10:00
Oliver Walters
f4e71d6055 Add a buttony-boy 
(cherry picked from commit 69ac5d870a2f1bc9589cd9b23212d3b51cf92c80)
 2019-09-08 20:55:19 +10:00
Oliver Walters
2c969ef1c6 View for exporting stocktake / stock list 
(cherry picked from commit bdad2d6178a14322ef225d08b13db86b6d7d0909)
 2019-09-08 20:55:06 +10:00
Oliver Walters
dac61eafa2 Fixed tests 
- Tree classes now need extra configuration in the fixture
- Check for null pk when cleaning a tree node
 2019-09-08 19:41:54 +10:00
Oliver Walters
0d6a3d3b28 BOM table now refreshes the table rather than the page 2019-09-08 19:24:47 +10:00
Oliver Walters
b554af5f10 Fix display of location list 2019-09-08 19:21:40 +10:00
Oliver Walters
3eb3c43e5c Change foreign keys to TreeForeignKey 2019-09-08 19:19:39 +10:00
Oliver Walters
678157aac4 Update StockLocation and PartCategory models 
- Use the MPTT functionality once more
 2019-09-08 19:13:13 +10:00
Oliver Walters
2f11fccb73 Migrate InvenTreeTree to using MPTT model 2019-09-08 14:08:49 +10:00
Oliver Walters
83af318ad0 Merge remote-tracking branch 'inventree/master' 2019-09-07 21:23:50 +10:00
Oliver Walters
023c386f5e Display a warning message if delete_on_deplete is set 2019-09-07 21:18:32 +10:00
Oliver Walters
b4bbd43bae Fix 404 if a stock item is completely depleted 2019-09-07 21:15:14 +10:00
Oliver Walters
755962c6a2 Merge remote-tracking branch 'inventree/master' 2019-09-05 20:13:17 +10:00
Oliver Walters
7fd4359007 Add new option to move-stock form 
- Set the destination as the default location for parts being moved
 2019-09-05 19:59:00 +10:00
Oliver Walters
7b8d7c9fe0 Merge remote-tracking branch 'upstream/master' 2019-09-01 23:33:39 +10:00
Oliver Walters
906766cc0e Bug fix - ensure pk is set to None 2019-09-01 23:28:28 +10:00
Oliver Walters
7db938eda0 Show the build item on the stock-item page (if applicable) 2019-09-01 23:24:27 +10:00
Oliver Walters
3cef5c93ce Improve stock item splitting 2019-09-01 23:18:08 +10:00
Oliver Walters
90a342fad8 Add a reference to a build for a stock item 2019-09-01 23:09:40 +10:00
Oliver Walters
d319c79abb Merge remote-tracking branch 'upstream/master' 2019-08-30 02:59:01 +10:00
Oliver Walters
094e8cdc23 PEP 2019-08-30 00:15:16 +10:00
Oliver Walters
891f4f9f17 Another test 2019-08-30 00:14:54 +10:00
Oliver Walters
6f8c3454f3 Tests for stock serialization form 2019-08-30 00:06:46 +10:00
Oliver Walters
34bfdea4b5 Test another invalid serialization 2019-08-29 23:50:33 +10:00
Oliver Walters
1e62528d2a Merge remote-tracking branch 'upstream/master' 2019-08-29 21:37:03 +10:00
Oliver Walters
0fba236eef Stock locations are now persistent 2019-08-29 15:52:32 +10:00
Oliver Walters
7ae7c19a24 Merge remote-tracking branch 'inventree/master' 2019-08-29 08:21:21 +10:00
Oliver Walters
937bcd41d6 Fix tests for stock serialization 2019-08-29 07:37:44 +10:00
Oliver Walters
4db345d0c2 Perfom serialization 2019-08-28 22:47:46 +10:00
Oliver Walters
76ec44d770 Form improvements 2019-08-28 22:04:04 +10:00
Oliver Walters
6c5b09efd4 Provide initial data 2019-08-28 21:50:44 +10:00
Oliver Walters
7575a39b7f Add form / view for serializing a stock item 
- Back end doesn't do anything yet
 2019-08-28 21:46:26 +10:00
Oliver Walters
3b8f5872ac Add button to serialize stock 2019-08-28 21:21:26 +10:00
Oliver Walters
43967e302b Add ablity to serialize an existing quantity of stock 
- Do not have to serialize all the stock
- Add tests
- Add function to copy entire stock transaction history
 2019-08-28 21:12:16 +10:00
Oliver Walters
bc03ae53bd Changes for clean of StockItem 2019-08-28 20:01:38 +10:00
Oliver Walters
88b90281f5 Do not enforce serialization when creating a stock item 2019-08-28 19:56:35 +10:00
Oliver Walters
c3fe101571 Merge remote-tracking branch 'inventree/master' 2019-08-15 13:41:50 +10:00
Oliver Walters
c81f8e6d87 Add 'new supplier part' button to stock item creation form 2019-08-15 13:17:33 +10:00
Oliver Walters
f9fa16a397 Fix remove-row button in stock-adjust form 2019-08-14 13:29:51 +10:00
Oliver Walters
c1ab004c0c Merge remote-tracking branch 'inventree/master' 2019-08-09 20:37:46 +10:00
Oliver Walters
a36d99b3e7 PEP fixes 2019-08-09 20:14:47 +10:00
Oliver Walters
bd61c89094 Tests for stock app views 2019-08-09 20:13:23 +10:00
Oliver Walters
84ea95181d Merge remote-tracking branch 'inventree/master' 2019-08-02 22:37:26 +10:00
Oliver Walters
c8bf20ad41 Add part hover image 2019-07-25 11:08:22 +10:00
Oliver Walters
fe7392f152 Prevent stock adjustments for serialized stock items 2019-07-25 11:05:09 +10:00
Oliver Walters
94c0102742 Improve validation logic for StockItem 
- Allow tracked items to exist without a serial number (e.g. non-serialized tracked items)
 2019-07-25 11:04:45 +10:00
Oliver Walters
42e1370e92 Bug fix 2019-07-25 10:36:59 +10:00
Oliver Walters
3058b895dd Prevent auto-delete of stock items which have a serial number 2019-07-24 20:24:12 +10:00
Oliver Walters
33fe4d186d Include more fields when splitting stock 2019-07-24 19:48:37 +10:00
Oliver Walters
163f076565 Merge remote-tracking branch 'inventree/master' 2019-07-23 12:07:13 +10:00
Oliver Walters
a42371598c Fix part deletion template 
- Display list of stock items which will be thusly deleted
 2019-07-23 11:55:51 +10:00
Oliver Walters
b546b5e0cc Create separate entries for each unique serial number 2019-07-23 11:45:03 +10:00
Oliver Walters
d82d8f5cd1 Re-implement item saving for non-tracked parts 2019-07-23 11:31:29 +10:00
Oliver Walters
9e5eadd6c3 Set serial numbers when creating a new stock item 2019-07-23 10:31:34 +10:00
Oliver Walters
23d03d6b9b Build completion now handles unique serial numbers 
Provide a method to test if a serial number matches for a given part
 2019-07-22 15:55:36 +10:00
Oliver Walters
8ca14efa53 Delete stock tracking entries 2019-07-22 10:46:42 +10:00
Oliver Walters
c27e8e809a Endpoint for editing a stock tracking entry 2019-07-18 08:55:57 +10:00
Oliver Walters
bb799d98be Add ability to create new stock tracking note for a stock item 2019-07-16 00:10:24 +10:00
Oliver Walters
310d4b5f07 Added descriptive help text 2019-07-15 23:53:25 +10:00
Oliver Walters
d800ed715e Add (optional) URL to stock tracking info 2019-07-15 22:33:00 +10:00
Oliver Walters
c9bee19b8a Remove thingy 2019-07-15 19:26:41 +10:00
Oliver Walters
7d2d6a79e4 Merge remote-tracking branch 'inventree/master' 2019-07-12 00:20:54 +10:00
Oliver Walters
23d19d6784 Remove old debug messages 2019-07-11 23:07:52 +10:00
Oliver Walters
40695b3288 Merge remote-tracking branch 'inventree/master' 2019-07-10 20:13:35 +10:00
Oliver
1f9e6f4a68
Merge pull request #411 from SchrodingersGat/bom-upload 
BOM upload
 2019-07-10 15:17:58 +10:00
Oliver Walters
20ec36d3ea Enforce authentication for API access 2019-07-08 19:20:00 +10:00
Oliver Walters
b185abbb87 Catch case in which a request.GET is not available 
(cherry picked from commit 9296c0ba0f8c4914cd04b820c6172f8c3a794750)
 2019-07-08 09:41:20 +10:00
Oliver Walters
047d2f2f4c Include part revision in stock API / table 2019-06-28 09:35:29 +10:00
Oliver Walters
bd9d5b92dc Merge remote-tracking branch 'inventree/master' 2019-06-25 21:04:02 +10:00
Oliver Walters
d6fcf85cd2 Set part category for multiple parts at once 2019-06-25 19:15:39 +10:00
Oliver Walters
6da0106aa2 Merge remote-tracking branch 'inventree/master' 2019-06-20 21:49:30 +10:00
Oliver Walters
e0bfda2b14 Merge remote-tracking branch 'inventree/master' 2019-06-20 21:49:19 +10:00
Oliver Walters
d5119e1aff Replace some cog icons 2019-06-20 21:28:00 +10:00
Oliver Walters
1fc39d56df Add 'new stock location' button to top-level locatino 2019-06-19 18:50:05 +10:00
Oliver Walters
fefbcf2ed9 Clean up buttons for stock location 2019-06-19 18:49:05 +10:00
Oliver Walters
e5c2ee5587 Merge remote-tracking branch 'inventree/master' 2019-06-19 08:12:14 +10:00
Oliver Walters
c0e66dd9a0 Added pretty buttons to stock item page 2019-06-18 23:56:00 +10:00
Oliver Walters
f417ddb8e0 Merge remote-tracking branch 'inventree/master' 2019-06-18 01:50:50 +10:00
Oliver Walters
16b6ae8d61 Fixed up some stupid recursion on the Tree model template 2019-06-18 00:59:54 +10:00
Oliver Walters
642660d76e Improved speed of stock tree 2019-06-18 00:09:42 +10:00
Oliver Walters
1b43f151df Merge remote-tracking branch 'inventree/master' 2019-06-17 23:28:35 +10:00
Oliver Walters
3405fb93a9 Peppy fixes 2019-06-15 19:42:09 +10:00
Oliver Walters
1290e7f289 Implement POST for receiving items 
- Create new StockItem in the correct location
 2019-06-15 19:39:57 +10:00
Oliver Walters
c906cbe2c2 Merge branch 'stock-endpoint' 2019-06-13 23:06:08 +10:00
Oliver Walters
ff6df9741f Perform model validation on API serializers 
If you have a class, why not subclass it?!
 2019-06-13 23:03:58 +10:00
Oliver Walters
222c9f1876 Allow quantity editing via /api/stock/ endpoint 
- Allows creation of a new StockItem with a specified quantity
 2019-06-13 22:58:02 +10:00
Oliver Walters
8a46dda07f Merge remote-tracking branch 'inventree/master' 2019-06-10 23:22:04 +10:00
Oliver Walters
f731c45ce8 Replace other choice fields with commonized status code 2019-06-04 23:38:52 +10:00
Oliver Walters
166b41196b Merge remote-tracking branch 'inventree/master' 2019-06-04 21:22:36 +10:00
Oliver Walters
782ad57f52 Re-enable image hovering where appropriate 2019-06-03 22:03:22 +10:00
Oliver Walters
7a3b186a0c Fix double loading of modals.html 2019-06-03 21:51:59 +10:00
Oliver Walters
c00b19bc5b Merge remote-tracking branch 'inventree/master' 2019-06-02 20:42:37 +10:00
Oliver Walters
ba26acd487 Rename some fields 
- Oops didn't think that through, gotta go through and fix the data now...
 2019-06-02 19:46:30 +10:00
Oliver Walters
fd2e2a71f9 Add search results for part-category and stock-location 2019-06-02 19:15:05 +10:00
Oliver Walters
6e7f354a23 Add a 'LOST' status code for stockitem 2019-06-02 13:53:54 +10:00
Oliver Walters
013a85e6f7 Better dispaly of stock status 
- Send status text in JSON
- Only display status if it is not "OK"
 2019-06-02 13:53:11 +10:00
Oliver Walters
9577e4e505 Merge remote-tracking branch 'inventree/master' 
# Conflicts:
#	InvenTree/static/script/inventree/stock.js
#	InvenTree/stock/forms.py
#	InvenTree/stock/urls.py
#	InvenTree/stock/views.py
 2019-06-02 12:51:56 +10:00
Oliver Walters
6982b2f0c2 Making PEP happy 2019-06-02 12:47:40 +10:00
Oliver Walters
802ff35cf3 Remove some now unused forms / views / etc 2019-06-02 12:45:44 +10:00
Oliver Walters
2ee35ec062 Stock counting now works 2019-06-02 12:20:26 +10:00
Oliver Walters
d365d7cc44 remove from stock now works 2019-06-02 12:15:44 +10:00
Oliver Walters
1b3ffada6d Add-stock is now working 2019-06-02 12:13:22 +10:00
Oliver Walters
8dd9034563 Remove 'destination' field if we are not moving stock 
- Allow different stock adjustment actions
 2019-06-02 12:00:39 +10:00
Oliver Walters
d1ff115f74 Simplifiy js and improve template / form 2019-06-02 11:47:21 +10:00
Oliver Walters
c7503b4f9f Consolidated form/view into single 'stock-adjust' endpoint 2019-06-02 11:37:04 +10:00
Oliver Walters
fe31205017 Stock movement now works! 2019-06-02 11:27:03 +10:00
Oliver Walters
0b54baf6db POST the stock adjustment method back as a hidden form input 2019-06-02 11:15:12 +10:00
Oliver Walters
1b7762470d catch a ValueError 2019-06-02 11:14:56 +10:00
Oliver Walters
96f6f6068e Return message on succses 2019-06-02 11:05:40 +10:00
Oliver Walters
20963f83d9 Better error reporting for quantity 2019-06-02 11:00:28 +10:00
Oliver Walters
c228a4998c Extract stock items from POST and return to form 2019-06-02 10:25:19 +10:00
Oliver Walters
e278bdbb90 Improve filtering for stock items 2019-06-02 09:14:45 +10:00
Oliver Walters
011f5a5efd Delete rows interactively from stock adjustment form 2019-06-01 22:04:03 +10:00
Oliver Walters
6a04c8cbd3 Update stock_move form template 2019-06-01 21:16:59 +10:00
Oliver Walters
3869bc27c9 Whoops, that form was being used. 
Created a copy of the form for multiple-item-stock-movements
 2019-05-30 09:01:16 +10:00
Oliver Walters
d321947026 Add stock item fields for each item passed to the form 2019-05-29 22:38:42 +10:00
Oliver Walters
0e3f74ef31 Pass list of selected stock items to the view 2019-05-29 22:24:22 +10:00
Oliver Walters
0ce6c5f7d5 Redirect non-ajax forms to / 2019-05-29 22:24:17 +10:00
Oliver Walters
2b4cb4d3e0 Beginning to move the stocktake forms server side 2019-05-29 22:24:11 +10:00
Oliver Walters
72dc75512b Pass list of selected stock items to the view 2019-05-29 22:23:45 +10:00
Oliver Walters
f4a052ee2b Redirect non-ajax forms to / 2019-05-29 22:11:03 +10:00
Oliver Walters
080f9da9c8 Beginning to move the stocktake forms server side 2019-05-29 22:05:13 +10:00
Oliver Walters
6a30485a4e Initial work toward fixing stock issues 2019-05-29 01:03:21 +10:00
Oliver Walters
1232a6cf17 PEP fixes 2019-05-28 22:01:52 +10:00
Oliver Walters
8c583750a2 Update the stock list API 
- Custom data serialization is MUCH faster (~400ms compared to 3s)
- Cache location queries
- Flatten related field data
- Update stock table javascript to match
 2019-05-28 21:45:27 +10:00
Oliver Walters
4218cf8b45 Client-side grouping 
- Cusomizations made to bootstrap-table-group-by.js
- Group by part name
- Display total stock count per group
- Only group if there are more than 1 item in the group
- Groups send checkbox signals through appropriately!
 2019-05-28 17:21:29 +10:00
Oliver Walters
64403f824a And deltaco some code that went along with it 2019-05-27 22:46:17 +10:00
Oliver Walters
7de4ee80f1 Deltaco some dead code 2019-05-27 22:44:38 +10:00
Oliver Walters
5a9c19492b Design an aggregation filter for stock items 
- If 'aggregate=1' is sent to the stock API, aggregate the returned stock items by part and location
- Suprisingly this actually works right out of the gate
 2019-05-27 22:44:13 +10:00
Oliver Walters
f3b17b2164 Add some form fields (might have to remove later) 2019-05-26 00:32:18 +10:00
Oliver Walters
6603d6e9ed PEP fixes 2019-05-26 00:22:05 +10:00
Oliver Walters
c45a506a10 Rename field part.has_variants to part.is_template 2019-05-25 23:58:31 +10:00
Oliver Walters
75d38489d7 Add ability to filter stock by variants for a templated part 2019-05-25 23:26:46 +10:00
Oliver Walters
d70110690b Validate uniqueness for StockItems 
- If the Part is a variant of a template, ensure that the serial numbers are unique across all instances of the template
- Prevent instantiation of a StockItem for a part which has variants
 2019-05-25 23:09:04 +10:00
Oliver Walters
1a2fb9e170 Add 'has_variants' and 'variant_of' field for Part 
- StockItem cannot point to a part which is a template part
 2019-05-25 22:27:36 +10:00
Oliver Walters
5664fc5472 Detail in StockItem API now optional 2019-05-23 22:57:45 +10:00
Oliver Walters
18ff80312b Fixes 2019-05-20 22:53:01 +10:00
Oliver Walters
4bde00d925 AND AGAIN 
Use --fake to force the migration
 2019-05-20 22:24:18 +10:00
Oliver Walters
70be052c74 Rebuilt migrations again (arrrrrrrrrrrrrrrrrrrrrrrrrrgh never do this) 2019-05-20 21:45:37 +10:00
Oliver Walters
fc75ab7420 Reduce response time for stock list 
Initial time - 6.2s
After prefetch - 4.3s
 2019-05-20 08:44:52 +10:00
Oliver Walters
9ddedc6915 Restart migrations 
- Easier to delete all the migrations and start again :'(
 2019-05-19 00:11:41 +10:00
Oliver Walters
a8846dc515 Hopefully fix the thingy 2019-05-18 23:52:22 +10:00
Oliver Walters
0cfb243eb3 Move SupplierPart and SupplierPriceBreak to the 'Company' app 
- https://docs.djangoproject.com/en/2.2/ref/models/options/#django.db.models.Options.db_table
- https://stackoverflow.com/questions/3519143/django-how-to-specify-a-database-for-a-model
- And others, presumably
 2019-05-18 23:08:34 +10:00
Oliver Walters
117fd701cd Refactor some code 2019-05-16 22:19:49 +10:00
Oliver Walters
0a1887477c Create template for stock table 2019-05-16 22:15:44 +10:00
Oliver Walters
1b06cd23af Add 'stock' tab for supplier page 2019-05-16 21:16:19 +10:00
Oliver Walters
c1224048ad Add ability to filter stock by supplier 2019-05-16 21:01:34 +10:00
Oliver Walters
b4df96aaee Simplify extended filters 2019-05-16 19:14:43 +10:00
Oliver Walters
e1558a7a96 Add ability to filter stock items by part category 
- Using the REST API
- Add &category=x to the query string
- Add &include_child_categories to include child categories
 2019-05-16 18:54:14 +10:00
Oliver Walters
292e29e95e Add some more secondary modals 2019-05-15 07:50:54 +10:00
Oliver Walters
f979edef8e Prevent double loading of stock.js 2019-05-14 23:47:15 +10:00
Oliver Walters
58cc1cda77 Only load api.js once 2019-05-14 23:43:16 +10:00
Oliver Walters
9d50f2a6ac Toot toot all aboard the refactor tractor 
- launchModalForm now accepts a 'secondary' parameter which is a list of secondary modals to attach
 2019-05-14 23:27:45 +10:00
Oliver Walters
be1b458634 Upon successful creation (in a secondary modal) update the field in the primary modal 2019-05-14 23:04:49 +10:00
Oliver Walters
226644e59a Open a secondary modal over the top of a primary one 2019-05-14 22:37:45 +10:00
Oliver Walters
dc3abec899 Add a secondary modal in modals.html 2019-05-14 22:30:24 +10:00
Oliver Walters
d679ee9971 Update form for deleting stock location 2019-05-13 22:58:42 +10:00
Oliver Walters
a78106526a Remove launchDeleteForm JS function 
- All should be consolidated upon launchModalForm
- StockItem delete now uses this
 2019-05-13 22:47:36 +10:00
Oliver Walters
150c68e65b Bug fix 
- Turns out 'item_count' was actually used for something (that I wrote... recently...)
 2019-05-13 18:52:54 +10:00
Oliver Walters
b7d3bbd836 PEP 2019-05-13 18:46:48 +10:00
Oliver Walters
0813f8cbd5 More test coverage for Stock 2019-05-13 18:45:52 +10:00
Oliver Walters
f410957d8d Refactored Stock test to use fixtures 2019-05-12 21:46:38 +10:00
Oliver Walters
25e41b3fa2 Allow null values for StockItem.updated 
- Just to make the tests run better
 2019-05-12 21:20:43 +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 Walters
b73583be40 Make the 'quantity' field optional in the stock move API 
If not specified, the entire quantity will be moved
 2019-05-11 09:02:30 +10:00
Oliver Walters
271c684b22 Making the frog happy 2019-05-11 00:43:02 +10:00
Oliver Walters
97b9cac205 Successfully move multiple parts with partial quantities 2019-05-11 00:42:24 +10:00
Oliver Walters
306a981ca1 Allow partial-quantity move 
- Automatically split out the stock
- Move the specified quantity to the new location
 2019-05-11 00:40:37 +10:00
Oliver Walters
c376f38a8d Added function to split stock 
- Specify the quantity to move into the NEW stock item
- The left over quantity will remain in the current stock item
 2019-05-11 00:37:54 +10:00
Oliver Walters
6561a613d7 Add extra validation step 2019-05-11 00:07:21 +10:00
Oliver Walters
8d5c4c521c Pass stock move quantity through per item 2019-05-11 00:04:45 +10:00
Oliver Walters
ba2f565e35 docstring improvements 
- Added Attribute docstring to all model objects
 2019-05-10 20:11:52 +10:00
Oliver
e1fbd4611f
Merge pull request #289 from SchrodingersGat/delete_on_empty 
Delete on empty
 2019-05-09 23:26:19 +10:00
Oliver
793b4f8063
Merge pull request #288 from SchrodingersGat/tree-badges 
Tree badges
 2019-05-09 23:06:32 +10:00
Oliver Walters
027e1cf130 Add ability to edit 'delete_on_deplete' field 2019-05-09 23:06:19 +10:00
Oliver Walters
ac326c135f Auto delete stock items when they are depleted 2019-05-09 23:01:32 +10:00
Oliver Walters
61351a8f8d Renamed add_transaction_note to addTransactionNote 2019-05-09 22:52:38 +10:00
Oliver Walters
92930766c6 Tree view now supports root URL link 2019-05-09 22:23:56 +10:00
Oliver Walters
34225193fa Improve tree toggle icon 2019-05-09 21:46:11 +10:00
Oliver Walters
bff0f30b13 Save tree state 'per tree' 
- Separate save state for Part and Stock tree
 2019-05-09 21:41:44 +10:00
Oliver Walters
45223fb607 Display count badges in sidenav tree 
Uses the 'tags' parameter as according to the docs - https://github.com/jonmiles/bootstrap-treeview

- Part
- Stock
 2019-05-09 20:30:23 +10:00
Oliver
f4941d55ed
Merge pull request #285 from SchrodingersGat/hide-supplier-part 
Hide supplier_part field if the part cannot be purchased
 2019-05-09 18:46:48 +10:00
Oliver Walters
2c5bb6b126 Hide supplier_part field if the part cannot be purchased 2019-05-09 18:43:22 +10:00
Oliver Walters
ef9fb5b018 Hide some fields from forms 2019-05-09 18:38:37 +10:00
Oliver
8bf09300bb
Merge pull request #281 from SchrodingersGat/page-title 
Page title
 2019-05-09 18:33:03 +10:00
Oliver Walters
ca6bd0a999 Add page title for company page 2019-05-09 18:17:28 +10:00
Oliver Walters
b9b17f39d9 Override page title for Stock app 2019-05-09 18:11:13 +10:00
Oliver Walters
873bd182f0 Vertical alignment of button toolbars 2019-05-09 18:04:42 +10:00
Oliver Walters
e9c904076f Added help text for model fields 2019-05-08 23:32:57 +10:00
Oliver Walters
afffd06fb8 Limit choices for 'parent' field when editing StockLocation 2019-05-08 18:00:34 +10:00
Oliver Walters
abb8930702 Limit SupplierPart choices in EditStockItem view 2019-05-06 18:06:06 +10:00