inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-18 04:33:48 +00:00
Code Activity
3,918 Commits 9 Branches 164 Tags
734436b02ef84267911da39eeda4474eb2ff3fa4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters 734436b02e Add integration of django-money 
- Proper currency support
- Add PurchasePrice field to StockItem model
- This keeps track of both the price and the currency
- Display purchase price on the stockitem detail page
 2020-11-10 16:22:42 +11:00
OliverandGitHub 9d9ef5fc9c Merge pull request #1116 from SchrodingersGat/duplicate-ipn 
Add setting to allow or prohibit duplicate IPN values
 2020-11-10 10:52:30 +11:00
OliverandGitHub 9ac334ddd2 Merge pull request #1115 from eeintech/fix_form_errors 
Fix for #1111 (missing logic to check for model errors)
 2020-11-10 10:25:09 +11:00
Oliver Walters a6028f027a Add setting to allow or prohibit duplicate IPN values 2020-11-10 09:03:26 +11:00
OliverandGitHub eead52a5dd Merge pull request #1114 from SchrodingersGat/part_options 
Part options
 2020-11-10 08:28:23 +11:00
Oliver Walters 7286281a06 Fix for unit testing 2020-11-10 07:14:38 +11:00
Oliver Walters c4296ad4f1 Update migrations and translation 2020-11-09 23:47:31 +11:00
Oliver Walters c95f124578 Add some helper magic for setting objects 
- If the setting is defined as a "bool" then the returned value is automatically cast to a bool
- Add some more unit testing
 2020-11-09 23:44:54 +11:00
Oliver Walters 75ab7b247b Push part settings into part/settings.py 
- Use the user-configurable defaults in the database model itself
- This means they are observed even when using the API / etc
 2020-11-09 23:16:04 +11:00
Oliver Walters e1b70ff68f Add default values for create part form 2020-11-09 22:52:32 +11:00
Oliver Walters 8149759852 Add some more part options which set the default values for the following fields: 
- Purchaseable
- Salable
- Trackable
 2020-11-09 20:26:19 +11:00
OliverandGitHub 826c471179 Merge pull request #1107 from eeintech/fix_postgres_migration 
Fix PostGreSQL migration (permissions handler)
 2020-11-06 07:58:56 +11:00
OliverandGitHub dadf4d4c13 Merge pull request #1110 from eeintech/order_save_fix 
Fixed saving of purchase and sales order create forms
 2020-11-06 07:53:41 +11:00
OliverandGitHub d23444a86a Merge pull request #1111 from eeintech/disable_crispy_form_errors 
Disable crispy form errors
 2020-11-06 07:53:11 +11:00
OliverandGitHub 15ea73a448 Merge pull request #1106 from SchrodingersGat/build-tabs 
Rename tabs for build order
 2020-11-05 20:39:25 +11:00
Oliver Walters a35c4a5a95 Rename tabs for build order 2020-11-05 20:07:23 +11:00
OliverandGitHub 7e4b84f016 Merge pull request #1105 from SchrodingersGat/build-fix-fixes 
Set the specified location of a build output
 2020-11-05 18:25:00 +11:00
Oliver Walters 2591d34260 Fixed bug where "New output" button stopped working 
- Build status was changing from "PENDING" to "PRODUCTION"
- Created new check for active builds
 2020-11-05 15:57:46 +11:00
Oliver Walters d44092b209 Fix issue with shadowed form field 
- Rename "quantity" to "output_quantity" to address this
 2020-11-05 15:52:38 +11:00
Oliver Walters 8b7789cdb3 Set the specified location of a build output 2020-11-05 15:46:42 +11:00
OliverandGitHub 6c89a2aaeb Merge pull request #1099 from eeintech/fix_related_parts 
Fix PartRelated (based on updated AjaxCreateView class)
 2020-11-05 09:51:06 +11:00
