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
7,635 Commits 9 Branches 164 Tags
575cf87b98c58a89e3677e07990fa4341de3f927
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Oliver Walters ad844c4393 Simplify rendering of checkboxes in forms 
- Display "inline" so they take up much less vertical space
 2021-08-14 01:05:06 +10:00
Oliver Walters ba1ba67f87 Only add company data if part is purchaseable 2021-08-14 00:46:30 +10:00
Oliver Walters 78340a71a9 Adds support for creation of ManufacturerPart and SupplierPart via the Part creation API 2021-08-14 00:38:08 +10:00
Oliver Walters 6218f1c7e6 Add form elements for initializing a part with supplier data 2021-08-14 00:26:22 +10:00
Oliver Walters 5cbb67b91c Add options to show / hide form groups 2021-08-14 00:20:34 +10:00
Oliver Walters cb11df4dba Improve error checking for initial stock creation when creating a new part 
- Use @transaction.atomic
- Raise proper field errors
 2021-08-14 00:09:08 +10:00
Oliver Walters 1396c349c8 Refactor form field definition copying 2021-08-14 00:08:26 +10:00
Oliver Walters 5b42ab7332 Add "groups" to API forms 2021-08-13 21:48:48 +10:00
OliverandGitHub cd4a797e71 Merge pull request #1954 from eeintech/upload_po_file 
Improved creation of purchase order line items from file upload
 2021-08-13 09:31:22 +10:00
OliverandGitHub e8d47a4c76 Merge pull request #1953 from SchrodingersGat/bom-unit-tests 
Add extra unit testing for BOM export
 2021-08-13 09:06:29 +10:00
Oliver 26ddd36666 PEP fixes 2021-08-12 23:47:42 +10:00
Oliver 537573d0e3 Add extra unit testing for BOM export 2021-08-12 23:40:07 +10:00
OliverandGitHub 1da004d30a Merge pull request #1952 from SchrodingersGat/dockerfile-fix 
Dockerfile fix
 2021-08-12 22:34:41 +10:00
Oliver 7df4451c08 Move some core pypi deps into requirements file 2021-08-12 22:06:47 +10:00
Oliver a3ff90754d Specify tag when publishing release build to docker hub 2021-08-12 22:01:42 +10:00
Oliver 31bb7734ce Update dockerfile to allow downloading against a specific git tag 2021-08-12 22:01:14 +10:00
OliverandGitHub fcff8d4825 Merge pull request #1944 from SchrodingersGat/report-unit-tests 
Unit testing for report framework
 2021-08-12 16:05:49 +10:00
Oliver f59ed27cf9 Remove reliance on hard-coded PK values 2021-08-12 15:14:13 +10:00
Oliver e36b1e6c70 PEP fixes 2021-08-12 14:51:18 +10:00
Oliver 6748f37405 Unit tests for report printing 2021-08-12 14:43:04 +10:00
Oliver 96ec8c4eb6 Copy report templates across as part of test setUp 2021-08-12 13:40:08 +10:00
Oliver 032057c93a PEP fixes 2021-08-12 13:18:10 +10:00
OliverandGitHub 7665e83001 Merge pull request #1947 from eeintech/supplier_part 
Hook to connect ManufacturerPart to SupplierPart using name/MPN
 2021-08-12 09:15:20 +10:00
Oliver 44818ca0c5 Some simple API unit tests 2021-08-11 17:40:00 +10:00
Oliver 3cdcdd0535 Create report templates when testing 2021-08-11 11:07:30 +10:00
OliverandGitHub 2cf7592198 Merge pull request #1941 from SchrodingersGat/lazy-loading 
Adds one-shot function when a panel is displayed
 2021-08-11 00:29:06 +10:00
Oliver 46fa60953d Refactor part page 2021-08-11 00:12:55 +10:00
Oliver 68282c93f4 Start API calls before the panel has finished loading 2021-08-11 00:12:48 +10:00
Oliver a1922bff81 Adds one-shot function when a panel is displayed 2021-08-11 00:09:01 +10:00
OliverandGitHub b94104f7ab Merge pull request #1940 from SchrodingersGat/stock-table-fix 
Bug fix for stock table
 2021-08-10 23:52:55 +10:00
OliverandGitHub bfc489a35b Merge pull request #1939 from SchrodingersGat/transfer-stock-bug 
Bug fix for stock transfer form
 2021-08-10 23:39:31 +10:00
Oliver 535c36b75e Bug fix for stock table 
- Use the provided table name, rather than hard-coded value

(cherry picked from commit b3a52dd6c65a83f2f330c0275b443e9acbcbdf73)
 2021-08-10 23:31:20 +10:00
OliverandGitHub 1bf2a3e23f Merge pull request #1938 from SchrodingersGat/auth-bug 
Fix bug when using token based auth
 2021-08-10 23:24:01 +10:00
Oliver 4c8eaf3942 Bug fix for stock transfer form 2021-08-10 23:23:02 +10:00
Oliver 799f17ef50 Bypass custom token auth for /api/ endpoint 2021-08-10 23:09:54 +10:00
Oliver 7ef5c0058e Fix bug when using token based auth 2021-08-10 22:50:49 +10:00
OliverandGitHub b92ec751ef Merge pull request #1934 from markdedeuge/bugfix/timezone_heartbeat 
use django timezone'd datetime to squash timezone warnings from worke…
 2021-08-10 15:16:42 +10:00
OliverandGitHub 0e0f490f8d Merge pull request #1932 from SchrodingersGat/supplier-part-bug-fix 
Supplier part bug fix
 2021-08-10 11:18:02 +10:00
OliverandGitHub 3df7299a61 Merge pull request #1931 from markdedeuge/patch-1 
Update nginx.conf to use http_host rather than host fixes #1930
 2021-08-10 11:04:56 +10:00
Oliver c32b6b2272 Hide the "part" field when editing manufacturer part and supplier part objects 2021-08-10 11:01:17 +10:00
Oliver e03afce335 Add "instance_filters" for SupplierPart model 
- Restrict the "manufacturer_part" query based on the current part
 2021-08-10 11:00:27 +10:00
Oliver 7117c33379 Raise validation error if the manufacturer part does not point to the correct part 2021-08-10 10:58:11 +10:00
OliverandGitHub 6620d34f25 Merge pull request #1913 from eeintech/bom_upload 
BOM upload templates fixes
 2021-08-10 09:11:25 +10:00
OliverandGitHub 0a1ce59dfc Merge pull request #1858 from eeintech/exchange_rate_task 
Exchange rate as worker task
 2021-08-10 08:23:46 +10:00
OliverandGitHub 98211f1ae1 Merge pull request #1928 from erkutalakus/hotfix/unlocalization-of-item-quantity 
Localization of item.quantity removed
 2021-08-09 21:42:07 +10:00