inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-22 22:53:27 +00:00
Code Activity
1,970 Commits 10 Branches 164 Tags
db04f399c17bf524b17ba737f42abfae98ff9336
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters db04f399c1 Simplify exporting of BOM for a part 2019-09-15 22:21:12 +10:00
Oliver Walters ed20e9d4a1 Simplify code for exporting PurchaseOrder 
- New resource for managing import/export of POLineItem model
 2019-09-15 22:04:52 +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 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
OliverandGitHub 66e439a836 Merge pull request #526 from linucks/purchase-order-btn-fix 
Fixes problem with 'New Purchase Order' button from Suppliers page.
 2019-09-15 19:20:33 +10:00
OliverandGitHub fa789036e0 Merge pull request #525 from SchrodingersGat/url-validation 
Extra URL validation
 2019-09-14 00:14:45 +10: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
OliverandGitHub 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
OliverandGitHub 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
OliverandGitHub 03a42fa360 Merge pull request #523 from SchrodingersGat/template-badge 
Display template badge in part table
 2019-09-13 21:04:19 +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
OliverandGitHub 5672c37c9f Merge pull request #520 from SchrodingersGat/bom-item-edit 
Improve BomItem editing form
 2019-09-13 16:29:54 +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
OliverandGitHub 8fcc1b8448 Update version.py 
Bumped to v0.0.6
 2019-09-13 15:54:12 +10:00
OliverandGitHub 21b205aeb1 Merge pull request #518 from SchrodingersGat/doc-fix 
cd to the correct directory to run the dev server
 2019-09-13 15:53:41 +10:00
Oliver Walters 205567cfb4 cd to the correct directory to run the dev server 2019-09-13 15:47:34 +10:00
OliverandGitHub 2e3ee23d8d Merge pull request #517 from SchrodingersGat/po-bug-fix 
Bug fix for order-parts form
 2019-09-13 15:37:55 +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
OliverandGitHub c34f6d9268 Merge pull request #516 from SchrodingersGat/tree-name-fix 
Tree name fix
 2019-09-13 11:19:34 +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
OliverandGitHub 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
OliverandGitHub 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
OliverandGitHub fc761d2334 Merge pull request #508 from SchrodingersGat/price-break-buttons 
Fix buttons for edit/delete supplier price break
 2019-09-12 21:57:16 +10:00
Oliver Walters 31625aa4bb Fix buttons for edit/delete supplier price break 2019-09-12 21:53:29 +10:00
OliverandGitHub 62c9e85add Merge pull request #503 from SchrodingersGat/install-bugs 
Fixes for migrate target in makefile
 2019-09-10 14:46:58 +10:00
Oliver Walters f5d26a83f5 Fixed cwd for .travis.yml 2019-09-10 14:40:29 +10:00
Oliver Walters 73749911f8 Fixed typo 2019-09-10 14:37:03 +10:00
Oliver Walters b9109cf684 Travis CI tests superuser creation 2019-09-10 14:32:29 +10:00
Oliver Walters 4daf1ae8d4 Fixes for migrate target in makefile 2019-09-10 14:18:20 +10:00
OliverandGitHub 927160c77f Create CONTRIBUTING.md 2019-09-10 10:33:44 +10:00
OliverandGitHub 17a9722263 Merge pull request #497 from SchrodingersGat/part-export 
Part export
 2019-09-09 20:06:28 +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
OliverandGitHub a2705bbe73 Merge pull request #496 from SchrodingersGat/postgresql 
Update docs for installing with PostgreSQL
 2019-09-09 16:19:25 +10:00
Oliver Walters ee73ea714e Update docs for installing with PostgreSQL 
- make target
- documentation
 2019-09-09 16:11:26 +10:00
OliverandGitHub e4dcbd2fda Update version.py 
Bump version num
 2019-09-09 14:25:00 +10:00
OliverandGitHub b2c9be1bcd Merge pull request #494 from SchrodingersGat/update-fix 
Ensure that required packages are installed when performing update step
 2019-09-09 14:24:32 +10:00
Oliver Walters da5f2338eb Ensure that required packages are installed when performing update step 2019-09-09 14:14:38 +10:00
OliverandGitHub f5e34bef7e Merge pull request #492 from SchrodingersGat/fix 
Fix uniqueness test for stock item
 2019-09-09 08:53:20 +10:00
Oliver Walters 53c5324df6 Fix uniqueness test for stock item 2019-09-09 08:49:27 +10:00
OliverandGitHub f9ae0f83d1 Merge pull request #491 from SchrodingersGat/improvement 
Improvement
 2019-09-09 08:34:39 +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
OliverandGitHub d8a3c7a81d Merge pull request #489 from SchrodingersGat/export-stocktake 
Export stocktake
 2019-09-09 00:05:05 +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 e81a4ffacd Add docs for common modules 2019-09-08 23:36:25 +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
OliverandGitHub 2f47140e0f Merge pull request #488 from SchrodingersGat/mptt 
Mptt
 2019-09-08 20:51:11 +10:00
Oliver Walters 026108803e More links in the about page 2019-09-08 20:48:33 +10:00
Oliver Walters d7f969613e Update makefile and docs 2019-09-08 20:45:01 +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 35ebc69235 Backup database as part of the migration process 2019-09-08 19:43:10 +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