inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-18 12:36:11 +00:00
Code Activity
3,770 Commits 9 Branches 164 Tags
60a8ef723b80b8ceb83fb0271f44d9bbb1fec10f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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 210d39c8b7 Bug fix - re-introduce settings_value custom tag 
(cherry picked from commit 9203f541be)
 2020-10-26 22:44:49 +11:00
OliverandGitHub 720579dcd7 Merge pull request #1070 from SchrodingersGat/global-settings 
Global settings
 2020-10-25 22:22:57 +11:00
Oliver Walters e978e1df52 Style fixes 2020-10-25 22:11:24 +11:00
Oliver Walters 5908890726 Create setting if it does not exist 2020-10-25 22:07:11 +11:00
Oliver Walters 549f50ac3f Update translations 2020-10-25 21:54:53 +11:00
Oliver Walters 9284837da8 Bug fixing 2020-10-25 21:45:37 +11:00
Oliver Walters 7d95faa4f5 Cleanup code 2020-10-25 21:43:33 +11:00
Oliver Walters 432ecc1d96 Display boolean values as checkboxes 2020-10-25 21:33:13 +11:00
Oliver Walters 3a325399c6 Use a checkbox input when editing a boolean setting 2020-10-25 21:00:06 +11:00
Oliver Walters f1e8afa314 Add boolean validator 2020-10-25 09:36:58 +11:00
Oliver Walters 73296eafcb Update translation files 2020-10-25 08:18:33 +11:00
Oliver Walters 4d96b385b1 Add page for global settings 2020-10-25 08:17:41 +11:00
Oliver Walters b57a78dea4 Add some context data to the view for editing a setting 2020-10-25 08:10:52 +11:00
Oliver Walters e3f5e8fbb1 PEP fixes 2020-10-25 08:04:04 +11:00
Oliver Walters 3e17bf3316 Edit setting directly 2020-10-25 08:02:46 +11:00
Oliver Walters 10758a9626 Improvements for global settings 
- Name and description are defined in models.py
- Lookup functions for name / description / units / default
- Shortcut template for rending settings
- More unit testing
 2020-10-25 07:49:38 +11:00
OliverandGitHub 5e63ccc9f6 Merge pull request #1043 from eeintech/unique_email_company 
[Company] Allow duplicate names - Unique name/email pair
 2020-10-23 13:23:48 +11:00
OliverandGitHub cd4cb12937 Merge pull request #1064 from eeintech/company_permissions 
Company permissions
 2020-10-23 13:20:59 +11:00
OliverandGitHub 5877b9616d Merge pull request #1066 from eeintech/fix_part_null_notes_template 
Fixed Part notes template (check for NULL value before mardown render)
 2020-10-22 09:53:15 +11:00
OliverandGitHub bc6f58cf26 Merge pull request #1061 from SchrodingersGat/migration-fix 
Except IntegrityError
 2020-10-20 20:35:59 +11:00
Oliver Walters 4193d2e7fe Except IntegrityError 
- This error may be thrown if the correct migrations have not been applied
 2020-10-20 19:52:04 +11:00
OliverandGitHub 85ac1bfb95 Merge pull request #1058 from SchrodingersGat/stock-table-ordering 
Fix table sorting when groups are used.
 2020-10-20 12:07:11 +11:00
Oliver Walters 73a1765a11 Fix table sorting when groups are used. 
This is necessary because the field names of the tables are specified like "part_detail.IPN" and multi-level string-based object access is weird.
Luckily someone has worked out the hard part for me.

Ref: https://stackoverflow.com/questions/6393943/convert-javascript-string-in-dot-notation-into-an-object-reference
 2020-10-20 11:54:54 +11:00
OliverandGitHub d242e04e64 Merge pull request #1055 from SchrodingersGat/build-reference 
Build reference
 2020-10-20 09:03:25 +11:00
Oliver Walters a2ee172058 Updates tables for PurchaseOrder and SalesOrder 2020-10-20 08:45:17 +11:00
Oliver Walters 5a6697866f Update translations 2020-10-20 08:41:13 +11:00
Oliver Walters 406d7bcf80 Load build order prefix setting 2020-10-20 08:41:08 +11:00
Oliver Walters 7aa473712f Remove unused setting page 2020-10-20 08:32:00 +11:00
Oliver Walters 226a91718b Add a simple unit test for the settings model 2020-10-20 08:29:06 +11:00
Oliver Walters c6e61c20fe Generate default settings for all InvenTreeSetting object 2020-10-20 08:24:23 +11:00
Oliver Walters 98d20bceeb Change "Build Title" to "Description" 2020-10-20 00:26:26 +11:00
Oliver Walters e8a0095e50 Add some options for the build order settings page 
- Not editable yet
 2020-10-20 00:24:33 +11:00
