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
7,705 Commits 9 Branches 164 Tags
42af52ee51a2bf402a80ea1b7d056ae4092f956c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters 42af52ee51 WIP 2021-08-24 22:31:13 +10:00
Oliver Walters 0d7eb6b72c Style fixes 2021-08-24 22:25:25 +10:00
Oliver Walters 5275d3943b Adds option to hide labels and help text 2021-08-24 22:13:07 +10:00
Oliver Walters d87ab0033a Add "afterRender" callback for modal forms 2021-08-24 22:05:00 +10:00
Oliver Walters 1360b1592d Some convenience functions 2021-08-24 22:04:43 +10:00
Oliver Walters e3605001e4 Simple function to render a thumbnail 2021-08-24 22:04:06 +10:00
Oliver Walters d5e58fd798 Fix for status code serializer 2021-08-24 22:03:52 +10:00
Oliver 86e3e26196 Merge remote-tracking branch 'inventree/master' into receive-via-api 2021-08-24 15:07:55 +10:00
OliverandGitHub 0073a77e16 Merge pull request #2008 from matmair/fix-for-1986 
Fix for 1986
 2021-08-24 14:13:50 +10:00
OliverandGitHub 7f75c610ef Merge pull request #2012 from SchrodingersGat/search-preview-click 
Wrap search preview results in <a>
 2021-08-24 13:47:55 +10:00
Oliver 36a0496dd7 Wrap search preview results in <a> 
- Allows clicking with middle mouse (for e.g.) to open in new tab
 2021-08-24 13:11:37 +10:00
OliverandGitHub 44ecd958a2 Merge pull request #2011 from SchrodingersGat/boolean-form-fixes 
Fix for "part" form fields
 2021-08-24 12:10:00 +10:00
OliverandGitHub 56f27aae23 Merge pull request #2010 from SchrodingersGat/sales-order-tab-fix 
Hide "Sales Orders" tab if part is not salable
 2021-08-24 12:03:09 +10:00
Oliver 8fc79f45a3 Fix for "part" form fields 
- Specify "default" rather than overriding "value"
 2021-08-24 11:55:58 +10:00
Oliver 7646535aaf Hide "Sales Orders" tab if part is not salable 2021-08-24 11:48:42 +10:00
Oliver 1b65fbad2c Update unit tests 
- Found some bugs too, thanks unit tests!
 2021-08-24 11:42:08 +10:00
Oliver d30173132a Actually receive items 2021-08-24 08:49:23 +10:00
Oliver 2aa505b2cb Fix unit tests to match new API format 2021-08-24 08:18:59 +10:00
OliverandGitHub 5349addc06 Merge pull request #2005 from eeintech/ui_updates 
Updated color of `new` and `add` UI buttons
 2021-08-24 08:12:45 +10:00
Oliver 6091f2ba33 Serializer improvements 
- Pass the "order" down to the nested serializers for validation
 2021-08-24 00:29:38 +10:00
Oliver dc53a433a7 Fix serializer nesting 
- Add new API endpoint to receive items
- Add unit testing
 2021-08-23 23:35:22 +10:00
Oliver 28cc241354 Custom DRF serializers for receiving line items against a purchase order 2021-08-23 23:13:07 +10:00
OliverandGitHub f136c974cf Merge pull request #2003 from SchrodingersGat/edit-purchase-prices 
Edit purchase prices
 2021-08-23 22:54:12 +10:00
Oliver 90d0b8b15d Bump API version 2021-08-23 21:45:40 +10:00
Oliver 5d4f35958d Point table at the new read-only field 2021-08-23 21:45:32 +10:00
Oliver bb8b85c375 Separate purchase_price and purchase_price_currency for StockItem serializer 
- Add "purchase_price_string" for a read-only stringified representation
- Unit testing
 2021-08-23 21:44:12 +10:00
Oliver d267d04bed Allow validation of empty money values 2021-08-23 21:43:31 +10:00
Oliver f96051d863 Replace print statement with a logger warning 2021-08-23 21:39:54 +10:00
Oliver 8662e6a109 Fix a super annoying validation issue 
- Was throwing opaque "too many values to unpack" error
- Simply needed the name of the field.
 2021-08-23 21:39:00 +10:00
OliverandGitHub 1fb76b9987 Merge pull request #1999 from matmair/turn-of-functions 
Disable functions in navbars
 2021-08-23 20:29:28 +10:00
OliverandGitHub fd1dd792c6 Merge pull request #1957 from matmair/bpm-purchase-price 
BOM - show purchase price
 2021-08-23 11:07:30 +10:00
OliverandGitHub 87a41c7e39 Merge pull request #2000 from SchrodingersGat/dev-conf-fix 
Fix for docker development env file
 2021-08-23 09:10:25 +10:00
