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
2,588 Commits 6 Branches 99 Tags 484 MiB
435c13cf7c
Commit Graph

2066 Commits

Author SHA1 Message Date
Oliver Walters
03043e67c7 Perform full validation when importing data 2019-09-15 19:58:05 +10:00
Oliver Walters
2d17f957f1 Remove code duplication for part data export 2019-09-15 19:52:28 +10:00
Oliver Walters
2bc97764c7 Allow more file formats for BOM import 2019-09-15 19:45:59 +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
jmht
ce099f43f3 Fixes problem with 'New Purchase Order' button not working from Suppliers page. 2019-09-14 21:40:09 +01:00
Oliver Walters
70e07470db Custom URL validators for more fields 2019-09-14 00:08:49 +10:00
Oliver Walters
4ac8353099 Create a custom URL field, which allows the user-specified validators 
- Ref: https://stackoverflow.com/questions/41756572/django-urlfield-with-custom-scheme
- Apply this to the URL field in the Part model
 2019-09-14 00:04:08 +10:00
Oliver Walters
ee17d5d3c3 Allow for custom url schemes to be specified in the config file 2019-09-14 00:03:13 +10:00
Oliver
0846daf1f6
Merge pull request #524 from SchrodingersGat/import-export 
Customization of django-import-export plugin
 2019-09-13 23:35:57 +10:00
Oliver Walters
8578a3b8d1 Add searching to other admin views 2019-09-13 23:32:49 +10:00
Oliver Walters
9b1d0bee3b Add filtering and searching to Part admin 2019-09-13 23:27:22 +10:00
Oliver Walters
28d49bdd47 PEP 2019-09-13 23:19:12 +10:00
Oliver Walters
6a19e94feb Include some extra calculated fields for Part export (readonly) 2019-09-13 23:15:34 +10:00
Oliver Walters
52eeffc2c4 Change more models to use ImportExportModelAdmin 2019-09-13 23:05:16 +10:00
Oliver Walters
f707dd3430 Currency model admin now supports import / export 2019-09-13 23:02:54 +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
37ab3d214d Import/export management for the Company app 
- Company
- SupplierPart
- SupplierPriceBreak
 2019-09-13 22:39:15 +10:00
Oliver Walters
c579854e89 Export 'default_supplier' field 2019-09-13 22:29:11 +10:00
Oliver Walters
2bc34853e2 import/export manager for PartParameter 2019-09-13 22:27:32 +10:00
Oliver Walters
c469e48f26 Data manager for BomItem 2019-09-13 22:23:40 +10:00
Oliver Walters
bacd70687d Management class for PartCategory import / export 2019-09-13 22:20:08 +10:00
Oliver Walters
89acc778f5 Skip unchanged lines for matching ID values 2019-09-13 22:11:31 +10:00
Oliver Walters
ac36048230 Improve import/export of Part 
- Can now import part data
- Either UPDATE existing rows, or CREATE new ones
 2019-09-13 22:08:31 +10:00
Oliver Walters
8a68313e5e Customize admin export of Part object 2019-09-13 21:39:37 +10:00
Oliver
9e1f56cdb8
Merge pull request #522 from SchrodingersGat/order-improvements 
Order improvements
 2019-09-13 21:16:47 +10:00
Oliver Walters
7e9c095edb Ok, fixed now 2019-09-13 21:14:00 +10:00
Oliver Walters
588713467d Fixed unit tests 2019-09-13 21:07:32 +10:00
Oliver Walters
c8be9cb90c Display template badge in part table 2019-09-13 20:58:17 +10:00
Oliver Walters
36ec5e41b0 Cleanup 2019-09-13 20:53:04 +10:00
Oliver Walters
59f102af3c Database filtering beats list comprehension! 2019-09-13 20:15:34 +10:00
Oliver Walters
6854190ff9 Simple test for POLineItemedit view 2019-09-13 20:10:17 +10:00
Oliver Walters
d515e2d968 Tests for POLineItem creation form 2019-09-13 20:01:41 +10:00
Oliver Walters
7c6901f445 Tests for purchas order issue form 2019-09-13 18:15:05 +10:00
Oliver Walters
567826165c Improve BomItem editing form 
- Don't allow duplication of an item already in the BOM
- Remove the parent part from the BOM
 2019-09-13 16:26:44 +10:00
Oliver
8fcc1b8448
Update version.py 
Bumped to v0.0.6
 2019-09-13 15:54:12 +10:00
Oliver Walters
17e91493ea Bug fix for order-parts form 
- Check for parts already existing in PO must filter by the purchase order ID in addition to the part ID
 2019-09-13 15:32:52 +10:00
Oliver Walters
8716281f7e Add unit test for invalid characters 2019-09-13 11:15:54 +10:00
Oliver Walters
844f337d64 Fix ValidationError call for validate_tree_name function 2019-09-13 11:15:11 +10:00
Oliver
afdea818f7
Merge pull request #510 from SchrodingersGat/delete-lead-time 
Remove lead-time field
 2019-09-12 22:45:58 +10:00
Oliver Walters
91453094aa Remove lead-time field 2019-09-12 22:37:09 +10:00
Oliver
7326146c19
Merge pull request #509 from SchrodingersGat/delete-supplier 
Hide dropdown-menu for functionality that does not yet exist
 2019-09-12 22:17:53 +10:00
Oliver Walters
61d2ce67ef Hide dropdown-menu for functionality that does not yet exist 2019-09-12 22:01:18 +10:00
Oliver Walters
31625aa4bb Fix buttons for edit/delete supplier price break 2019-09-12 21:53:29 +10:00
Oliver Walters
4daf1ae8d4 Fixes for migrate target in makefile 2019-09-10 14:18:20 +10:00
Oliver Walters
4dc7da41b9 pepper 2019-09-09 20:02:52 +10:00
Oliver Walters
ddb041fe44 Filter by category too 2019-09-09 19:59:56 +10:00
Oliver Walters
776fc8b1e5 Add 'used_in' count to part export 2019-09-09 19:37:59 +10:00
Oliver Walters
8723a6c219 Add 'purchaseable' field to part export 2019-09-09 19:10:57 +10:00
Oliver
e4dcbd2fda
Update version.py 
Bump version num
 2019-09-09 14:25:00 +10:00