OliverandGitHub dc626ed68b Merge pull request #1103 from SchrodingersGat/image-upload-fixes 
Bug fix: Part thumbnail API list was not working
 2020-11-04 16:24:04 +11:00
Oliver Walters f560be1a9a Bug fix: Part thumbnail API list was not working 
- Part images could not be selected from grid
 2020-11-04 15:41:17 +11:00
OliverandGitHub ede7d6dbde Merge pull request #1102 from SchrodingersGat/coveralls-fix 
Updated to latest version of coverage and coveralls
 2020-11-04 14:12:57 +11:00
Oliver Walters 5f6f722d6c Change from python-coveralls to coveralls 2020-11-04 13:30:17 +11:00
Oliver Walters f8da15287c Updated to latest version of coverage and coveralls 2020-11-04 09:35:43 +11:00
OliverandGitHub fc99086c8f Merge pull request #1101 from SchrodingersGat/delete-on-deplete-fix 
Logic fix for editing stock item creation form
 2020-11-04 09:33:52 +11:00
Oliver Walters 56b287b2c8 Logic fix for editing stock item creation form 2020-11-04 08:29:09 +11:00
OliverandGitHub 1e844c642f Merge pull request #1063 from SchrodingersGat/build-fixes 
Build system updates
 2020-11-03 22:58:38 +11:00
Oliver Walters 2e1a5a85a3 Bug fix for unit testing 2020-11-03 22:14:02 +11:00
Oliver Walters 3ea671986c Merge conflicting migration files 2020-11-03 21:29:25 +11:00
Oliver Walters 083dac1300 Merge remote-tracking branch 'inventree/master' into build-fixes 2020-11-03 21:26:39 +11:00
OliverandGitHub 1c503adced Merge pull request #1026 from eeintech/user_unique_group_validation 
Added check for multiple groups assigned to user
 2020-11-03 21:21:08 +11:00
OliverandGitHub ef2c04baa8 Merge pull request #1048 from eeintech/related_parts 
Related Parts
 2020-11-03 21:18:27 +11:00
Oliver Walters 897d9b4831 Update translation files 2020-11-03 21:02:31 +11:00
Oliver Walters 5988e847ce Add serial number suggestions 2020-11-03 21:01:14 +11:00
Oliver Walters 8d0845d92b Mark a build as "production" whenever a build output is created 2020-11-03 20:43:49 +11:00
Oliver Walters ac03dab8de Tweaks 2020-11-03 20:37:33 +11:00
Oliver Walters 2b91f69c7d Fix unit tests 2020-11-03 20:19:24 +11:00
Oliver Walters b936f67d87 Various form fixes 
- Updating forms, a lot has changed!
 2020-11-03 16:21:40 +11:00
Oliver Walters 152801f06f Dramatic speed improvements for build completion 
- Might still need to be a background task at some point..
 2020-11-03 15:56:20 +11:00
Oliver Walters 3f03adba72 Bug fix for stock table 
- Grouped rows were not displaying the part name
 2020-11-03 15:05:13 +11:00
Oliver Walters 05613b9642 Further build tweaks / improvements 2020-11-02 23:47:36 +11:00
Oliver Walters f5d0d54ded Improve modal error message 2020-11-02 23:02:02 +11:00
Oliver Walters 500da8099b Add forms / views for creating a new build output, and completing the build 
- Also some refactoring of how forms are handled and saved
 2020-11-02 22:56:26 +11:00
Oliver Walters b02c87ea50 Lots of work towards multiple build output 2020-11-02 01:24:31 +11:00
Oliver Walters f1b83f1c17 Update fixtues for unit testing 2020-11-01 15:34:42 +11:00
Oliver Walters 95fadf1300 Update unit testing 2020-10-30 23:08:12 +11:00
Oliver Walters 3a702266e6 Merge remote-tracking branch 'inventree/master' into build-fixes 
# Conflicts:
#	InvenTree/InvenTree/views.py
#	InvenTree/build/views.py
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/order/views.py
#	InvenTree/part/api.py
#	InvenTree/part/views.py
#	InvenTree/templates/js/bom.js
 2020-10-30 22:44:25 +11:00
