inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-10-31 13:15:43 +00:00
Code Activity
2,323 Commits 6 Branches 132 Tags
c170d3f87a644cea3fb897cd81e6d0252bda49ee
Commit Graph

2323 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver
ee6c922fad Merge pull request #530 from SchrodingersGat/export-consolidation 
Export consolidation
 2019-09-15 22:27:57 +10:00
Oliver Walters
194ae49914 Export full_name for parts 2019-09-15 22:23:34 +10:00
Oliver Walters
7f5aba423a Export full_name for parts 2019-09-15 22:23:28 +10:00
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
Oliver
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
jmht
ce099f43f3 Fixes problem with 'New Purchase Order' button not working from Suppliers page. 2019-09-14 21:40:09 +01:00
Oliver
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
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
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
Oliver
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
Oliver
8fcc1b8448 Update version.py 
Bumped to v0.0.6
0.0.6 		2019-09-13 15:54:12 +10:00
Oliver
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
Oliver
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