Oliver Walters
53c5324df6 Fix uniqueness test for stock item 2019-09-09 08:49:27 +10:00
Oliver Walters
fb2c347fd4 Removed unused import 2019-09-09 08:30:24 +10:00
Oliver Walters
9c988310b6 Add tests for MPTT models 2019-09-09 08:29:36 +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
11c946be4d Export human-readable status code 2019-09-09 00:02:08 +10:00
Oliver Walters
fff42e7dbb Export stock based on part 2019-09-08 23:58:40 +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
fa8056f4b9 Fill out supplier_part details when receiving a line for a purchase order 2019-09-08 23:15:44 +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
026108803e More links in the about page 2019-09-08 20:48:33 +10:00
Oliver Walters
e4fc44c135 More test 2019-09-08 20:36:51 +10:00
Oliver Walters
2a203be5cc Tests for part parameters 2019-09-08 20:18:21 +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
a5189b8f3f Replace a recursive function 2019-09-08 19:28:40 +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
4d7fba9f14 Replace tree functionality with MPTT goodness 2019-09-08 18:57:48 +10:00
Oliver Walters
2f11fccb73 Migrate InvenTreeTree to using MPTT model 2019-09-08 14:08:49 +10:00
Oliver Walters
b3a5dbb5db Add django-mptt as a requirement 
(cherry picked from commit 8c33a9fca11ad9af9c9f1c6ddf2a9dab8d71e2e4)
 2019-09-08 14:02:30 +10:00
Oliver Walters
baf096b3e7 Ensure token validation is working correctly 2019-09-08 00:28:12 +10:00
Oliver Walters
576226ad30 Tests for retrieving user auth tokens 2019-09-07 23:41:15 +10:00
Oliver Walters
32f606627d Special display case for base currecny 2019-09-07 22:43:39 +10:00
Oliver Walters
f24496c5a2 Enforce at least one base currency to be selected 2019-09-07 22:42:08 +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
efc08f6824 Improve table sorting for company list 2019-09-07 20:47:02 +10:00
Oliver
dd5ca32e8e
Merge pull request #481 from SchrodingersGat/settings 
Improve settings view
 2019-09-07 20:37:03 +10:00
Oliver
daa5a32440
Merge pull request #447 from rrakso/feature/add_method_to_delete_token 
Feature/add method to delete token
 2019-09-07 20:36:39 +10:00
Oliver Walters
446b342480 Add pagination to tables 2019-09-07 20:32:22 +10:00
Oliver Walters
c45fcb45cf Delete a part parameter template from the settings view 2019-09-07 20:30:51 +10:00
Oliver Walters
42ade0e0b7 Edit part parameter template from settings view 2019-09-07 20:28:38 +10:00
Oliver Walters
55669c79c2 Delete a currency from the currency settings view 2019-09-07 20:22:30 +10:00
Oliver Walters
3188b0ab18 Edit currency from settings view 2019-09-07 20:19:35 +10:00
Oliver Walters
31562826f4 Add modal form for creating a new currency 2019-09-07 20:06:04 +10:00
Oliver Walters
67ea0fa887 Create a new part parameter template 2019-09-07 19:53:47 +10:00
Oliver Walters
94ab7c5b0e Display list of part parameter templates in the part settings page 2019-09-07 19:45:36 +10:00
Oliver Walters
f415e2040e API endpoint for PartParameter and PartParameterTemplate 2019-09-07 19:44:10 +10:00
Oliver Walters
13270617b9 Ensure PartParameterTemplate name is unique 2019-09-07 19:43:41 +10:00
Oliver Walters
6752bdc1c6 Sort currency API 2019-09-07 19:28:20 +10:00
Oliver Walters
873faee040 Display currency list under currency settings page 2019-09-07 19:23:58 +10:00
Oliver Walters
9726ea4f99 Add serializer / API for currency objects 2019-09-07 19:18:18 +10:00
Oliver Walters
89c3ab5e99 Formatting 2019-09-07 18:58:37 +10:00
Oliver Walters
27878d2d8d Split settings into multiple pages 
- Tab style navigation
 2019-09-07 18:02:03 +10:00
Oliver Walters
1b8fb4db44 Start skeleton for better settings page 2019-09-07 15:04:18 +10:00
Oliver
9a61ba4e1e
Merge pull request #479 from SchrodingersGat/hide-sellable 
Hide the 'sellable' tag for now
 2019-09-07 14:25:33 +10:00
Oliver Walters
9c864aa619 Hide the 'sellable' tag for now 
- Keep hidden until parts can actually be sold
 2019-09-07 10:51:39 +10:00
Oliver Walters
8703ee90c6 Improve grouping 2019-09-07 10:41:22 +10:00
Oliver Walters
910d9a15f6 Display batch information in stock table 2019-09-07 10:39:48 +10:00
Oliver Walters
dac1264878 Fixed unit tests 2019-09-06 12:48:31 +10:00
Oliver Walters
9bde8bde66 Tree items dispaly description in __str__ representation 2019-09-06 12:40:04 +10:00
Oliver Walters
eb378e5e5d Specify PNG image for QR code generation 2019-09-06 12:38:09 +10:00
Oliver Walters
38b88e44bd Bug fix 2019-09-05 20:22:47 +10:00
Oliver
7642a1bb7b
Merge pull request #472 from SchrodingersGat/default-loc 
Add new option to move-stock form
 2019-09-05 20:09:47 +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
7659f2de7b Click button to validate BOM item 2019-09-05 19:34:58 +10:00
Oliver Walters
37d9c59a0e Add API endpoint for validating a BOM item 2019-09-05 19:29:51 +10:00
Oliver Walters
81f5714cb1 BOM table now displays which lines have been marked as valid 2019-09-05 14:15:58 +10:00
Oliver Walters
1ea7bdf843 Add a note 2019-09-05 13:12:49 +10:00
Oliver Walters
0508c2dcaf Use the hash for each line item to calculate the total BOM hash 2019-09-05 13:10:26 +10:00
Oliver Walters
7671eb2b22 Add a checksum field to the bom line item 2019-09-05 12:58:11 +10:00
Oliver Walters
e903c1858f PEP 2019-09-03 22:45:45 +10:00
Oliver Walters
20b37a2d11 Test fixes 2019-09-03 22:45:11 +10:00
Oliver Walters
41806089e3 Select the default currency if one is not specifically selected 2019-09-03 22:33:50 +10:00
Oliver Walters
3682e9b5fb Display currency selection in part pricing dialog 2019-09-03 22:28:53 +10:00
Oliver Walters
7314f33d6d Add currency selection field for price calculation form 2019-09-03 22:00:43 +10:00
Oliver Walters
0325f042b5 Bump version number 2019-09-03 09:59:14 +10:00
Oliver Walters
af8a96e080 Add option to edit currency 2019-09-03 09:55:15 +10:00
Oliver Walters
09cb82cdc0 Fix converted_cost 
- Incompatibility between float and decimal
 2019-09-03 09:46:32 +10:00
