inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-18 20:46:08 +00:00
Code Activity
2,941 Commits 9 Branches 164 Tags
218971e6f17a0ea776983b2badd5d89cb10f5d3b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
OliverandGitHub 218971e6f1 Merge pull request #864 from SchrodingersGat/translation-fixes 
Update translation hooks
 2020-06-09 16:28:34 +10:00
Oliver Walters 38dcdcad54 Update translation hooks 2020-06-09 16:18:38 +10:00
OliverandGitHub aeba189c1a Merge pull request #863 from SchrodingersGat/decimalfix 
Decimalize display of variant stock
 2020-06-09 13:44:47 +10:00
Oliver Walters 09400fd66b Decimalize display of variant stock 
(cherry picked from commit 6e45360c4b7a6bc91f584f498fb6e1988593db95)
 2020-06-09 13:31:16 +10:00
OliverandGitHub f3e3838782 Merge pull request #862 from SchrodingersGat/stock-buttons-fix 
Fix display of buttons for stock item
 2020-06-09 13:19:15 +10:00
Oliver Walters c7586b83e9 Fix display of buttons for stock item 
(cherry picked from commit b23017b6bf)
 2020-06-09 13:15:12 +10:00
OliverandGitHub b2c302cb2c Merge pull request #858 from SchrodingersGat/stock-table-ipn 
Add "IPN" column to stock list table
 2020-06-06 08:58:59 +10:00
Oliver Walters 126e42a022 Add "IPN" column to stock list table 2020-06-06 08:47:06 +10:00
OliverandGitHub 22b30a0626 Merge pull request #857 from SchrodingersGat/security-fix 
Update django version
 2020-06-06 08:38:15 +10:00
Oliver Walters 84362ea790 Update django version 2020-06-06 08:27:13 +10:00
OliverandGitHub f563ac0dcb Merge pull request #855 from SchrodingersGat/part-table 
Add "IPN" column to part table
 2020-06-05 19:38:16 +10:00
Oliver Walters 16d261d956 Make description fields optional 2020-06-05 19:33:32 +10:00
Oliver Walters 15817ce61a Add "IPN" column to part table 2020-06-05 19:26:41 +10:00
OliverandGitHub dedd87f20a Merge pull request #854 from SchrodingersGat/customer-stock-display 
Customer stock display
 2020-06-05 12:20:25 +10:00
Oliver Walters fcd588cb01 Filter SalesOrder by status 2020-06-05 12:08:47 +10:00
Oliver Walters 6ebce2b2fd Add ability to filter purchase orders by "outstanding" status 2020-06-05 12:06:28 +10:00
Oliver Walters 544e217347 Add page to show stock which is assigned to a customer 2020-06-05 11:52:07 +10:00
Oliver Walters 9f599546de Use stock status for determining "in stock" 2020-06-05 09:08:46 +10:00
Oliver Walters 408c6a4040 Filter stock list by "customer" 2020-06-05 09:05:57 +10:00
OliverandGitHub 96b79397c2 Merge pull request #852 from SchrodingersGat/send-to-customer 
Send to customer
 2020-06-04 19:55:57 +10:00
Oliver Walters ca1526405b PEP fixes 2020-06-04 19:51:43 +10:00
Oliver Walters 80019a3ed8 Add forms/views for manually assigning a stock item to a customer 2020-06-04 19:45:41 +10:00
Oliver Walters d907136264 Display customer in stock item 2020-06-04 19:13:37 +10:00
Oliver Walters fbd21827fb Add 'customer' field to StockItem 2020-06-04 19:08:33 +10:00
Oliver Walters 4ddabb82ef Add a button to assign stock item to customer 2020-06-04 11:50:55 +10:00
OliverandGitHub c1da4d5207 Merge pull request #850 from SchrodingersGat/bom-division-fix 
Fix for case where BOM item quantity is zero
 2020-06-04 11:42:39 +10:00
Oliver Walters a3c0d35b20 Fix for case where BOM item quantity is zero 2020-06-04 11:37:55 +10:00
OliverandGitHub 7c7055c0a0 Merge pull request #845 from SchrodingersGat/tweaks 
Tweaks
 2020-05-30 22:03:15 +10:00
Oliver Walters dd9584f487 Follow link when a new stock item is created 2020-05-30 20:58:52 +10:00
Oliver Walters 8459de7be2 Display a message if no stock location is set 2020-05-30 20:58:05 +10:00
OliverandGitHub 55bfdc000b Merge pull request #844 from SchrodingersGat/part-validation-fixes 
template parts are now allowed to be variants
 2020-05-29 12:51:08 +10:00
Oliver Walters 5f3816212f template parts are now allowed to be variants 
- Do not throw an error here!
 2020-05-29 12:40:40 +10:00