Oliver Walters a5639c380f Add regex validator to build order reference field 2020-10-20 00:13:43 +11:00
Oliver Walters 06040f94ee Remove "description" field from InvenTreeSettings key:value fields 2020-10-20 00:02:54 +11:00
Oliver Walters 92c1e3c1a5 Update settings pages 2020-10-19 23:50:39 +11:00
Oliver Walters c13cee2407 Fixes for unit testing 2020-10-19 23:31:52 +11:00
Oliver Walters 9b7a9a3ee0 Update formatting of order pages 2020-10-19 23:23:16 +11:00
Oliver Walters b5d15aab08 Add function to "predict" next build order reference value 2020-10-19 23:22:09 +11:00
Oliver Walters 5405ad566e Add 'reference' to API serializer 2020-10-19 22:53:40 +11:00
Oliver Walters 0b7cf9e7f3 Add "reference" to build order forms 2020-10-19 22:49:28 +11:00
Oliver Walters a8d47c54f9 Upate admin interface 2020-10-19 22:40:19 +11:00
Oliver Walters 934078a42c Add "Reference" field to Build model 2020-10-19 22:36:14 +11:00
OliverandGitHub 416cfb99da Merge pull request #1053 from SchrodingersGat/modal-errors 
Modal errors
 2020-10-19 22:19:10 +11:00
Oliver Walters 6b99d923d7 Change "status code" to "error code" 2020-10-19 16:44:33 +11:00
Oliver Walters 396b7dba73 Extra error information when a modal dialog fails 2020-10-19 16:42:53 +11:00
OliverandGitHub 957c538136 Merge pull request #1052 from SchrodingersGat/barcode-add 
Change text for barcode
 2020-10-19 16:31:47 +11:00
Oliver Walters 647e2cf64d Change text for barcode 2020-10-19 16:06:18 +11:00
OliverandGitHub ce1cce99bb Merge pull request #1051 from SchrodingersGat/po-stock-list 
Display table of items received against a particular purchase order
 2020-10-19 11:55:25 +11:00
Oliver Walters 634410294b Display table of items received against a particular purchase order 
- Adds new tab to "Purchase Order" view
- Adds ability to filter StockList API by purchase_order ID
 2020-10-19 11:40:57 +11:00
OliverandGitHub 2dc9109b11 Merge pull request #1047 from eeintech/add_ipn_supplier_part_str 
Added IPN to Supplier Part string representation (global)
 2020-10-19 11:21:34 +11:00
OliverandGitHub 529c4052ff Merge pull request #1038 from mpdgraev/fix_int_barcode 
fix error when submitting some non-dict barcodes
 2020-10-19 00:01:38 +11:00
OliverandGitHub 7edd08035f Merge pull request #1049 from SchrodingersGat/api-default-location 
Update creation of StockItem via API
 2020-10-18 22:49:09 +11:00
Oliver Walters 3c175a6c8d Update creation of StockItem via API 
- If no location is specified, but a default location exists for the part, use that
- If a location is specified (even if it is null) then the specified value is used instead
 2020-10-18 22:24:45 +11:00
OliverandGitHub 83077514cb Merge pull request #1041 from eeintech/api_default_location 
Added part 'default_location' to serializer
 2020-10-18 22:01:35 +11:00
OliverandGitHub 4d4f0e5cfc Merge pull request #1044 from eeintech/stock_permissions 
Fixed insertion of backslash in the Stock barcode button group
 2020-10-18 21:11:09 +11:00
OliverandGitHub ca8472ac23 Merge pull request #1037 from SchrodingersGat/tz-support 
Add support for setting timezone in config.yaml
 2020-10-08 21:35:36 +11:00
Oliver Walters 3d60bccae0 Add support for setting timezone in config.yaml 2020-10-08 21:02:38 +11:00
OliverandGitHub 26ee3032f6 Merge pull request #1036 from SchrodingersGat/bom-quantity-export 
Normalize quantity field when exporting BOM
 2020-10-08 14:21:50 +11:00
