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
15,699 Commits 6 Branches 99 Tags 484 MiB
stable
Commit Graph

15699 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Newlands
6434bfc24a Split table of customer orders into separate template from customer orders index page 2018-04-17 23:12:35 +10:00
James Newlands
121315f15e Add link to table of orders to nav bar 2018-04-17 23:10:06 +10:00
James Newlands
f2dc7380c2 Merge in some migrations from master 2018-04-17 23:07:55 +10:00
James Newlands
45a14b4350 Merge branch 'master' into customer_orders 2018-04-17 23:06:41 +10:00
James Newlands
728896be6c Merge branch 'master' of https://github.com/inventree/InvenTree 2018-04-17 23:05:59 +10:00
James Newlands
bc04ca3727 First rough pass at adding customer orders model and some views/templates/admin stuff for same 2018-04-17 23:05:22 +10:00
Oliver
11b9fb10d8 Parts now know how many builds they are allocated to 
- allocated_builds returns lists of active builds this part is allocated to
- allocated_build_count returns the total number of this part allocated to builds
- allocation_count returns total number of allocated parts (in the future this will also include those parts allocated to customer orders)
 2018-04-17 22:26:57 +10:00
Oliver
0b40197cd2 Update 'Build' 
- Part model now has active_builds and inactive_builds properties
-
 2018-04-17 20:25:43 +10:00
Oliver
256f8eb924 Add 'batch' field to BuildOutput object 
This 'batch' output will be copied to any parts produced as part of this build
 2018-04-17 19:10:38 +10:00
Oliver
982803a0a7 Updated Part model 
- Added 'default_location'
- Added 'default_supplier'
 2018-04-17 18:23:39 +10:00
Oliver
45c5edee4d Added 'salable' field to Part model 2018-04-17 18:11:34 +10:00
James Newlands
960f697d02 Merge branch 'master' of https://github.com/inventree/InvenTree 2018-04-17 18:03:44 +10:00
Oliver
9dc41ba122 Fix requirements 
>= rather than ==
 2018-04-17 16:58:37 +10:00
Oliver
fa23767150 Added skeleton for 'build' app 2018-04-17 00:32:02 +10:00
James Newlands
0a2c48eda6 Merge branch 'master' of https://github.com/inventree/InvenTree 2018-04-17 00:03:09 +10:00
Oliver
86b3092b5e Change action on deleting top-level stock location 2018-04-16 23:29:11 +10:00
Oliver
937470750b Added helper functions, improved UI 2018-04-16 23:26:02 +10:00
Oliver
a67d5b58db UI improvements 2018-04-16 23:09:45 +10:00
Oliver
b6b4189c49 UI tweaks 2018-04-16 22:23:29 +10:00
Oliver
118d045e50 Improved part logic 
- Added field 'buildable' - can this part be made from other parts?
- Added @propery 'supplier_count'
- Improved part detail page with new features
 2018-04-16 22:13:31 +10:00
Oliver
e43439ef5b Function to calculate how many parts can be made with current stock 2018-04-16 21:49:38 +10:00
Oliver
202a8e65b9 Added URL field to stock item 2018-04-16 21:07:57 +10:00
Oliver
835144c87f
Merge pull request #53 from inventree/stock-track 
Stock track
 2018-04-16 20:46:52 +10:00
Oliver
9191d1ae21 PEP fixes 2018-04-16 20:46:21 +10:00
Oliver
09b357976d Admin for part tracking 
- Added 'has_tracking_info' function for StockItem
 2018-04-16 20:17:58 +10:00
Oliver
76ee150ca4 Moved tracking information to StockItem 2018-04-16 20:08:04 +10:00
Oliver
f7eff8ae98 Added URL field to UniquePart 
- e.g. link to external part tracking info page
 2018-04-16 01:25:13 +10:00
Oliver
eb5413b4fa Added requirement for pillow module 2018-04-16 01:17:14 +10:00
Oliver
a80cf0aace Added some missing data on supplier pages 2018-04-16 01:14:19 +10:00
Oliver
a91ff58d84 Flakey 
Fixing python style errors
 2018-04-16 01:02:17 +10:00
Oliver
1027e812bc Use django_import_export 
- Allows import / export to multiple file formats
- Provides admin interface
- Work to be done to perform data tweaking
- It would be really cool if the data fields could be associated 'intelligently'
 (i.e. not just based on PK, but name-lookup too).
 2018-04-16 00:44:32 +10:00
Oliver
8e6de1b832 Add pages for part tracking 
- Edit / Delete / Create tracking info
- Improvements to many pages
 2018-04-16 00:30:57 +10:00
Oliver
55b533d3ef Added edit views for stock 
- StockItem
- StockLocation
 2018-04-15 23:27:56 +10:00
Oliver
3c844fc77f Redirect some links 2018-04-15 21:47:20 +10:00
Oliver
5861296974 Add view for BomItem model 
- Create BOM item (auto-add to a parent part)
- Edit / delete
- View details
 2018-04-15 21:29:24 +10:00
James Newlands
24f3e8579c Merge branch 'master' of https://github.com/inventree/InvenTree 2018-04-15 20:24:55 +10:00
James Newlands
eaf1076009 Ignore PyCharm project files 2018-04-15 20:24:18 +10:00
Oliver
0632609a80 Remove weird line in Inventree/urls.py 2018-04-15 20:14:53 +10:00
Oliver
99bb51c76d Migrations 2018-04-15 20:11:27 +10:00
Oliver
9d89db34b2 Improvements to stock page 
- Fixed URL / view (use class views)
- Better slug lookup
- Better table rendering using ol' mate bootstrap
 2018-04-15 20:10:49 +10:00
Oliver
ab4b91cd46 Added pages for /supplier/ 
- Supplier list view
- Supplier detail view /supplier/<pk>/
- Added create / edit / delete views for supplier
- Supplier part detail at /supplier/part/<pk>
- Added create / edit / delete views for supplier part
- Added some templates to make things easier
 2018-04-15 15:35:01 +10:00
Oliver
8232baeed7 Improved list and detail views for supplier 
Huzzah for bootstrap
 2018-04-15 13:49:47 +10:00
Oliver
9e6c7350f9 Skeleton for part tracking 
- Added  list and detail view
- Fixed some links
 2018-04-15 12:35:56 +10:00
Oliver
9f42085731 Add list page for tracking info 
- Needs filtering (currently displays ALL unique parts)
 2018-04-15 12:07:14 +10:00
Oliver
cb5e2f1a8c Danger button fix 2018-04-15 11:41:27 +10:00
Oliver
17b9f4ec8c Added pages for editing categories 
- category-detail
- category-delete
- category-edit
- category-new
 2018-04-15 11:40:03 +10:00
Oliver
5b5b8f4d12 Fix parent error when deleting category 
- Any child categories have their parent set to the parent of the deleted category
 2018-04-15 11:25:57 +10:00
Oliver
2c2db4fffb Added "new part" feature 
- Create a new part
- Button provided on the "category" list page
 2018-04-15 10:08:44 +10:00
Oliver
ff2082b156 Fixes for bootstrap 
- Now using bootstrap3 which seems to work better
- Had to make changes to navbar and part image preview
 2018-04-15 09:38:59 +10:00
Oliver
54e78bf468 Ability to delete part 
- Provides confirmation form
- Shows the flow-on effects (model.CASCADE) from deleting this part
- Bootstrap makes it prettyful
 2018-04-15 09:08:35 +10:00