OliverandGitHub a6dab76ff6 Merge pull request #843 from SchrodingersGat/api-improvements 
Api improvements
 2020-05-28 21:31:28 +10:00
Oliver Walters 59d9e430b4 Remove unique-together requirement 
- This is handled manually via the validate_unique function
 2020-05-28 20:38:24 +10:00
Oliver Walters 774e26eb19 Mark some fields as not-required via the API 2020-05-28 20:33:33 +10:00
OliverandGitHub f8e36c5468 Merge pull request #840 from SchrodingersGat/bom-queryset 
Allow template parts to be specified for the BOM item
 2020-05-27 10:47:46 +10:00
Oliver Walters 9b7b65374d Use rounding decimal field in BomItem form 2020-05-27 10:33:47 +10:00
Oliver Walters 7bcf9bf5be Allow template parts to be specified for the BOM item 2020-05-27 10:06:18 +10:00
OliverandGitHub 04858f8835 Merge pull request #839 from SchrodingersGat/serializer-fix 
Fix serializer for stock item
 2020-05-26 23:20:15 +10:00
Oliver Walters 78990a99e5 Fix serializer for stock item 2020-05-26 23:01:30 +10:00
OliverandGitHub 002b896384 Merge pull request #838 from SchrodingersGat/attachies 
Attachies
 2020-05-26 20:33:06 +10:00
Oliver Walters e128410d54 Update 'required' status for new serializers 
(cherry picked from commit 2306e29743eb25266c78bec5357d1194e0778c58)
 2020-05-26 20:29:09 +10:00
Oliver Walters 81e38eeb14 Add some more custom FileField serializers 
(cherry picked from commit 7b9ff27baefacc977fef7852e99d8a9bb46a062a)
 2020-05-26 20:29:04 +10:00
Oliver Walters 861e30e8d6 Add a special serializer class for FileField which has a custom to_representation function 
- This was solving a very subtle bug which will probably only ever apply to a single installation instance
- Future me will most likely not remember what this was for or how it works
- In any case, there we go
- Ref: http://www.cdrf.co/3.9/rest_framework.fields/Field.html

(cherry picked from commit 7305094854)
 2020-05-26 20:29:00 +10:00
OliverandGitHub 3678c940eb Merge pull request #836 from SchrodingersGat/serial-number-fixes 
Serial number fixes
 2020-05-26 12:16:02 +10:00
Oliver Walters c0f1966a2c Decimal filter on StockItem adjustment form 2020-05-26 12:08:00 +10:00
Oliver Walters c92bb78ae8 Stock table display fixes 2020-05-26 12:06:38 +10:00
Oliver Walters e63622341f Add description field to table filters 2020-05-26 11:57:35 +10:00
Oliver Walters 669a76c921 Add serial number range filtering options for the stock table 2020-05-26 11:54:23 +10:00
Oliver Walters 4cbf2099fa Add stock item filtering by serial number range 2020-05-26 11:49:48 +10:00
Oliver Walters 046a00026c remove debug print 2020-05-26 11:42:30 +10:00
Oliver Walters 47a4ab2ed8 Template changes 2020-05-26 11:38:17 +10:00
Oliver Walters 27ca84fd2a Part view shows next available serial number 2020-05-26 11:34:11 +10:00
Oliver Walters ae4bfd07da StockItemCreate form now has better logic for auto-detecting the part 2020-05-26 11:31:08 +10:00
OliverandGitHub 8384071ac3 Merge pull request #834 from SchrodingersGat/api-bug-fix 
Allow API upload of file attachments against StockItemTestResult objects
 2020-05-25 22:24:33 +10:00
Oliver Walters 1bf696a052 Allow API upload of file attachments against StockItemTestResult objects 2020-05-25 22:19:28 +10:00
OliverandGitHub 835451c02c Merge pull request #833 from SchrodingersGat/latex-fix 
Catch some errors related to missing system packages
 2020-05-25 15:13:33 +10:00
Oliver Walters 75cdc7eb59 Catch some errors related to missing system packages 2020-05-25 14:57:15 +10:00
OliverandGitHub 9ad54c6579 Merge pull request #832 from SchrodingersGat/convert-variant 
Convert variant
 2020-05-25 14:27:55 +10:00
Oliver Walters d2c1e9e2b0 Type fixes 2020-05-25 14:24:29 +10:00
Oliver Walters 0d052334e2 Allow stock items to be created for template parts 2020-05-25 14:20:35 +10:00
Oliver Walters fdf57891fc Form / view / etc for performing StockItem conversion 2020-05-25 14:16:38 +10:00
Oliver Walters 009adaf528 Code to get and test for variants of a part 2020-05-25 13:13:28 +10:00
OliverandGitHub cfc15582c1 Merge pull request #830 from SchrodingersGat/copy-test-results 
Copy test results
 2020-05-24 21:14:05 +10:00