Oliver Walters 8b16304e84 Custom 404 page 2020-10-08 14:09:08 +11:00
Oliver Walters b595f3b732 Normalize quantity field when exporting BOM 2020-10-08 14:05:55 +11:00
OliverandGitHub 305920d1ac Merge pull request #1030 from eeintech/stock_permissions 
Stock permissions
 2020-10-07 14:11:52 +11:00
OliverandGitHub ec4bc357df Merge pull request #1031 from eeintech/fix_superuser_permission 
Fixed context permissions for superuser with no group assigned
 2020-10-07 13:40:59 +11:00
OliverandGitHub 279b50d977 Merge pull request #1029 from SchrodingersGat/sales-order-permissions 
Sales order permissions
 2020-10-06 20:44:01 +11:00
Oliver Walters 8b37229e4b The real translations are the ones we made along the way 2020-10-06 20:31:38 +11:00
Oliver Walters b80e4302ba Update permissions for build app 2020-10-06 20:29:16 +11:00
Oliver Walters 2325b1e4ba Unit test fixes 2020-10-06 20:10:14 +11:00
Oliver Walters 9abb211cdf Update template permissions 2020-10-06 20:09:55 +11:00
Oliver Walters 1c97aaf87a Set permissions for order views 2020-10-06 19:46:53 +11:00
OliverandGitHub 606c62078f Merge pull request #1024 from SchrodingersGat/part-permissions 
Permissions
 2020-10-06 18:29:05 +11:00
Oliver Walters ab454e5ba4 More template changes: perms -> roles 2020-10-06 16:46:13 +11:00
Oliver Walters 88f73443ee Yet more style fixes 2020-10-06 16:43:39 +11:00
Oliver Walters 77a2b6de8b Merge branch 'part-permissions' of https://github.com/SchrodingersGat/InvenTree into part-permissions 2020-10-06 16:03:33 +11:00
Oliver Walters b3e4efd96e Unit testing fixes 2020-10-06 16:03:19 +11:00
OliverandGitHub e076470305 Merge branch 'master' into part-permissions 2020-10-06 12:35:45 +11:00
Oliver Walters d691b15f4b Fix conflicts 2020-10-06 12:34:30 +11:00
Oliver Walters 11d31960c7 Change modal form permissions to use new "role" strategy 2020-10-06 11:42:16 +11:00
Oliver Walters c740cce5e4 PEP fixes 2020-10-06 11:31:04 +11:00
Oliver Walters dc2c9aa662 Add InvenTreeRoleMixin 
- Simplifies permission requirements for views
- e.g. 'part.view' rather than 'part.view_partcategory'
 2020-10-06 11:29:38 +11:00
Oliver Walters d2e2e7511f Update templates: Change perms to roles 2020-10-06 10:07:39 +11:00
Oliver Walters fa21d66c41 Fix logic for global context object 'roles' 
- User may be a part of multiple groups
- Roles are additive across groups
 2020-10-06 09:54:37 +11:00
Oliver Walters 23aee234f0 Change index page to use roles rather than perms to determine user permissions 2020-10-06 09:32:05 +11:00
Oliver Walters 556ffa1099 Change label for permissions to match django permission names 2020-10-06 09:28:05 +11:00
Oliver Walters 8b2189daca Add global context 'roles' 
- Access via template e.g. {% if roles.part.view %}
- Always True if the user is a superuser
 2020-10-06 09:27:22 +11:00
OliverandGitHub e74bfb90a5 Merge pull request #1025 from eeintech/fixed_group_redundant_saves 
Fixed Group model permissions redundant saves
 2020-10-06 07:40:44 +11:00
Oliver Walters 3f59ce3f93 Update unit tests 
- requires the user to actually have the necessary permissions!
 2020-10-06 01:30:36 +11:00
Oliver Walters 16d720b62c Update permission requirements for API 
- Automatically use model permissions by default!
-
 2020-10-06 00:36:55 +11:00
Oliver Walters 8ee16d6f98 update translation files 2020-10-06 00:20:57 +11:00
Oliver Walters ba4c829b10 Add permission requirements in various part templates 2020-10-06 00:20:45 +11:00
Oliver Walters afadd51a14 Fix permissions in views.py 
Silly, "add" not "create"
 2020-10-06 00:19:44 +11:00