Oliver 47524f6ea3 Fix for docker development env file 2021-08-23 08:39:09 +10:00
OliverandGitHub a5f26c7f09 Merge pull request #1998 from bobek/patch-1 
Fix for production docker environment
 2021-08-23 08:38:04 +10:00
OliverandGitHub b6df623554 Merge pull request #1997 from SchrodingersGat/new-po-from-order 
Refactor buttons in "order parts" wizard
 2021-08-23 00:49:27 +10:00
Oliver Walters 174b7ba7f2 Fix for "new purchase order" button 2021-08-23 00:28:36 +10:00
Oliver Walters 449e0c0af2 Refactor button in first step of "order parts" wizard 
- "new supplier part" button was broken
- Was linked to the old "launchModalForm" code
- Now calls createSupplierPart
 2021-08-23 00:17:45 +10:00
OliverandGitHub 3cf06b4960 Merge pull request #1995 from SchrodingersGat/delete-unused-images 
remove some unused images
 2021-08-23 00:11:39 +10:00
Oliver Walters f2e58ebbdd remove some unused images 2021-08-22 23:54:43 +10:00
OliverandGitHub 370fbea396 Merge pull request #1987 from matmair/fix-for-1986 
Disable table sorting when order is fixed
 2021-08-22 23:47:21 +10:00
OliverandGitHub 51de0a982a Merge pull request #1990 from matmair/fix-tooltip-linebreak 
Fix tooltip linebreak
 2021-08-22 08:19:54 +10:00
OliverandGitHub 8646c73021 Merge pull request #1980 from matmair/housekeeping 
Housekeeping
 2021-08-20 09:02:33 +10:00
OliverandGitHub 5bd31f11eb Merge pull request #1978 from matmair/fix-translate 
Fix translations stats - task
 2021-08-20 09:01:50 +10:00
OliverandGitHub 831ccec399 Merge pull request #1981 from matmair/coverage-to-setup 
Merge coverage settings
 2021-08-20 09:01:12 +10:00
OliverandGitHub 414d2dbc96 Merge pull request #1977 from eeintech/company_templates 
Fixed company templates
 2021-08-20 07:47:29 +10:00
OliverandGitHub c16ce925dd Merge pull request #1973 from SchrodingersGat/delete-expired-sessions 
Run periodic (daily) task to clear out expired sessions
 2021-08-19 16:53:19 +10:00
Oliver f0415640d5 Run periodic (daily) task to clear out expired sessions 2021-08-19 16:34:57 +10:00
OliverandGitHub c3048a1bf1 Merge pull request #1970 from SchrodingersGat/entrypoint 
Entrypoint
 2021-08-19 12:12:01 +10:00
Oliver 9ed2025021 Add a TODO for future reference 2021-08-19 11:14:13 +10:00
Oliver 52bdfe5465 Env interpolation doesn't seem to work in the CMD 2021-08-18 20:52:14 +10:00
Oliver eeac561b9b typo fix 2021-08-18 17:07:23 +10:00
Oliver 2095d66677 Fix entrypoint / cmd for production server 2021-08-18 16:29:54 +10:00
Oliver 79d7a9f922 fix typo in dockerfile 2021-08-18 15:16:22 +10:00
Oliver 41db0ff60d Need to specify python3 2021-08-18 14:58:16 +10:00
Oliver db477bceab typo fix 2021-08-18 14:47:34 +10:00
Oliver d756579a06 Split production environment variables out into a .env file 2021-08-18 13:02:36 +10:00
Oliver c1ea6dbb9b Remove commented out functionality from the entrypoint command 2021-08-18 12:28:09 +10:00
Oliver c2af401854 Pin base python package requirements 
- Require invoke to be installed before we can run "invoke update"
 2021-08-18 12:03:24 +10:00
Oliver 8fea9bc645 Re-add docker file git version info 2021-08-18 11:25:19 +10:00
Oliver 7bfddd6d51 Simplify init scripts 
Single script init.sh which performs the following tasks:
- Creates required directory structure
- Activates python venv (if required)
- Waits for database connection
- Runs command
 2021-08-18 09:52:27 +10:00
Oliver 3b8ee48581 Fix env defines in dockerfile 2021-08-18 09:34:09 +10:00
Oliver da834d8bcc Reduce cruft in logs 2021-08-18 00:04:38 +10:00
Oliver b48db6f8fe Dockerfile fixes 2021-08-17 23:15:05 +10:00
Oliver 187c9b0971 Add server init script 
- Taken (mostly) from https://github.com/inventree/InvenTree/pull/1949
 2021-08-17 23:10:57 +10:00
Oliver 8b66babd49 Refactor dockerfile 
- Ref: https://github.com/inventree/InvenTree/pull/1949
- Squash all apk commands into single line
- Drop to inventree user rather than running as root
- Separate entrypoint and cmd for each target
- Set the INVENTREE_PY_ENV variable in development mode
 2021-08-17 22:58:44 +10:00