Oliver Walters 22220493bd Add unit tests 2020-05-24 21:10:00 +10:00
Oliver Walters 95cc3d2a7a Copy test results when a stock item is split or serialized 2020-05-24 21:09:43 +10:00
OliverandGitHub 4292a32ab9 Merge pull request #829 from SchrodingersGat/bom-validation 
Integer value required for trackable bom item
 2020-05-24 20:26:18 +10:00
Oliver Walters 68b9a690f2 Integer value required for trackable bom item 2020-05-24 20:22:15 +10:00
OliverandGitHub 8537dc2a85 Merge pull request #828 from SchrodingersGat/api-stuff 
Api stuff
 2020-05-24 20:12:28 +10:00
Oliver Walters c44205273c Simplify javascript 2020-05-24 20:05:34 +10:00
Oliver Walters e4d10279fa Include 'key' field in StockItemTestResult serializer 2020-05-24 20:04:34 +10:00
Oliver Walters 01481ef5c9 Add function to get the number of required tests for a part 2020-05-23 14:28:25 +10:00
Oliver Walters e63342418f Improve / simplify logic for file attachments against test result object 2020-05-23 11:30:42 +10:00
Oliver Walters 50987f47b0 Add a buttony thing 2020-05-22 23:37:26 +10:00
Oliver Walters 4bd0872b2c Expose some more stock item data over API 2020-05-22 23:33:27 +10:00
OliverandGitHub 203062a67a Merge pull request #824 from SchrodingersGat/reporting-app 
Reporting app
 2020-05-22 23:16:24 +10:00
Oliver Walters 34b40d205e Expose 'part' to the TestReport interface 2020-05-22 23:08:15 +10:00
Oliver Walters 5245442b11 Fixes 2020-05-22 22:27:52 +10:00
Oliver Walters e6f56cb056 where one or more test report templates exist for a part, 
provide a button for all stock-items of that part,
allowing the user to generate and download a test repotr
 2020-05-22 22:25:05 +10:00
Oliver Walters 71681bfda1 Add a button if a stock item test report is available 2020-05-22 21:38:05 +10:00
Oliver Walters 1ad7e699a9 PEP 2020-05-22 21:31:21 +10:00
Oliver Walters 0ec880290b Functionality for retrieving test templates associated with a given part 2020-05-22 21:29:58 +10:00
Oliver Walters 7215a563b1 Add PartFilterMixin 2020-05-22 21:22:43 +10:00
Oliver Walters 616f17d08a Reset the report app migrations 2020-05-22 21:01:08 +10:00
Oliver Walters d6cad372db Add migration 2020-05-22 13:05:30 +10:00
Oliver Walters 865a6db828 Fix subdirectory lookup 2020-05-22 13:05:12 +10:00
Oliver Walters 174c4cc591 Add subclass models for report types 2020-05-22 13:01:21 +10:00
Oliver Walters 251a23d127 Cleanup 2020-05-22 00:09:51 +10:00
Oliver Walters cab87a6860 Update admin 2020-05-22 00:01:36 +10:00
Oliver Walters b93ba6339a Option for rendering HTML template 2020-05-21 23:41:47 +10:00
Oliver Walters c3dcabcaad Render an uploaded template to LaTeX 2020-05-21 23:03:01 +10:00
Oliver Walters 05be4da25c remove test code 2020-05-21 14:06:29 +10:00
Oliver Walters 70c5b27d22 Add ReportAsset model 
- Files which can be embedded into a report
 2020-05-21 14:05:25 +10:00
Oliver Walters b78fe88c26 PEP fixes 2020-05-21 13:53:17 +10:00
Oliver Walters 3d8c059a43 Add "report" app 
- Define ReportTemplate model which contains a report file template
 2020-05-21 13:51:13 +10:00
OliverandGitHub 5018f899f7 Update README.md 2020-05-20 10:45:43 +10:00
OliverandGitHub 51074ef02b Merge pull request #819 from SchrodingersGat/fix 
Remove a test (for now) which is causing issues...
 2020-05-19 17:56:56 +10:00
Oliver Walters b121262af1 pep FIX 2020-05-19 17:37:00 +10:00
Oliver Walters 9cb039f685 Remove a test (for now) which is causing issues... 2020-05-19 17:08:19 +10:00
OliverandGitHub 6b73c9e020 Merge pull request #818 from SchrodingersGat/test-features 
Enable attachments to be uploaded via the API
 2020-05-19 17:03:05 +10:00