Commit Graph
100 Commits
Author SHA1 Message Date
Oliver Walters d9d21395d9 Add a 'pricing' tab for SupplierPart 2020-02-12 10:48:25 +11:00
Oliver Walters 63b70614b6 Create 'tabs' for SupplierPart view 2020-02-12 10:42:45 +11:00
OliverandGitHub 34c3320cd5 Merge pull request #642 from SchrodingersGat/rounding-fixes
Rounding fixes
2020-02-12 10:31:41 +11:00
Oliver Walters 50fee1bfe5 More work on translations 2020-02-12 10:25:46 +11:00
Oliver Walters 28e9d842bf Small tweaks for BOM export
- Steps towards preventing circular BOMs
- Improve formatting of exported BOM
2020-02-12 10:18:20 +11:00
Oliver Walters d04fb0d826 Use decimal2string instead of normalize 2020-02-12 10:08:35 +11:00
Oliver Walters 520b8d7b2b Fix for BOM pricing weirdness 2020-02-12 10:06:17 +11:00
Oliver Walters c287a0a0b9 More rounding improvements 2020-02-12 08:22:55 +11:00
Oliver Walters 265ed5115a Float parsing on StockItem tracking page 2020-02-12 08:19:08 +11:00
Oliver Walters 53d1040875 Fix allocation count 2020-02-12 08:14:04 +11:00
Oliver Walters 5ae7ca71d7 Improve number rendering of build allocation page 2020-02-12 08:12:26 +11:00
Oliver Walters 564635c368 Add some translatable strings 2020-02-12 08:11:59 +11:00
OliverandGitHub 31d6c77143 Merge pull request #641 from SchrodingersGat/cascading-bom
Provide form for user to select export options
2020-02-11 22:47:11 +11:00
Oliver Walters 882bda46b4 Fix tests 2020-02-11 22:38:50 +11:00
Oliver Walters f865573e48 Implement cascading export of BOM 2020-02-11 22:32:36 +11:00
Oliver Walters 434d084371 Provide form for user to select export options 2020-02-11 21:43:17 +11:00
OliverandGitHub eecc435c02 Merge pull request #639 from SchrodingersGat/use-same-img
Use same thumbnail for multiple parts
2020-02-11 20:30:08 +11:00
Oliver Walters 55aa63dab4 Override save() method for Part model
- Delete old thumbnails if they are no longer being used
2020-02-11 20:27:06 +11:00
Oliver Walters 77c950a729 Fixed unit tests 2020-02-11 00:39:02 +11:00
Oliver Walters dee47bdea8 Prevent django_cleanup from deleting part thumbs that are used elsewhere
- Will need to implement a method for automatically deleting part thumbs...
2020-02-11 00:29:29 +11:00
Oliver Walters 8ea1086b03 Make thumb buttons only visible on mouseover 2020-02-11 00:28:46 +11:00
Oliver Walters e0e996a6c3 Add buttons to select or upload part images 2020-02-11 00:00:03 +11:00
Oliver Walters d4fe83170f Select existing image and upload successfully 2020-02-10 23:48:45 +11:00
Oliver Walters 534b60d4b8 Print out MEDIA_ROOT directory if in debug mode 2020-02-10 23:43:41 +11:00
Oliver Walters 725eb3c538 Do not duplicate images when copying a part
- Simply reference the existing image
2020-02-10 23:04:58 +11:00
Oliver Walters 17c10da10e Display existing images in a form 2020-02-10 22:57:36 +11:00
Oliver Walters a82e219336 Add translatable strings for part views 2020-02-10 22:10:06 +11:00
Oliver Walters 1327c1d3b1 Add API endpoint for querying part images 2020-02-10 22:03:06 +11:00
OliverandGitHub 356624a8fb Merge pull request #638 from SchrodingersGat/build-date-fix
Build date fix
2020-02-10 21:42:12 +11:00
Oliver Walters 66c1a2ef57 test fix 2020-02-10 21:36:57 +11:00
Oliver Walters cb29ff14e0 Change auto_now field to auto_now_add
- Build creation date should no longer get erroneously updated
2020-02-10 21:34:41 +11:00
OliverandGitHub 3e977834c5 Merge pull request #637 from SchrodingersGat/serial-fix
Serial fix
2020-02-07 08:42:29 +11:00
Oliver Walters 4bd4f2a0a3 Fix for bug b)
- Don't attempt to save if there are duplicates
- Fix overwritten variable name
- Provide correct return data to the form
2020-02-06 23:22:55 +11:00
Oliver Walters 2949289fab Fix for bug a)
- Would not create new StockItem for trackable part if Serial Numbers not provided
2020-02-06 23:11:47 +11:00
OliverandGitHub 0939ffeb76 Merge pull request #633 from SchrodingersGat/inventree-settings
Inventree settings
2020-02-03 21:33:34 +11:00
Oliver Walters 41336bd549 Fixes 2020-02-03 21:28:47 +11:00
Oliver Walters d059aff4f8 Use the part_deep_copy setting to set the default deep_copy value when duplicating a part 2020-02-03 21:14:06 +11:00
Oliver Walters 9cef038d6a IPN must match regex validator (if one is provided) 2020-02-03 21:09:24 +11:00
Oliver Walters 356b6cf15b Load default settings on InvenTree launch 2020-02-03 20:51:53 +11:00
OliverandGitHub 4b8e44bc4a Merge pull request #632 from SchrodingersGat/database-stats
Database stats
2020-02-02 22:18:32 +11:00
Oliver Walters ef7fca5633 PEP fixes 2020-02-02 22:15:46 +11:00
Oliver Walters 244d364575 Display some basic stats 2020-02-02 22:13:10 +11:00
Oliver Walters aa210efad6 Simple skelton for database stats view 2020-02-02 22:03:31 +11:00
Oliver Walters 91ca37c84b Add stats link to navbac
- Also add translation layer for the navbar
2020-02-02 21:51:23 +11:00
OliverandGitHub d62d4c9355 Merge pull request #631 from SchrodingersGat/allow-dupe-names
Allow PartCategory and StocKLocation names to be non-unique
2020-02-02 21:46:07 +11:00
Oliver Walters d0a7a24649 Add translatable strings 2020-02-02 21:43:10 +11:00
Oliver Walters 5264f816f1 Allow PartCategory and StocKLocation names to be non-unique
- As long as they are unique in the current tree level
2020-02-02 21:40:03 +11:00
OliverandGitHub 2a7bf94793 Merge pull request #629 from SchrodingersGat/doc-fix
Fix docs
2020-02-02 21:11:25 +11:00
OliverandGitHub 868e005445 Merge pull request #630 from chschlue/updloc
Update German translation
2020-02-02 21:10:33 +11:00
Oliver Walters d827070585 Fix docs 2020-02-02 18:11:29 +11:00
OliverandGitHub d71fd1aad4 Merge pull request #628 from SchrodingersGat/backup-fix
Slight tweak to makefile
2020-02-02 18:09:41 +11:00
Oliver Walters 38be1fc696 Don't force backup step as part of **make update 2020-02-02 18:05:50 +11:00
OliverandGitHub a022b8223e Update version.py 2020-02-02 12:46:42 +11:00
OliverandGitHub 23c0d68330 Merge pull request #626 from SchrodingersGat/markdown-notes
Markdown notes
2020-02-02 12:45:24 +11:00
Oliver Walters 1a32e441b7 Add //TODO entry in stock tabs 2020-02-02 12:42:35 +11:00
Oliver Walters 20273f1541 Add commit date information to about window 2020-02-02 12:39:35 +11:00
Oliver Walters f88f5a39f8 Visual fix for allocation tab 2020-02-02 12:16:31 +11:00
Oliver Walters 1bdcbd1974 Markdownify the 'notes' field for StockItem
- New tab interface for the StockItem page
- Display / editing of notes field with markdown
2020-02-02 12:11:18 +11:00
Oliver Walters 908e2ef8bc Add glyphicon for company notes 2020-02-02 11:54:09 +11:00
Oliver Walters b46151b406 travis fix (hopefully?) 2020-02-02 11:52:22 +11:00
Oliver Walters 0f92468462 Add icon to signify if notes exist 2020-02-02 11:48:43 +11:00
Oliver Walters 7ec194a14a Markdownify the notes field for PurchaseOrder
- Update model field
- Create tab view for PO page
- Add 'notes' tab
2020-02-02 11:44:44 +11:00
Oliver Walters a7846940c4 Markdownify the notes field for Build model 2020-02-02 00:00:19 +11:00
Oliver Walters 51fab36074 Display / editing for Company notes field
- Also includes some translation updates
2020-02-01 23:45:28 +11:00
Oliver Walters ca9f9e047c Make company notes field markdownable 2020-02-01 23:31:45 +11:00
Oliver Walters 1f71a93d88 Fix page formatting 2020-02-01 23:26:54 +11:00
Oliver Walters 88ec40e454 Fix success_url for notes form 2020-02-01 22:25:35 +11:00
Oliver Walters f0933f216c PEP fixes 2020-02-01 17:29:58 +11:00
Oliver Walters 919662054c Alter markdownify settings to properly render images, headings 2020-02-01 14:49:28 +11:00
Oliver Walters b9dda51378 Side-by-side live editing for markdown 2020-02-01 14:40:11 +11:00
Oliver Walters 3c3ae43c18 Add special view for displaying / editing notes field for part 2020-02-01 13:36:09 +11:00
Oliver Walters c546ed5dcd Update requirements
- Use markdownify for rendering
- Use markdownx for editing
2020-01-31 21:42:30 +11:00
Oliver Walters da01177d23 Blank 'notes' page for Part model 2020-01-31 20:38:29 +11:00
Oliver Walters aa2f63830e Translation template for part attachments page 2020-01-31 20:37:54 +11:00
Oliver Walters 596d06cf1a Add a markdown editor for the 'Notes" field of Part model
https://github.com/timmyomahony/django-pagedown
2020-01-31 20:28:54 +11:00
OliverandGitHub b5f8635794 Merge pull request #618 from SchrodingersGat/security-fix
Update django version
2020-01-19 21:38:51 +11:00
Oliver Walters 442c6e8b27 Update django version 2020-01-19 21:33:24 +11:00
OliverandGitHub 8275271ea0 Merge pull request #613 from SchrodingersGat/more-unit-testing
Some more unit tests
2020-01-07 21:22:00 +11:00
Oliver Walters bd653f2c49 Some more unit tests 2020-01-07 21:16:01 +11:00
OliverandGitHub 561cc7a1dd Merge pull request #609 from SchrodingersGat/order-unit-testing
Write unit test for PurchaseOrder receive views
2020-01-06 20:53:55 +11:00
Oliver Walters a064ce13fc PEP fixes 2020-01-06 20:51:12 +11:00
Oliver Walters e103bd8880 Write unit test for PurchaseOrder receive views 2020-01-06 20:50:16 +11:00
OliverandGitHub 3def3e1e89 Merge pull request #605 from SchrodingersGat/order-receive-fix
Bug fix - receiving lines against a PO
2020-01-06 10:09:31 +11:00
Oliver Walters 61897cb0fc Updated translation files 2020-01-06 09:24:29 +11:00
Oliver Walters 067d2be1f0 Bug fix - receiving lines against a PO caused issues due to integer/Decimal conversion 2020-01-06 09:23:13 +11:00
OliverandGitHub 3098f6045f Merge pull request #604 from SchrodingersGat/add-quantity-field
Add quantity field
2020-01-06 09:02:08 +11:00
Oliver Walters 740d7678d7 Update translation files 2020-01-06 08:57:13 +11:00
Oliver Walters b3ec748123 Display current stock item quantity in stock-adjust modal form 2020-01-06 08:52:28 +11:00
OliverandGitHub d2d5909701 Merge pull request #601 from SchrodingersGat/trailing-fix
Trailing fix
2020-01-02 20:32:16 +11:00
Oliver Walters 43d47686c5 Style fixes 2020-01-02 20:27:07 +11:00
Oliver Walters dae74a19d3 Fix logic for decimal string helper 2020-01-02 20:25:59 +11:00
OliverandGitHub 84f8bab418 Merge pull request #593 from olagino/germanTranslation
Added german translation
2019-12-21 19:22:47 +11:00
OliverandGitHub fa480c0558 Update README.md
Add info on Inventree-Docker
2019-12-20 14:23:06 +11:00
OliverandGitHub 89e60d28b0 Merge pull request #592 from SchrodingersGat/order-filters
Various bug fixes
2019-12-09 22:24:09 +11:00
Oliver Walters 6cd3b3176c Regenerate translation files
- Also fix documentation for making a virtual envirtonment
2019-12-09 22:17:21 +11:00
Oliver Walters fafd0397bc remove defunct file 2019-12-09 21:56:26 +11:00
Oliver Walters 71c1faf9ff Use the client-side PO table in more places 2019-12-09 21:55:00 +11:00
Oliver Walters a257f94ac0 Use client-side rendering for list of purchase orders 2019-12-09 21:33:27 +11:00
Oliver Walters 25e5a64cee Improve filtering / ordering / sorting for purchase-order API 2019-12-09 21:19:35 +11:00
Oliver Walters 5e9b012031 Bug fix for static lookup of blank image 2019-12-09 20:40:04 +11:00