OliverandGitHub ad90adbc04 Merge pull request #1095 from SchrodingersGat/forms 
Refactor how form errors are handled
 2020-10-30 22:12:45 +11:00
Oliver Walters 1caa341f8e Fixes for unit tests 2020-10-30 21:34:56 +11:00
Oliver Walters e049ca1a85 More refactoring 2020-10-30 16:54:05 +11:00
OliverandGitHub 87903f27ed Merge pull request #1094 from SchrodingersGat/typo-fix 
Fixed a typo in bom.js
 2020-10-30 16:23:07 +11:00
Oliver Walters c533f59405 Refactor how form errors are handled 
- Use form.add_error (as the django gods intended)
 2020-10-30 16:04:56 +11:00
Oliver Walters cabbdbb5cf Fixed a typo in bom.js 2020-10-30 15:53:13 +11:00
OliverandGitHub fb28204dfd Merge pull request #1093 from SchrodingersGat/bom-filters 
Add filtering for BOM table
 2020-10-30 12:45:46 +11:00
Oliver Walters 2428e77969 Add filtering for BOM table 2020-10-30 11:45:54 +11:00
OliverandGitHub 1311e5fe58 Merge pull request #1092 from SchrodingersGat/copy-bom 
Copy bom
 2020-10-30 11:40:06 +11:00
Oliver Walters 5c5641d884 Update calls to post_save 2020-10-30 10:12:42 +11:00
Oliver Walters 2d583d19c2 Adds function to duplicate a BOM from a parent part 
- Improves form validation workflow
- More 'djangoesque'
 2020-10-30 10:08:06 +11:00
Oliver Walters 90cfb3496a Merge remote-tracking branch 'inventree/master' into build-fixes 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.mo
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/templates/js/bom.js
 2020-10-29 15:23:51 +11:00
OliverandGitHub a148cfe593 Merge pull request #1088 from SchrodingersGat/tweaks 
Tweaks
 2020-10-29 15:16:49 +11:00
Oliver Walters 1d6d1121a7 Add some more icons 2020-10-29 13:58:05 +11:00
Oliver Walters f1a7ac3187 Add icon badges to bom.js 2020-10-29 13:26:32 +11:00
Oliver Walters fda0bff14c Tweaks to part.js 2020-10-29 13:20:42 +11:00
Oliver Walters 8246e9c802 Add function makeIconBadge for tables 
- Add filters for part variants table
 2020-10-29 13:18:45 +11:00
Oliver Walters b3ac261746 Add filter for supplier part table: 
Filter by "active" status
 2020-10-29 12:50:17 +11:00
Oliver Walters 60a8ef723b Simplify display of possible conflicting parts 
- Round to single digit
- Only show 5 closest matches

(cherry picked from commit ed8be5225d)
 2020-10-29 12:42:38 +11:00
Oliver Walters 05ce17f8df Tweaks 2020-10-29 09:45:42 +11:00
Oliver Walters a263d2fdcd Fixes for "auto allocate" concept 2020-10-29 00:49:01 +11:00
Oliver Walters 551064b3a4 Bugfix: BOM API now works slightly differently 2020-10-29 00:07:51 +11:00
Oliver Walters 544b63cac5 Merge remote-tracking branch 'inventree/master' into build-fixes 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
 2020-10-29 00:01:10 +11:00
Oliver Walters 4a7e9a2278 Update translations and PEP fixes 2020-10-28 23:59:18 +11:00
Oliver Walters ed8be5225d Simplify display of possible conflicting parts 
- Round to single digit
- Only show 5 closest matches
 2020-10-28 23:48:35 +11:00
