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
1,381 Commits 6 Branches 99 Tags 484 MiB
7bca9cc7af
Commit Graph

1381 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
b8f5c8cca7 Add confirmation box to stocktake form 2019-05-16 22:12:13 +10:00
Oliver
283bd0e3ad
Merge pull request #343 from SchrodingersGat/filter-by-supplier 
Filter by supplier
 2019-05-16 21:33:14 +10:00
Oliver Walters
7ef448d205 PEP 2019-05-16 21:26:53 +10:00
Oliver Walters
64a82389a2 Add ability for Company model to count stock sourced from that supplier 2019-05-16 21:26:12 +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
3959dd40b0
Merge pull request #342 from SchrodingersGat/tweaks 
Tweaks
 2019-05-16 20:54:37 +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
387711a9a1 Fix help string 2019-05-16 18:08:37 +10:00
Oliver Walters
fae44c3002 Bug fix for part deep-copy 
- Don't copy an image if an image doesn't exist
 2019-05-15 09:21:31 +10:00
Oliver
b57c2d2050
Merge pull request #336 from SchrodingersGat/bom-overage 
Add 'overage' field to BOM item
 2019-05-15 08:11:07 +10:00
Oliver Walters
292e29e95e Add some more secondary modals 2019-05-15 07:50:54 +10:00
Oliver Walters
a1d587b7f4 Rename 'Company' to 'Suppliers' in front-end 2019-05-15 07:44:13 +10:00
Oliver Walters
c6331255de Fixes 2019-05-15 07:23:55 +10:00
Oliver Walters
8c92c2c2a1 Display overage values in BOM table 2019-05-15 07:23:02 +10:00
Oliver Walters
68ae38a7d7 Calculate total quantity required for a build (including overages) 2019-05-15 00:36:02 +10:00
Oliver Walters
a80c11f3ce Add function to infer default_supplier for a Part 2019-05-15 00:22:10 +10:00
Oliver Walters
f6baf5d2ae Add 'overage' field to BOM item 
- Accepts absolute or percentage numbers
- Default = blank
- Now with custom validator! (for limited time only, limit one per customer)
 2019-05-15 00:16:34 +10:00
Oliver
35d32fd2ff
Merge pull request #333 from SchrodingersGat/secondary-modals 
Provide an after_render callback
 2019-05-14 23:52:54 +10:00
Oliver Walters
f979edef8e Prevent double loading of stock.js 2019-05-14 23:47:15 +10:00
Oliver Walters
2e5b3bfdf9 Prevent multiple loads of part.js 2019-05-14 23:44:33 +10:00
Oliver Walters
58cc1cda77 Only load api.js once 2019-05-14 23:43:16 +10:00
Oliver Walters
0ffe2666b3 Added some missing help text 2019-05-14 23:36:22 +10:00
Oliver Walters
505b7941b1 Add link to delete a part 
- Part must first be deactivated
 2019-05-14 23:33:25 +10:00
Oliver Walters
76e6094977 Add secondary modal to BOM 2019-05-14 23:30:32 +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
97c4e5acbf Add some secondary buttons to the part-create form 2019-05-14 23:19:56 +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
a316681ec8 Pass object data back to modal when creating new object 2019-05-14 23:04:00 +10:00
Oliver Walters
21c238e96a Secondary modal is slightly smaller than primary 
- So that the primary modal is still visible underneath
 2019-05-14 22:44:57 +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
a96cd2240c Function to insert a 'create new' button into a form 
- Look for a label like <label for="id_<field>">
 2019-05-14 22:12:22 +10:00
Oliver Walters
0cc2e71843 Provide an after_render callback 
- User callback after the form data are rendered
 2019-05-14 19:00:59 +10:00
Oliver
57645486cc
Merge pull request #332 from SchrodingersGat/improvements 
Improvements
 2019-05-14 18:36:55 +10:00
Oliver Walters
2164cac28a PEP 2019-05-14 18:32:20 +10:00
Oliver Walters
46ab6e40eb Bug fix for build allocation 
- If the part did not have an image file the template failed to render
 2019-05-14 18:31:19 +10:00
Oliver Walters
9986df2074 Add confirmation to cancel a build 2019-05-14 18:20:54 +10:00
Oliver Walters
e87f545d75 Render zero stock as 'No Stock' in BOM table 2019-05-14 18:12:17 +10:00
Oliver Walters
d1de6eb1f9 Copy across default tags when creating a new part 2019-05-14 17:32:29 +10:00
Oliver Walters
0842bd5833 Add 'default_keywords' field to a category 2019-05-14 17:30:24 +10:00
Oliver Walters
02033c2157 Add 'keywords' field to Part 
- Shows up in search results
 2019-05-14 17:23:20 +10:00
Oliver Walters
7447561f77 Fix link for part stock in BOM table 2019-05-14 17:12:06 +10:00
Oliver Walters
74c8b6768d BOM table fixes 
- Reorder columns
- Allow proper part name filtering
 2019-05-14 15:43:16 +10:00
Oliver Walters
df227a375c Allow some more chars in part names 2019-05-14 15:42:53 +10:00
Oliver
d98976679f
Merge pull request #323 from SchrodingersGat/user-setings 
User setings
 2019-05-14 14:15:34 +10:00
Oliver Walters
ba1e24cce8 PEP 2019-05-14 13:59:10 +10:00