Oliver Walters
c6a435eba0 Add currency field to SupplierPriceBreak 2019-09-03 09:34:32 +10:00
Oliver Walters
9f91797f42 Simple test case for currency 2019-09-03 09:19:37 +10:00
Oliver Walters
32d09d2d37 Add default value for currency 2019-09-03 09:10:36 +10:00
Oliver Walters
7824b8561d Create a currency model 2019-09-03 09:07:03 +10:00
Oliver Walters
aeb25e4c34 startapp common 2019-09-03 08:30:14 +10:00
Oliver Walters
273412b63d Add 'bug report' button 2019-09-02 22:14:50 +10:00
Oliver Walters
f3e161564d Fix for serialization of company images 2019-09-02 22:06:42 +10:00
Oliver Walters
b0c420858b Comments for settings.py 2019-09-02 16:44:01 +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
c45c4e236e Point new stockitem to the correct build 2019-09-01 23:18:28 +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
d9cc03c5ca Improve installation documentation 2019-09-01 22:16:58 +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
ef94b41a77 Add test for api-doc view 2019-08-29 23:43:24 +10:00
Oliver Walters
e68a9c223d Fix broken api-doc page 
https://www.django-rest-framework.org/community/3.10-announcement/#continuing-to-use-coreapi
 2019-08-29 22:00:15 +10:00
Oliver Walters
0fba236eef Stock locations are now persistent 2019-08-29 15:52:32 +10:00
Oliver Walters
ef674061de Part category collapse is persistent 2019-08-29 15:50:48 +10:00
Oliver Walters
86b2b9cdb1 Allow unserialized build 2019-08-29 08:05:45 +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
15b38000d5 Improved serial number extraction 
- Check data types
- Translation for error messages
 2019-08-28 22:03:40 +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
Oskar Jaskolski
8949542baf fixed response text 2019-08-28 12:53:08 +02:00
Oskar Jaskolski
0a6abd21be fixed responde text 2019-08-28 12:47:56 +02:00
Oskar Jaskolski
3c70c3a29c clean 2019-08-28 12:41:46 +02:00
Oskar Jaskolski
981884f368 test 2019-08-28 12:40:06 +02:00
Oskar Jaskolski
5dcfc20d82 test 2019-08-28 12:39:25 +02:00
Oskar Jaskolski
381e58ab1c added import 2019-08-28 12:35:00 +02:00
Oskar Jaskolski
105b93a0e3 added method allowing to remove token 2019-08-28 12:30:31 +02: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
d5ad53c788 Add docstring 2019-08-28 19:44:46 +10:00
Oliver Walters
f94be40857 Style fixes 2019-08-28 19:44:02 +10:00
Oliver Walters
586a46175d Add modals for editing or deleting part parameters 2019-08-28 19:39:47 +10:00
Oliver Walters
51e4bdd821 URL / view for editing a PartParameter 2019-08-21 13:11:19 +10:00
Oliver Walters
e77aeec2ce Change to ImportExport model admin 2019-08-20 18:04:22 +10:00
Oliver Walters
9630c90924 Add buttons to edit/delete parameters 2019-08-20 18:01:20 +10:00
Oliver Walters
307a04da58 Add View/Form for creating a new PartParameterTemplate 2019-08-20 14:33:18 +10:00
Oliver Walters
15a42878db Improved view for creating a new part parameter 
- Hide the Part input
- Reduce options based on parameters that already exist!
 2019-08-20 14:28:15 +10:00
Oliver Walters
c68c79ea43 Create view / form / URL for PartParameter creation 2019-08-20 14:14:21 +10:00
Oliver Walters
db834802e3 Add uniqueness check for PartParameterTemplate name field 
- Case insensitive
 2019-08-20 13:08:06 +10:00
Oliver Walters
a228b38e5d Fix parameter lookup 2019-08-20 13:03:36 +10:00
Oliver Walters
e6819b5396 Change model - add PartParameterTemplate 2019-08-20 13:02:00 +10:00
Oliver Walters
6393ddad53 Add param tab to Part detail view 2019-08-20 12:44:00 +10:00
Oliver Walters
0955166fae Add admin interface for PartParameter 2019-08-20 12:43:23 +10:00
Oliver Walters
1cd0051316 Add page to display part parameters 2019-08-20 12:43:12 +10:00
Oliver Walters
2f6357b136 Add PartParameter table 2019-08-20 12:31:43 +10:00
Oliver Walters
41bfdc1432 Enforce usage of sqlite3 for running tests 
- Simplifies tests by creating a database in memory
- Does not affect the user setup at all
 2019-08-15 21:57:34 +10:00
Oliver Walters
9f5325d61f PEP fixes 2019-08-15 21:50:42 +10:00
Oliver Walters
087492faf8 More build tests 2019-08-15 21:49:40 +10:00
Oliver Walters
cd05ed91aa More tests for Build API and views 2019-08-15 21:35:16 +10:00
Oliver Walters
62f007529e Bug fix in build views 
- Untested code path meant variable was not being set
 2019-08-15 21:19:59 +10:00
Oliver Walters
80771beee9 FIxtures for build testing 2019-08-15 21:16:12 +10:00
Oliver Walters
5501fecbc4 PEP 2019-08-15 19:36:03 +10:00
Oliver Walters
b8d7cefa95 Add button to delete a build (only if it has been cancelled) 2019-08-15 19:35:12 +10:00
Oliver Walters
03b7e3a815 Add view / template to delete a build 2019-08-15 19:34:55 +10:00
Oliver Walters
d9e5bfd971 Use button row rather than drop-down for build display 2019-08-15 19:26:13 +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
475c532514 Fix config template file 2019-08-14 16:56:54 +10:00
Oliver Walters
6106d33732 More span / button fixes 2019-08-14 16:40:14 +10:00
Oliver Walters
6c73649687 PEP fix 2019-08-14 16:35:26 +10:00
Oliver Walters
5963f7ed01 Deleted unused form 2019-08-14 13:54:16 +10:00
Oliver Walters
f90ffcd3db Fix buttons for BOM upload form 2019-08-14 13:35:48 +10:00
Oliver Walters
f9fa16a397 Fix remove-row button in stock-adjust form 2019-08-14 13:29:51 +10:00
Oliver Walters
335066aef6 Fix buttons for order form 2019-08-14 13:28:06 +10:00
Oliver Walters
b19472ad73 Bump version 2019-08-14 13:27:51 +10:00
Oliver Walters
0a97bc1b40 PEP fixes 2019-08-14 13:15:36 +10:00
Oliver Walters
ea669e7562 Print warnings to stderr not stdout 2019-08-14 12:13:31 +10:00
Oliver Walters
905c02d86f Copy config template to config file if it does not exist 2019-08-14 12:05:47 +10:00
Oliver Walters
b7391231aa Fixes for default config file 2019-08-14 11:43:48 +10:00
Oliver Walters
df470ca26d Tests for serial number extraction 2019-08-09 20:30:31 +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
e849f62a6a PEP 2019-08-08 23:50:11 +10:00
Oliver Walters
b924265c9a Some tests for views in order app 2019-08-08 23:49:35 +10:00
Oliver Walters
45d5667ccc PEP fixes 2019-08-08 23:36:32 +10:00
Oliver Walters
b872a12131 Test for making part variant 2019-08-08 23:34:32 +10:00
Oliver Walters
3a87cd866c Tests for part creation 
- Need more tests for POST action
 2019-08-08 23:32:34 +10:00