Oliver Walters 091a9d9803 Refactor how form errors are handled 
- When in doubt, refer to the django docs
- There was a *much* better way (thanks, form.add_error)!
- The anti-pattern was deleted, and lo, there was much rejoicing
- Some other refactoring too
 2020-10-28 23:33:33 +11:00
OliverandGitHub 6dc5ef0cdc Merge pull request #1085 from SchrodingersGat/more-icons 
More template updates
 2020-10-28 23:29:15 +11:00
Oliver Walters d8ada930c8 More template updates 
- Add icons to more action buttons
 2020-10-28 22:37:58 +11:00
Oliver Walters d06b4d7c9f Merge remote-tracking branch 'inventree/master' into build-fixes 
# Conflicts:
#	InvenTree/InvenTree/urls.py
#	InvenTree/locale/de/LC_MESSAGES/django.mo
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/part/templates/part/bom.html
#	InvenTree/templates/js/build.js
#	InvenTree/templates/js/table_filters.js
#	InvenTree/templates/stock_table.html
#	tasks.py
 2020-10-28 22:25:14 +11:00
OliverandGitHub c8ec55a5fe Merge pull request #1084 from SchrodingersGat/used-in-table 
Used in table
 2020-10-28 21:21:44 +11:00
Oliver Walters 44010fe05b Translation updates 2020-10-28 18:30:50 +11:00
Oliver Walters d0b7d91ca4 Update multiple templates with fontawesome icons 2020-10-28 18:30:38 +11:00
Oliver Walters d272eec384 Update translation files 2020-10-28 18:13:19 +11:00
Oliver Walters 5e70d8df7e Rename javascript files from .html to .js 2020-10-28 18:13:02 +11:00
Oliver Walters c63480c65b Improve table for displaying what parts a particular part is "used in" 2020-10-28 18:12:38 +11:00
Oliver Walters 3ec2396ec1 Updated allocation card view 2020-10-27 23:33:51 +11:00
Oliver Walters 22a5f921b8 Auto-generate build outputs when a build is created 2020-10-27 23:09:17 +11:00
Oliver Walters 170d55d64e Add custom form validation step 2020-10-27 22:52:01 +11:00
Oliver Walters 4055a36db2 Updated modal forms 2020-10-27 22:29:34 +11:00
Oliver Walters 646fe40950 Require either serial or batch number to be set for trackable part 2020-10-27 22:00:38 +11:00
Oliver Walters 54d5d2899e Update javascript callbacks 2020-10-27 21:47:24 +11:00
OliverandGitHub 43907fb129 Merge pull request #1082 from jnewlands/typo_fix_external_link 
Fix typo in new / edit part forms ("extenel URL")
 2020-10-27 16:43:14 +11:00
Oliver Walters 06a3899325 Disable "unallocate" button if there are not any allocations 2020-10-27 09:26:16 +11:00
Oliver Walters b5e1d3f87a Sorter fixes 2020-10-27 08:58:29 +11:00
OliverandGitHub 9ed787b4da Merge pull request #1077 from SchrodingersGat/custom-tag-fix 
Bug fix - re-introduce settings_value custom tag
 2020-10-27 07:49:12 +11:00
Oliver Walters 4167e1fdb3 Update translation files 2020-10-26 22:51:57 +11:00
Oliver Walters 210d39c8b7 Bug fix - re-introduce settings_value custom tag 
(cherry picked from commit 9203f541be)
 2020-10-26 22:44:49 +11:00
Oliver Walters d8a0ab8879 Fix for build table 2020-10-26 22:44:24 +11:00
Oliver Walters 9203f541be Bug fix - re-introduce settings_value custom tag 2020-10-26 22:44:16 +11:00
Oliver Walters a4f6efc05d Merge remote-tracking branch 'inventree/master' into build-fixes 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/templates/js/build.html
 2020-10-26 22:38:43 +11:00
Oliver Walters b38fde85f2 Added some more buttons, etc 2020-10-26 22:34:40 +11:00