OliverandGitHub b6e97f06dd Merge pull request #1968 from SchrodingersGat/docker-internal-vars 
Cleanup docker vars for dev setup
 2021-08-17 21:18:09 +10:00
Oliver 0294a1c323 Fix for staticfile collection 
- Was generating a *lot* of warning messages
- Ref: https://github.com/django-compressor/django-compressor/issues/720
 2021-08-17 21:02:45 +10:00
Oliver 895f9f3ce0 Pull debug level out into the .env file 2021-08-17 20:45:57 +10:00
Oliver d5d89c67b1 Error out if the static or media directories are not properly defined 2021-08-17 20:42:19 +10:00
Oliver a474000361 Fix critical error in dockerfile 
- Don't' be putting no spaces in!
 2021-08-17 20:29:48 +10:00
Oliver 7bf3229595 Add comment to docker-compose file 2021-08-17 20:00:54 +10:00
Oliver 07857c3088 Simplify dev-config.env file 
- Don't need to re-specify the internal docker variables
- Add comments
 2021-08-17 19:59:32 +10:00
Oliver 206743b58d Add a default value for INVENTREE_WEB_ADDR 2021-08-17 19:58:55 +10:00
OliverandGitHub a5808d4360 Merge pull request #1967 from SchrodingersGat/always-translate 
Run translation step as part of "update"
 2021-08-17 19:52:58 +10:00
Oliver 92aace1278 Run translation step as part of "update" 2021-08-17 18:22:07 +10:00
OliverandGitHub d6c9ff41ff Merge pull request #1964 from eeintech/import_part_nav 
Added navbar on part import page
 2021-08-17 09:59:35 +10:00
OliverandGitHub fa163b8866 Merge pull request #1962 from SchrodingersGat/attachment-edit 
Attachment edit
 2021-08-16 11:14:14 +10:00
Oliver 23b2b56de4 StockItemAttachment 2021-08-16 10:56:00 +10:00
Oliver 6141ddc3eb SalesOrderAttachment and PurchaseOrderAttachment 2021-08-16 10:53:28 +10:00
Oliver f8b22bc7b7 Refactor BuildAttachment model 2021-08-16 10:49:31 +10:00
Oliver d9f29b4a70 Updates for InvenTree serializer classes 
- Catch and re-throw errors correctly
 2021-08-16 10:41:26 +10:00
Oliver 3dcf1746e6 Functionality for renaming attached files 2021-08-16 10:41:02 +10:00
Oliver ff8dcabb12 New custom serializer for handling attachments 2021-08-15 22:43:52 +10:00
OliverandGitHub 81a8aac623 Merge pull request #1961 from SchrodingersGat/tweaks 
Small tweaks here and there
 2021-08-15 22:10:09 +10:00
Oliver 1998dabe9b Small tweaks here and there 2021-08-15 21:47:37 +10:00
OliverandGitHub 4061693522 Merge pull request #1959 from SchrodingersGat/settings-context 
Provide global_settings and user_settings as context objects
 2021-08-15 12:57:15 +10:00
Oliver 8861ffad81 PEP fixes 2021-08-15 12:06:31 +10:00
Oliver cef09acd54 Partial reversion of some stuff 2021-08-15 12:05:53 +10:00
Oliver faab1f2464 Provide global_settings and user_settings as context objects 
- Adds a new context middleware
- Refactor the way that settings are provided to the javascript layer
 2021-08-15 11:57:05 +10:00
OliverandGitHub 6c17e330c4 Merge pull request #1958 from SchrodingersGat/better-form-errors 
Better form errors
 2021-08-14 13:56:33 +10:00
Oliver 28bccea57b Cleanup 2021-08-14 13:43:38 +10:00
Oliver 32fafc76d7 css tweaks 2021-08-14 13:42:50 +10:00
Oliver f753e11f10 Improve error notification for modal forms 
- Scroll to error
- Add red border and background to the form
 2021-08-14 13:41:19 +10:00
Oliver f72eb4266a remove old debug message 2021-08-14 12:31:22 +10:00
OliverandGitHub 1db654e990 Merge pull request #1956 from SchrodingersGat/supplier-part-from-form 
Supplier part from form
 2021-08-14 12:12:09 +10:00
Oliver 2b13512145 Check that supplier and manufacturer parts are created 2021-08-14 10:43:45 +10:00
Oliver 6fa4e33062 Unit testing for new API form features 2021-08-14 10:39:05 +10:00
Oliver 26c07961cb Bug fix for API 2021-08-14 10:23:57 +10:00
Oliver 6eb4709658 Adds initial stock quantity 2021-08-14 10:23:42 +10:00
Oliver Walters 2be9399d2c CSS style fixes 2021-08-14 01:15:43 +10:00