Oliver Walters
51e4a4c006 Tests for BomItem forms 2019-08-08 23:22:26 +10:00
Oliver Walters
d6f1fe74d1 Tests for PartCategory forms 2019-08-08 23:16:03 +10:00
Oliver Walters
ab3e66d578 Test for BOM download 2019-08-08 23:10:07 +10:00
Oliver Walters
f299248063 Improve testing for part export 2019-08-08 23:06:22 +10:00
Oliver Walters
21d2c434ff Test for part export view 
- Needs some more work (parts need supplier parts!)
 2019-08-08 23:04:58 +10:00
Oliver Walters
afcd411358 (partial) tests for attachment forms 2019-08-08 23:00:01 +10:00
Oliver Walters
3a9494ee69 Test for Part Editing form 2019-08-08 22:50:17 +10:00
Oliver Walters
7db97f2226 Test Part QR Code view 2019-08-08 22:45:10 +10:00
Oliver Walters
a70484caff Test PartDetail view 2019-08-08 22:45:02 +10:00
Oliver Walters
f26243af97 Tests for Part index / 2019-08-08 22:19:17 +10:00
Oliver Walters
adbc4db3d5 Remove 'set part category' button (doesn't do anything) 2019-08-07 10:11:00 +10:00
Oliver Walters
4fc2a22ba6 PEP fix 2019-08-07 10:07:30 +10:00
Oliver Walters
8904733ac0 Include part stock information 2019-08-07 10:05:12 +10:00
Oliver Walters
ab0da6aaae Include more part data in export 2019-08-07 09:55:18 +10:00
Oliver Walters
dda4569f76 Export selected parts 
- Select which parts to export in the table
- Export base information
- Include supplier part information
 2019-08-07 09:52:49 +10:00
Oliver Walters
3dca7ba353 Include supplier information in BOM 2019-08-07 09:12:53 +10:00
Oliver
ecff9b7209
Merge pull request #433 from SchrodingersGat/order-api 
Add API endpoint for purchase orders
 2019-08-02 22:37:02 +10:00
Oliver
73eada17bc
Merge pull request #432 from SchrodingersGat/tweaks 
Tweaks
 2019-08-02 21:55:02 +10:00
Oliver Walters
b5f2c9d311 Add API endpoint for purchase orders 
- List and create purchase orders
- List and create purchase order line items
 2019-08-02 21:46:26 +10:00
Oliver Walters
e66fd956f9 Fix available stock display 2019-08-02 15:13:47 +10:00
Oliver Walters
0a328687a5 BOM hash includes reference fields 2019-08-02 11:11:28 +10:00
Oliver Walters
5ee07eae7c Update installation routine and docs 
- Single call of "make install" does everything
- Add backup_dir option to yaml config file
 2019-08-01 20:07:06 +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
077ad9482e Fix display of part trackable status info 2019-07-23 11:57:33 +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
9a8e4d25d2 Input serial numbers when creating a new build 2019-07-22 13:45:09 +10:00
Oliver Walters
44c9683d48 Extract serial numbers from a simple input string 
- Individual numbers can be separated by comma or whitespace
- Provide a series of numbers with hyphen-separation
 2019-07-22 13:43:39 +10:00
Oliver Walters
8ca14efa53 Delete stock tracking entries 2019-07-22 10:46:42 +10:00
Oliver Walters
118a6887bc Edit stock tracking entry 2019-07-22 10:36:39 +10:00
Oliver Walters
0305d2f865 Improve rendering of stock tracking table 
- Date only (no time)
- Display URL if set
- Edit/Delete buttons for manually created entries
 2019-07-22 10:30:53 +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
31e6aa6906 doc fix 2019-07-12 00:15:47 +10:00
Oliver Walters
d0e1dc52f8 Example gunicorn conf file 2019-07-11 23:57:07 +10:00
Oliver Walters
df6db38535 Move static files into the app directory 
- As it is written
- Look where properly reading the docs gets you!
- manage.py collectstatic now actually works...
 2019-07-11 23:47:46 +10:00
Oliver Walters
23d19d6784 Remove old debug messages 2019-07-11 23:07:52 +10:00
Oliver Walters
377b2f94ce Remove unused io module 2019-07-10 23:54:33 +10:00
Oliver Walters
ee223e5649 Location of static files is also configurable 2019-07-10 23:48:33 +10:00
Oliver Walters
194c15492f MEDIA_ROOT is now provided in config.yaml 2019-07-10 23:41:33 +10:00
Oliver Walters
820d8da2ef Allowed hosts and CORS hosts now moved to the config file 2019-07-10 23:25:15 +10:00
Oliver Walters
f36757c87b Load database settings from config.yaml file 
- Provide an initial config file
 2019-07-10 23:11:13 +10:00
Oliver
1f9e6f4a68
Merge pull request #411 from SchrodingersGat/bom-upload 
BOM upload
 2019-07-10 15:17:58 +10:00
Oliver Walters
3e9288b26d Better display of stock availability 2019-07-10 14:50:21 +10:00
Oliver Walters
d6750652f0 Python styling fixes 2019-07-10 13:38:14 +10:00
Oliver Walters
c5e17070fb Reference and note fields cannot be None 2019-07-10 13:30:51 +10:00
Oliver Walters
8637d46981 Display inactive parts in part used_in view 2019-07-10 13:18:07 +10:00
Oliver Walters
322710d603 Handle dimension error in tablib 2019-07-10 13:04:47 +10:00
Oliver Walters
482a5dae4b Save the selected BOM data 2019-07-10 12:27:19 +10:00
Oliver Walters
c2dbc37f70 Display rows that contain errors with a reddish background 2019-07-10 12:04:24 +10:00
Oliver Walters
2e3676207e Reference and notes fields now persist too 2019-07-10 09:40:04 +10:00
Oliver Walters
99dee64f79 Pass part selection back-and-forwards between client/server 2019-07-10 09:22:38 +10:00
Oliver Walters
782d740323 Pass row quantity back to the server 2019-07-09 19:45:36 +10:00
Oliver Walters
e9eb814990 Rendering for part selection step 2019-07-09 19:21:54 +10:00
Oliver Walters
20ec36d3ea Enforce authentication for API access 2019-07-08 19:20:00 +10:00
Oliver Walters
16e1be61f5 Fix buttons and rendering for supplierpart page 2019-07-08 19:15:20 +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
dff8d1fb95 Supply part name for auto-fill when creating a new part 2019-07-08 09:33:44 +10:00
Oliver Walters
85e803f345 Create a new part directly from the BOM view 
- Pass data through to the part creation
- Populate the new part into the select dropdown
-
 2019-07-07 13:06:59 +10:00
Oliver Walters
ff5af8f217 Add a button to create a new part if necessary 2019-07-07 11:56:44 +10:00
Oliver Walters
a6da3ed4a4 Match each part to the list of available parts 
- Order selections based on "best" match
 2019-07-07 11:44:17 +10:00
Oliver Walters
f251620917 select2ify part selection 2019-07-07 11:24:40 +10:00
Oliver Walters
bd30ac037b Generate a list of allowed BOM items and pass to the form template 2019-07-07 11:22:01 +10:00
Oliver Walters
3930651c59 Make Reference and Notes fields editable 2019-07-07 09:57:23 +10:00
Oliver Walters
b77bfc74ea Pass column and index data through to each cell in the template 
Allows for much more intelligent template rendering
 2019-07-07 09:50:59 +10:00
Oliver Walters
0e95fb773f Column adjustments 2019-07-07 08:48:42 +10:00
Oliver Walters
b1bcb0d3d2 Extract quantity data from BOM 2019-07-03 21:45:56 +10:00
Oliver Walters
fa90c92a2a Redirect to step 3 2019-07-03 21:19:31 +10:00
Oliver Walters
064431e94f Fix template to display list of missing BOM columns 2019-07-03 20:14:13 +10:00
Oliver Walters
29a27ce598 Improve rendering for field selection form 2019-07-03 20:08:49 +10:00
Oliver Walters
c419207420 Insert a blank <td> as needed 2019-07-02 19:48:30 +10:00
Oliver Walters
a25522746e Reposition buttons 2019-07-02 19:46:39 +10:00
Oliver Walters
c959e8f62c Add ability to remove individual rows from BOM uploader 2019-07-02 19:45:26 +10:00
Oliver Walters
fc5682f565 Form is now fully transferred to a formview 2019-07-02 19:20:45 +10:00
Oliver Walters
4008a9fb45 Upload the selected BOM file 2019-07-02 19:07:59 +10:00
Oliver Walters
802255c62d Render GET as a formview rather than ajaxview 2019-07-02 19:02:19 +10:00
Oliver Walters
4f5b87dd38 Comment out postgres requirement 2019-07-02 18:44:49 +10:00
Oliver Walters
3c44fcaf5b moving towards implementing bom upload as a page form rather than a modal form 2019-07-02 18:43:26 +10:00
Oliver Walters
a23595c28d Improve data importing 
- Automatically prune empty rows
- prevent automatic conversion of integers to floats
 2019-06-29 19:56:04 +10:00
Oliver Walters
b089a61f74 Improve rendering a bit 2019-06-29 19:48:15 +10:00
Oliver Walters
ad27d912e1 Add some optional upload fields 
(These will come in handy later)
 2019-06-28 20:48:23 +10:00
Oliver Walters
cfbfc6e258 Delete columns in-place using javascript 2019-06-28 20:41:45 +10:00
Oliver Walters
3c2f3c2c2c Add option to delete columns 2019-06-28 20:24:18 +10:00
Oliver Walters
54762713f3 Pass row data back through again 2019-06-28 20:21:21 +10:00
Oliver Walters
fd8ed44833 Detect duplicate columns, and missing columns 2019-06-28 20:16:17 +10:00
Oliver Walters
857a214e7d Pass the form field data back to the server 2019-06-28 19:58:56 +10:00
Oliver Walters
58336482fe POST the data back again 2019-06-28 19:48:22 +10:00
Oliver Walters
fb96651c15 Render column selection options 
- Guess which header is which
 2019-06-28 19:40:27 +10:00
Oliver Walters
60050e9f32 Don't restrict BomItem form to active parts for editing 2019-06-28 10:20:37 +10:00
Oliver Walters
b6a6e2dae7 Change the manner in which active parts are filtered for BOM 
- Prevented BOM from displaying for an inactive part
- Now manually filter the queryset in the form view
 2019-06-28 10:00:23 +10:00
Oliver Walters
ed2461adf1 Show which variants are inactive in the variant table 2019-06-28 09:43:50 +10:00
Oliver Walters
047d2f2f4c Include part revision in stock API / table 2019-06-28 09:35:29 +10:00
Oliver Walters
67b53d9983 PEP 2019-06-28 00:15:23 +10:00
Oliver Walters
872329c340 Fix BOM validation button 2019-06-28 00:10:24 +10:00
Oliver Walters
808d332bda Show BomItem reference field in BOM table 2019-06-27 23:57:21 +10:00
Oliver Walters
4648db6ce5 Pass file data through to the next form page 2019-06-27 23:49:01 +10:00
Oliver Walters
a9396f4c74 Fix uggo buttons 2019-06-27 23:13:12 +10:00
Oliver Walters
6af51c5b35 Limit the number of lines returned in row_count 2019-06-27 23:11:54 +10:00
Oliver Walters
c4944268f3 Count the number of rows in the BOM file 2019-06-27 23:09:06 +10:00
Oliver Walters
9813205419 Perform 'matching' on imported field names 2019-06-27 22:57:55 +10:00
Oliver Walters
45d16f2c42 Create new file bom.py for BOM helper functions 
- New class for managing BOM upload
 2019-06-27 22:46:11 +10:00
Oliver Walters
65c7454124 Require certain headers to be present in the file 2019-06-27 22:16:24 +10:00
Oliver Walters
2831ac55c4 Link to download a BOM template file 2019-06-27 22:15:58 +10:00
Oliver Walters
3085db44af Add 'reference' field to BOM item model 2019-06-27 21:44:40 +10:00
Oliver Walters
72486448b8 Fix form title 2019-06-27 21:17:33 +10:00
Oliver Walters
686a61fba9 Hide checkboxes when BOM is not being edited 2019-06-27 21:09:33 +10:00
Oliver Walters
86695cf2bb Validate uploaded BOM file with tablib 
- Check to see if a bom_file file object was uploaded
- Pass off to the BOM file validity checker
- Only a valid tabulated dataset will be accepted
 2019-06-27 21:09:33 +10:00
Oliver Walters
8b207d0d1d Initial work towards uploading a BOM file 
- Create a form with a single FileField
 2019-06-27 21:09:33 +10:00
Oliver Walters
2dc43f0cf1 no message 2019-06-27 21:08:49 +10:00
Oliver Walters
cbfb6bd24c no message 2019-06-25 19:16:24 +10:00
Oliver Walters
d6fcf85cd2 Set part category for multiple parts at once 2019-06-25 19:15:39 +10:00
Oliver Walters
566b6a43da Add a simple endpoint with server information 2019-06-25 00:18:00 +10:00
Oliver Walters
d70140e256 Remove a debug message 2019-06-24 00:20:22 +10:00
Oliver Walters
071695bfe1 Moar tabs plz 2019-06-24 00:12:31 +10:00
Oliver Walters
faf2fd408f PEP fix 2019-06-24 00:01:34 +10:00
Oliver Walters
881adb9487 Add API endpoint for user to request auth token 2019-06-23 23:47:06 +10:00
Oliver Walters
e91eac0c66 Include PK in user serializer 2019-06-23 22:44:57 +10:00
Oliver Walters
a5306ec81b Add 'revision' field to part 
- e.g. different versions of a product
- Can keep old versions in database and mark as inactive
 2019-06-20 21:46:16 +10:00
Oliver Walters
8328e7e13c Improve uniqueness checking for Part 2019-06-20 21:37:25 +10:00
Oliver Walters
b71d5b474a Fix BOM edit bug 2019-06-20 21:31:23 +10:00
Oliver Walters
d5119e1aff Replace some cog icons 2019-06-20 21:28:00 +10:00
Oliver Walters
5ab3c386bb Buttons for purchase order table 2019-06-19 19:09:31 +10:00
Oliver Walters
d07d815cb2 Buttons for BOM editing table 2019-06-19 19:07:18 +10:00
Oliver Walters
6e1b7bf3f0 Fix buttons in attachment table 2019-06-19 19:05:18 +10:00
Oliver Walters
d837a1f9a2 Buttonize the part category page 2019-06-19 18:54:32 +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
05a5ab222d Some more changes 2019-06-19 08:09:05 +10:00
Oliver Walters
776ca7db12 Visual style for build 2019-06-19 08:03:39 +10:00
Oliver Walters
afcbd73026 Consolidate visual style for "Part" tabs 2019-06-19 07:58:14 +10:00
Oliver Walters
3e6cdb15be Clean up display of company pages 
- Add some more buttons
- visual style consolidation
 2019-06-19 07:48:05 +10:00
Oliver Walters
7effe3af9d Add buttons to company page 2019-06-19 00:01:30 +10:00
Oliver Walters
c0e66dd9a0 Added pretty buttons to stock item page 2019-06-18 23:56:00 +10:00
Oliver Walters
fe4bc15c8e Improved button layout for purchase order page 2019-06-18 23:18:48 +10:00
Oliver Walters
3dddb10f5d Pretty toggle buttons in modal forms 2019-06-18 23:12:13 +10:00
Oliver Walters
0285d3ee83 Improved button mechanics 2019-06-18 22:54:32 +10:00
Oliver Walters
8842d50c72 Replace a whole bunch o' drop-down options with pretty buttons 2019-06-18 22:49:43 +10:00
Oliver Walters
ee5722857f Re-add 'new stock item' button 2019-06-18 22:13:54 +10:00
Oliver Walters
3349d0c0df Remove part 'type' fields from form 
These are now presented as virtual buttons
 2019-06-18 21:43:51 +10:00
Oliver Walters
1d67b4cdaa Sliders now update the part options via AJAX 2019-06-18 19:24:10 +10:00
Oliver Walters
65a8a30f87 Many improves of the slidies 2019-06-18 19:05:09 +10:00
Oliver Walters
783b8964d1 Add 'slide' for part type 2019-06-18 18:49:52 +10:00
Oliver Walters
b1c1015778 Add bootstrap-toggle 2019-06-18 18:38:03 +10:00
Oliver Walters
c9c851bead Add 'virtual' part flag 2019-06-18 18:34:07 +10:00
Oliver Walters
a47be24410 Fixed test cases 2019-06-18 01:38:43 +10:00
Oliver Walters
ea0da4c8f8 PEP 2019-06-18 01:32:29 +10:00
Oliver Walters
79cd05423c Custom aggregation of Part API 
- Reduced full part query from 2.5s to 200ms!
 2019-06-18 01:31:30 +10:00
Oliver Walters
37dba91b4a Add 'include self' option to getUniqueChildren 2019-06-18 01:02:56 +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
a796b984ff Merge branch 'tree-speed' of https://github.com/SchrodingersGat/InvenTree into tree-speed 
# Conflicts:
#	InvenTree/InvenTree/views.py
 2019-06-17 23:55:21 +10:00
Oliver Walters
037dc6a0d6 Reduced tree time with some better queries 2019-06-17 23:52:49 +10:00
Oliver Walters
b519a1981d Split tree generation off into a separate function 2019-06-17 23:44:36 +10:00
Oliver Walters
1cbbe9e7c6 Split tree generation off into a separate function 2019-06-17 23:39:43 +10:00
Oliver Walters
008a55d3d7 Squashed a bug 2019-06-17 23:02:44 +10:00
Oliver Walters
a147a704bf Pepper 2019-06-17 22:45:48 +10:00
Oliver Walters
760d08608f Minor test addition for builds 2019-06-17 22:41:44 +10:00
Oliver Walters
38ef9b2b13 Tests for helper functions 2019-06-17 22:36:17 +10:00
Oliver Walters
08358f6961 Run tests on custom validators 2019-06-17 22:18:00 +10:00
Oliver Walters
b9dc4a0c2f Further tests for order 2019-06-17 22:10:37 +10:00
Oliver Walters
9c29976511 More tests for order module 
- Also fixed some bugs along the way!
 2019-06-17 21:55:51 +10:00
Oliver Walters
0857ec61fd Add a test fixture for orders 2019-06-17 19:47:16 +10:00
Oliver Walters
78bfc0b6a8 Improve the 'creation date' for order 
- Automatically set on first save
 2019-06-17 19:44:36 +10:00
Oliver Walters
93667f942f Add button to remove line items from the 'receive' form 2019-06-15 19:47:16 +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
c7ca9a3d8f Display table of outstanding line items 2019-06-15 17:29:33 +10:00
Oliver Walters
bbd6b15089 Add a VIew for receiving purchase order 2019-06-15 17:09:25 +10:00
Oliver Walters
11d9312c45 Improve rendering of purchase order table 2019-06-15 15:33:10 +10:00
Oliver Walters
0fa8e3809e Limit PO selection to only those which are PENDING 2019-06-15 15:33:03 +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
5aac603d63 Satisfying the frog 2019-06-13 22:43:31 +10:00
Oliver Walters
a424a805e4 Bump version string 2019-06-13 22:39:57 +10:00
Oliver Walters
1b06d86f59 Export purchase order to CSV 2019-06-13 22:38:10 +10:00
Oliver Walters
73b9881dc5 Improve table rendering for build allocation view 2019-06-13 22:18:27 +10:00
Oliver Walters
38001b5358 Peppy fixes 2019-06-13 22:16:27 +10:00
Oliver Walters
c9cddd2a19 Add ability to edit and delete a purchase order line item 2019-06-13 22:13:22 +10:00
Oliver Walters
fe5bb23d13 Add notes field to purchase order line item 2019-06-13 21:57:35 +10:00
Oliver Walters
d860336060 Add some pretty buttons to the purchase order detail table 2019-06-13 21:44:09 +10:00
Oliver Walters
a37a2120fa Add some context data to build views 2019-06-13 21:32:37 +10:00
Oliver Walters
2b74a0ed2c Don't show zero-quantity items when ordering against a build 2019-06-13 21:28:01 +10:00
Oliver Walters
771a008e84 Printable string for PurchaseOrderLineItem 2019-06-13 21:21:22 +10:00
Oliver Walters
52b7051060 Automatically add line items to an order 2019-06-13 21:17:06 +10:00
Oliver Walters
f52aa0af21 Create a new purchase order directly from the "Order Parts" form wizard 2019-06-13 20:42:09 +10:00
Oliver Walters
915395e676 Create a new supplier part directly from the order form 2019-06-13 20:35:15 +10:00
Oliver Walters
4be82a31ce Remove rows from order form 2019-06-13 20:26:53 +10:00
Oliver Walters
3bb76060d9 Extract supplier purchase order selection information 2019-06-13 20:17:36 +10:00
Oliver Walters
3f809a9001 List active purchase orders for each selected supplier 2019-06-13 19:35:38 +10:00
Oliver Walters
7049ab1d8c Collate parts by supplier and present a purchase-order form 2019-06-13 19:30:18 +10:00
Oliver Walters
2fffd874a3 Use integer ordering for part quantity 2019-06-13 19:12:34 +10:00
Oliver Walters
15432fd6b7 Handle list of parts sent back to the order-parts form 
- Eliminate parts which are zero quantity
- Display an error message when no supplier is selected
 2019-06-13 19:10:31 +10:00
Oliver Walters
c9b946655c Add some more data to Part serializer 2019-06-13 18:33:15 +10:00
Oliver Walters
a41a6c52ca Peppy fixes 2019-06-12 00:39:33 +10:00
Oliver Walters
f0796327b3 Improve display of part base page 2019-06-12 00:29:47 +10:00
Oliver Walters
b138a4bd5f Order parts directly from a build 2019-06-12 00:21:18 +10:00
Oliver Walters
74327d3094 Order from supplier 'parts list' page 2019-06-12 00:10:39 +10:00
Oliver Walters
e4f5cc8ccd Order from a part page 2019-06-12 00:04:20 +10:00
Oliver Walters
3460a48b63 Extra form info 2019-06-11 23:58:00 +10:00
Oliver Walters
1cb6c67086 Launch order dialog from the 'Parts' table 2019-06-11 23:55:20 +10:00
Oliver Walters
0ca01fb0e7 Template improvements 2019-06-11 23:47:09 +10:00
Oliver Walters
0bc8190e8c Style supplier-part selection as 'select2' 2019-06-11 23:41:15 +10:00
Oliver Walters
bc05146e72 First pass at 'order parts' fom 
- Select parts in modal form window
 2019-06-11 23:37:32 +10:00
Oliver Walters
8e82488f70 Display 'net stock' value on front page 2019-06-11 21:58:20 +10:00
Oliver Walters
50bab299c5 Add hover image to 'parts to order' table 2019-06-11 21:52:43 +10:00
Oliver Walters
d8d41c6eff PEP fixes 2019-06-10 23:08:08 +10:00
Oliver Walters
3954b33fb7 Use 'on_order' count in calculation for parts we need to order 2019-06-10 23:05:14 +10:00
Oliver Walters
04a9b1a980 Create a new purchase order from a company page 2019-06-10 22:56:34 +10:00
Oliver Walters
c132f275f5 Split display of purchase orders by company view 2019-06-10 22:43:09 +10:00
Oliver Walters
b8bcc5ce0c Separate display of open and closed purchase orders (per part) 2019-06-10 22:31:19 +10:00
Oliver Walters
228bf4e1da Business logic 2019-06-10 22:17:19 +10:00
Oliver Walters
ec669dd670 Ability to 'issue' a purchase order 2019-06-10 22:14:23 +10:00
Oliver Walters
9efdd836f4 Tweak the 'on_order' calculation 2019-06-10 21:56:50 +10:00
Oliver Walters
351c5fb7d0 Fix for 'on_order' calculation 
- Handle null results
 2019-06-07 09:54:36 +10:00
Oliver Walters
31ad31365a Calculate parts on order for a Part / SupplierPart 2019-06-07 08:37:25 +10:00
Oliver Walters
4af1f6ca9f Update a TODO comment 2019-06-06 21:56:20 +10:00
Oliver Walters
4048091c2b Prevent user from inputting a 'blank' supplier part into a line item 2019-06-06 21:55:02 +10:00
Oliver Walters
7b139a7f05 Form / view for creating a new purchase order 2019-06-06 21:39:04 +10:00
Oliver Walters
c1f3bddf45 Secondary modal for creating a new stock location when moving stock 2019-06-06 19:28:52 +10:00
Oliver Walters
ad5c6630bd Bug fix in Build.completeBuild 2019-06-06 10:43:34 +10:00
Oliver Walters
96eb4086cf Add form / view to edit purchase order details 
- Cannot edit the COMPANY if there are line items already
 2019-06-05 22:24:18 +10:00
Oliver Walters
bcc08f982b Set default ajax form template 2019-06-05 22:08:22 +10:00
Oliver Walters
eced012ece PEP fixes 2019-06-05 21:56:52 +10:00
Oliver Walters
04abe2b3d1 Display list of purchase orders against a particular supplier par 2019-06-05 21:50:11 +10:00
Oliver Walters
67248ec4dd List purchase orders for a given part 2019-06-05 21:47:22 +10:00
Oliver Walters
9b2b2841d9 Hide 'order' input 2019-06-05 21:19:41 +10:00
Oliver Walters
8aa5452dd4 Add secondary modal to create a new supplier part 2019-06-05 21:17:29 +10:00
Oliver Walters
aee1ea9e35 Limit queryset 
- Only parts from the supplier
- Exclude parts already in the order
 2019-06-05 21:13:08 +10:00
Oliver Walters
f4abfc158f Improve rendering of purchase order list 2019-06-05 21:02:51 +10:00
Oliver Walters
be6b1ae2f8 Updates for purchase order line items 
- Display list of line items
- Add a form to create a new line item
 2019-06-05 20:59:30 +10:00
Oliver Walters
e199ed2281 PEP fixes 2019-06-05 00:21:19 +10:00
Oliver Walters
c82d5482aa Add a detail view for purchase orders 2019-06-05 00:17:25 +10:00
Oliver Walters
7bca9cc7af Improve display of list of purchase orders 2019-06-05 00:02:34 +10:00
Oliver Walters
a9ba419503 Fix testing code 2019-06-05 00:00:05 +10:00
Oliver Walters
c49b8546f0 Index page for showing all purchase orders 2019-06-04 23:59:15 +10:00
Oliver Walters
4f1acddb5d Fix some build status code thingies 2019-06-04 23:42:48 +10:00
Oliver Walters
f731c45ce8 Replace other choice fields with commonized status code 2019-06-04 23:38:52 +10:00
Oliver Walters
8d70d2f28a Fix rendering of purchase order status codes 2019-06-04 23:14:57 +10:00
Oliver Walters
76a72be926 Add order status field 
- Display status field in PurchaseOrder list view
 2019-06-04 23:09:51 +10:00
Oliver Walters
da53de844a Add page for detailing company purchase orders 2019-06-04 22:39:46 +10:00
Oliver Walters
c45d8a5782 Add 'purchase orders' tab for company 2019-06-04 22:35:34 +10:00
Oliver Walters
cc2e3351ff Search for company 2019-06-04 22:34:58 +10:00
Oliver Walters
0e29f9b88c Fix related name 2019-06-04 22:26:40 +10:00
Oliver Walters
54b1ccd585 Allow blank PO description and add URL field 2019-06-04 22:26:19 +10:00
Oliver Walters
68d514d478 Limit choices for supplier in PurchaseOrder 2019-06-04 22:20:49 +10:00
Oliver Walters
d840b44f7a Create initial models for 'Order' 
- PurchaseOrder
- PurchaseOrderLineItem

(These are based on some abstract model classes)
 2019-06-04 22:19:04 +10:00
Oliver Walters
60f5160d24 Show total stock rather than taking allocation into account 2019-06-03 22:04:48 +10:00
Oliver Walters
782ad57f52 Re-enable image hovering where appropriate 2019-06-03 22:03:22 +10:00
Oliver Walters
8e0e2979b5 Rename parts tab in build view 2019-06-03 22:01:23 +10:00
Oliver Walters
68e4adda48 Simplified build allocation view 2019-06-03 21:59:15 +10:00
Oliver Walters
7a3b186a0c Fix double loading of modals.html 2019-06-03 21:51:59 +10:00
Oliver Walters
7a244f48ae Solve weird collapse bug 
- HTML is so gross
- Disable image hover seems to work...
 2019-06-03 21:35:40 +10:00
Oliver Walters
bb5ed0b9fe Fix bug for BuildItem with no part image 
- Can't request a field what don't exist
 2019-06-03 21:25:37 +10:00
Oliver Walters
219c438b82 Part name uniqueness is case insensitive 2019-06-02 20:37:59 +10:00
Oliver Walters
64d541f453 Hide result types which return no results 2019-06-02 20:28:17 +10:00
Oliver Walters
0b88953706 Form field rearrangement 2019-06-02 20:07:30 +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
3427f81a34 Improve part information display 
- Better terminology
 2019-06-02 14:47:40 +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
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
5177b7f836 Remove some defunct javascript 2019-06-02 12:24:40 +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
8214aef0db Add template for hover_image 2019-06-01 21:13:51 +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
56821abd09 CSS tweaks for modals 2019-05-29 23:13:26 +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
da4f68e5a5
Merge pull request #375 from SchrodingersGat/group-stock-items 
Group stock items
 2019-05-29 01:05:57 +10:00
Oliver Walters
6a30485a4e Initial work toward fixing stock issues 2019-05-29 01:03:21 +10:00
Oliver Walters
d512232aac Readable css 2019-05-29 00:54:00 +10:00
Oliver Walters
ea03205c50 Don't need to detach and re-attach rows any more!! 2019-05-29 00:47:36 +10:00
Oliver Walters
2ccb014d9e FINALLY sorting is working well 
- Wrote a custom sorter which takes group rows into account
 2019-05-29 00:45:35 +10:00
Oliver Walters
ecde201bb0 Update to newest bootstrap-table script 2019-05-29 00:20:01 +10:00
Oliver Walters
729968e65d Better message for no stock found 2019-05-28 22:05:30 +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
f7d521ca97 Reorder stock table columns 2019-05-28 19:13:46 +10:00
Oliver Walters
7ac52d4d9f Optionally select which column gets grouped 
- Allow grouping by numerical values
 2019-05-28 19:12:10 +10:00
Oliver Walters
e4acca2951 Display stock item serial number (if it exists)! 2019-05-28 18:29:12 +10:00
Oliver Walters
807798810b Color sub-group rows slightly differently 2019-05-28 18:17:16 +10:00
Oliver Walters
8255332950 Remove some debug messages 2019-05-28 18:12:47 +10:00
Oliver Walters
4011d66b6f Display sub-location information 2019-05-28 18:08:50 +10:00
Oliver Walters
7120b940f0 Pre-collapse grouped columns 2019-05-28 17:51:02 +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
a305301b95 Switch between display and edit mode for build allocations 2019-05-27 08:07:38 +10:00
Oliver Walters
4d518f4512 PEP 2019-05-26 16:05:54 +10:00
Oliver Walters
8715e29c31 Add ability to make variant from template 2019-05-26 16:00:27 +10:00
Oliver Walters
91a5a7f051 Simplify part model 
- Remove 'varian't or ''revision' field
- Part name must be unique across database
 2019-05-26 12:16:57 +10:00
Oliver Walters
1312148721 Filter parts by template or variant status (in API) 2019-05-26 11:15:41 +10:00
Oliver Walters
41eb195940 Thanks, PEP 2019-05-26 00:42:40 +10:00
Oliver Walters
e5bb6284db Add variant-of to part detail view 2019-05-26 00:41:24 +10:00
Oliver Walters
2138977b07 Include template attachments in attachment count 2019-05-26 00:39:36 +10:00
Oliver Walters
d563e873ed Change some icons 2019-05-26 00:35:52 +10:00
Oliver Walters
f3b17b2164 Add some form fields (might have to remove later) 2019-05-26 00:32:18 +10:00
Oliver Walters
21dd893c01 Display templated parts as italic in the part list 2019-05-26 00:29:17 +10:00
Oliver Walters
6603d6e9ed PEP fixes 2019-05-26 00:22:05 +10:00
Oliver Walters
75b21bdd8f Visual tweaks 2019-05-26 00:20:03 +10:00
Oliver Walters
7881a67db4 Calculate stock based on variant stock if part is a template 2019-05-26 00:01:01 +10:00
Oliver Walters
c45a506a10 Rename field part.has_variants to part.is_template 2019-05-25 23:58:31 +10:00
Oliver Walters
c3d75deb16 More 'limit_choices_to' limitations for template parts 2019-05-25 23:55:16 +10:00
Oliver Walters
9c1c008f33 Show attachments for the Template part under attachments tab 2019-05-25 23:50:24 +10:00
Oliver Walters
08ac7e2a36 Rendering tweaks 2019-05-25 23:45:26 +10:00
Oliver Walters
3d57483f0e Add a 'new varian't button 2019-05-25 23:43:06 +10:00
Oliver Walters
bbe66472ee Display list of part variants 2019-05-25 23:40:59 +10:00