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
5,363 Commits 9 Branches 164 Tags
62320e46d5fad324a0f2b802599b6c79027a8100
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
OliverandGitHub 62320e46d5 Merge pull request #1610 from SchrodingersGat/template-fix 
Bug fix for template
 2021-05-27 13:24:08 +10:00
Oliver Walters 2a64e4a309 Bug fix for template 2021-05-27 13:23:20 +10:00
OliverandGitHub 8501aba368 Merge pull request #1609 from SchrodingersGat/variant-convert 
Expand possibilities for variant conversion
 2021-05-27 13:18:48 +10:00
Oliver Walters 4abd3524b4 Looks like py-moneyed has been updated 2021-05-27 12:59:30 +10:00
Oliver Walters 4df7e53bb8 Add DEFAULT_CURRENCY option 2021-05-27 12:55:30 +10:00
Oliver Walters c2fe5e08b4 Expand possibilities for variant conversion 
- Ref get_conversion_options
 2021-05-27 12:35:55 +10:00
OliverandGitHub 3a36e800c0 Merge pull request #1600 from eeintech/update_rates_manual 
Currencies settings and exchange rates list/refresh
 2021-05-26 19:10:43 +10:00
OliverandGitHub 500770d1bf Merge pull request #1608 from SchrodingersGat/rate-update-fix 
Rate update fix
 2021-05-25 14:33:38 +10:00
Oliver Walters 0a26a06909 Use INVENTREE_DEFAULT_CURRENCY as specified base currency 2021-05-25 10:46:30 +10:00
Oliver Walters 619cba6007 Currency: Use ExchangeRateHost backend by default, rather than fixer.io 
- No longer support fixer.io as it requires an API key and does not support "base" currency
 2021-05-25 10:37:53 +10:00
OliverandGitHub 817287a26c Merge pull request #1607 from SchrodingersGat/docker-paths 
Docker: Add parent directories if they do not exist
 2021-05-25 09:48:11 +10:00
Oliver Walters ff80c722fb Docker: Add parent directories if they do not exist 2021-05-25 09:32:21 +10:00
OliverandGitHub 2d61e6fc5d Merge pull request #1605 from SchrodingersGat/exchange-rates 
Add backend for exchangerate.host
 2021-05-23 21:35:15 +10:00
Oliver Walters 65aa468168 Add backend for exchangerate.host 2021-05-23 21:14:43 +10:00
OliverandGitHub 098b9b7597 Merge pull request #1602 from SchrodingersGat/api-increment 
Bump API version to 3
 2021-05-22 21:14:18 +10:00
Oliver Walters 240ff59b30 Bump API version to 3 
- New stock item history tracking is incompatible
- Adds API info to the "about" dialog
 2021-05-22 20:56:56 +10:00
OliverandGitHub 6c91d067d7 Merge pull request #1598 from SchrodingersGat/fixer-currency-integration 
Fixer currency integration
 2021-05-18 22:59:14 +10:00
Oliver Walters 4101e25680 Style fixes 2021-05-18 22:41:57 +10:00
Oliver Walters 663f5562e8 Schedule a daily task to update currency information 2021-05-18 22:41:26 +10:00
Oliver Walters 01d444279c Add setting for fixer.io API key 2021-05-18 22:11:24 +10:00
OliverandGitHub efe888056f Merge pull request #1596 from SchrodingersGat/banner-reworks 
Banner reworks
 2021-05-18 19:34:18 +10:00
OliverGitHubgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 		013d42de7a L10 merge (#1595) 
* updated translation base

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* Adds a commit message

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* updated translation base

* New Crowdin updates (#1551)

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* New Crowdin updates (#1552)

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* New Crowdin updates (#1568)

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* New Crowdin updates (#1570)

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 2021-05-18 19:20:24 +10:00
Oliver Walters 7cd345aeb5 Change location of 'banner' messages 
- Place them inside the main panel
- Generally underneath the thumbnail
 2021-05-18 19:19:43 +10:00
Oliver Walters a1c4662e91 Move status messages for stock item 2021-05-18 19:11:37 +10:00
Oliver Walters 5204567628 Bug fix for stock item tracking API 2021-05-18 19:06:41 +10:00
OliverandGitHub 56fd8132c7 Merge pull request #1593 from SchrodingersGat/hide-purchase-price 
Disable "purchase price" field for non-purchaseable parts
 2021-05-17 20:45:06 +10:00
Oliver Walters 64c1503fe4 Disable "purchase price" field for non-purchaseable parts 2021-05-17 20:15:53 +10:00
OliverandGitHub b3206f729e Merge pull request #1591 from matmair/more-copy-info 
More copy info
 2021-05-17 08:52:27 +10:00
OliverandGitHub 980befe0fa Merge pull request #1586 from nwns/feature/show_poline_items_in_admin 
feat(admin): Show the line items on the PO on the Admin Site
 2021-05-15 07:50:53 +10:00
OliverandGitHub 6f10195f8c Merge pull request #1465 from nwns/feature/po_on_sales_order 
Show PO for Stock Items on Sales Order Detail and stock
 2021-05-15 07:49:59 +10:00
OliverandGitHub 310728ead4 Merge pull request #1583 from SchrodingersGat/server-info 
Add debug mode and database backend as info to the "stats" dialog
 2021-05-14 12:56:12 +10:00
Oliver Walters 7deea1ec00 Style fixes 2021-05-14 12:40:42 +10:00
Oliver Walters f76bc5a7b8 Add debug mode and database backend as info to the "stats" dialog 2021-05-14 12:38:38 +10:00
OliverandGitHub 033aa29531 Merge pull request #1580 from matmair/BUG-copy 
fixing bug from refactor
 2021-05-14 07:50:33 +10:00
OliverandGitHub 4e6764f952 Merge pull request #1582 from eeintech/po_upload_duplicate_fix 
Fixed duplicate check for PO file upload
 2021-05-14 07:50:02 +10:00
OliverandGitHub a1fa3315b1 Merge pull request #1579 from SchrodingersGat/report-naming 
Adds a "filename_template" field to reports
 2021-05-13 14:03:30 +10:00
Oliver Walters 82a3d9ca96 Implements custom naming for generated labels 2021-05-13 13:40:40 +10:00
Oliver Walters 6de44a5921 Adds a "filename_template" field to reports 
- Allows users to define the naming scheme for generated reports
- Templated, can use any context variable already available to the report instance
- Adds some more context variables to various reports
 2021-05-13 13:23:51 +10:00
OliverandGitHub 8f6e14193a Merge pull request #1576 from matmair/matmair/issue1574 
copy-btn in all the places
 2021-05-13 10:45:51 +10:00
OliverandGitHub 07c7af1f2e Merge pull request #1569 from SchrodingersGat/docker-dev 
Development docker image
 2021-05-12 22:27:50 +10:00
OliverandGitHub 9d98ecca92 Merge pull request #1561 from eeintech/multi_part_forms 
Multi-step form framework + Purchase order upload file view
 2021-05-12 22:18:35 +10:00
Oliver Walters 719b1775f2 Add entrypoint for running development worker 2021-05-12 22:12:26 +10:00
Oliver Walters 530f28ba95 Fix for running webserver 2021-05-12 21:35:54 +10:00
Oliver Walters 00c5a88383 Split environment variables out into a .env file 
- No need to collect "static" file when we are running in DEBUG mode
 2021-05-12 21:15:53 +10:00
Oliver Walters 3381c5e257 Improvements to development docker-compose script 
- Python packages are installed in a virtual environment within the src dir
- This prevents a LONG installation process each time the docker image is rebuilt
 2021-05-12 20:53:50 +10:00
Oliver Walters 914db9e913 Development docker image 
- Uses multistage build
- Adds a docker compose file for dev
 2021-05-12 19:28:04 +10:00
OliverandGitHub d301794516 Merge pull request #1572 from SchrodingersGat/stock-item-history 
Stock item history
 2021-05-12 10:57:56 +10:00
Oliver Walters 3b252b8409 Record the user when updating stock items 2021-05-12 10:42:09 +10:00
Oliver Walters 30ff48d803 Fixes 2021-05-12 10:09:02 +10:00
Oliver Walters 68b53acbf1 remove old fields from the StockItemTracking model 2021-05-12 08:07:03 +10:00
Oliver Walters 03a231bffb Updates 
- Add StockHistoryCode to custom context
- Add simple form for editing stock item history
- Add tracking entry when stock status is changed
 2021-05-11 23:38:26 +10:00
Oliver Walters 84bfffd5a7 Override 'add_note' when new StockItem is created 
- This allows us to prevent the issue of duplicate notes being created
 2021-05-11 22:51:29 +10:00
Oliver Walters 0c19a94f5c Add run-time addition of extra data to the API 2021-05-11 22:50:58 +10:00
Oliver Walters 93e6eb6dc7 Unit test fixes 2021-05-11 22:26:03 +10:00
Oliver Walters a1203aa1e5 Fixes for unit testing 2021-05-11 21:22:54 +10:00
Oliver Walters 0020e85397 Refactor add_tracking_entry 2021-05-11 20:56:20 +10:00
Oliver Walters 385131137f Extract stock location from legacy stocktracking entry 
- Not 100% accurate - e.g. if the stock location has been altered!
 2021-05-11 20:55:14 +10:00
Oliver Walters ed4da4d338 Improve introspection in migration file 2021-05-11 18:23:29 +10:00
Oliver Walters 725a64c29d Extract more information from legacy tracking data 2021-05-11 18:11:27 +10:00
Oliver Walters 1126e2e110 "Guess" stock history code from recorded title string 2021-05-11 17:41:37 +10:00
Oliver Walters 70ad0ba0de Improve reporting in stock history API 2021-05-11 17:41:17 +10:00
Oliver Walters af53b341f0 Replace "addTrasactionNote" function with "add_tracking_entry" 
- Does not add translated strings to the database
 2021-05-11 17:17:48 +10:00
Oliver Walters 82c6d10c33 Add translateable status codes for StockHistory 2021-05-11 17:12:31 +10:00
OliverandGitHub efec09e9a7 Merge pull request #1571 from SchrodingersGat/clipboard-tweaks 
Trim content when copying to clipboard
 2021-05-11 08:39:14 +10:00
Oliver Walters 6aab704144 Trim content when copying to clipboard 2021-05-10 19:40:54 +10:00
OliverandGitHub c7d625f23e Merge pull request #1565 from matmair/clipboard-ui 
Clipboard UI
 2021-05-10 17:24:31 +10:00
OliverandGitHub fb1dce1357 Merge pull request #1567 from SchrodingersGat/login-redirect 
Login redirect
 2021-05-10 12:56:30 +10:00
Oliver Walters 7e55e343e2 PEP fix 2021-05-10 12:35:19 +10:00
OliverandGitHub 6a08191595 Merge pull request #1564 from matmair/fix-css 
inventree.css cleanup
 2021-05-10 12:34:25 +10:00
Oliver Walters be31154a44 Cleaner implementation 2021-05-10 12:33:49 +10:00
Oliver Walters d9f621c922 Login redirect fix 2021-05-10 12:29:51 +10:00
OliverandGitHub 1f1b0547b0 Merge pull request #1563 from matmair/smal-trans 
just a small translation
 2021-05-09 10:16:57 +10:00
OliverandGitHub e683912561 Merge pull request #1556 from matmair/spaces! 
removes all lines consisting only of spaces
 2021-05-08 20:54:36 +10:00
OliverandGitHub e47a8d6d5e Merge pull request #1545 from matmair/issue1425 
adds sales order line item price
 2021-05-07 23:54:45 +10:00
OliverandGitHub 3511b4adda Merge pull request #1550 from matmair/layout-fix 
Layout fix
 2021-05-06 08:58:08 +10:00
OliverandGitHub ecc9eec084 Merge pull request #1547 from SchrodingersGat/no-wrap 
Disable wrapping for translation files
 2021-05-05 17:54:01 +10:00
Oliver Walters 7a19145be1 Disable wrapping for translation files 
This ensures that the updates pushed back from crowding don't have unnecessary file deltas

Ref: https://docs.djangoproject.com/en/3.2/ref/django-admin/#django-admin-makemessages
 2021-05-05 17:34:35 +10:00
OliverandGitHub 54fb96f239 Merge pull request #1542 from matmair/matmair/issue1513 
adds auto price-update from price-brake to purchase order lines
 2021-05-05 09:22:59 +10:00
OliverandGitHub 6bf4887284 Merge pull request #1544 from matmair/matmair/issue1543 
[BUG] invoke: too many arguments
 2021-05-05 09:18:56 +10:00
OliverandGitHub 5d214fc869 Merge pull request #1535 from eeintech/get_price 
Added support for fractional price and lower price break
 2021-05-01 09:52:21 +10:00
OliverandGitHub 706f3a913d Update README.md 2021-05-01 09:12:36 +10:00
OliverandGitHub 94ff8829f7 Merge pull request #1536 from eeintech/manufacturer_part_api_fix 
API fixes related to ManufacturerPart
 2021-05-01 08:26:32 +10:00
OliverandGitHub ecbea8ca30 Merge pull request #1537 from matmair/credits 
Link for credits in UI and README Closes #1533
 2021-05-01 08:25:17 +10:00
OliverandGitHub c60f4c4f2f Merge pull request #1529 from matmair/matmair/issue1527 
per session user-language settings
 2021-04-30 11:53:39 +10:00
OliverandGitHub 2eafdd53b8 Merge pull request #1530 from eeintech/complete_build_output_fix 
Fixes to create build output form
 2021-04-29 14:56:29 +10:00
OliverandGitHub dd03efe5f2 Merge pull request #1532 from eeintech/purchase_order_fixes 
Purchase order fixes
 2021-04-29 09:48:11 +10:00
OliverandGitHub 28b4e12d8c Merge pull request #1528 from matmair/BUG/polish 
fixed wrong i18n-code for polish
 2021-04-28 22:21:57 +10:00
OliverandGitHub 9feed0dcdc Merge pull request #1522 from eeintech/import_records_fix 
Add owner model to imports ignore list
 2021-04-28 09:01:48 +10:00
OliverandGitHub e6c2252887 Merge pull request #1523 from eeintech/required_parts_build_order 
Updated "Required for Build Orders" API queryset
 2021-04-28 08:57:30 +10:00
OliverandGitHub 2e5be35517 Merge pull request #1525 from matmair/matmair/issue1524 
[BUG] no attribute MPN
 2021-04-28 07:52:17 +10:00
OliverandGitHub 4d2e23f701 Merge pull request #1521 from matmair/matmair/issue1519 
More syntax for adding serial numbers #1519
 2021-04-27 20:43:46 +10:00
OliverandGitHub 90d12a7406 Merge pull request #1517 from SchrodingersGat/import-export-fixes 
Import export fixes
 2021-04-25 12:44:46 +10:00
Oliver Walters 80f11290c9 Remove old command 2021-04-25 12:30:59 +10:00
Oliver Walters 5dbebf37b7 Duplicate import of the same data should *NOT* error out 2021-04-25 12:30:14 +10:00
Oliver Walters f8ec32c3f5 Remove unused include 2021-04-25 12:24:05 +10:00
Oliver Walters b08cd8da20 Remove dbbackup integration 
- Data dumping and restoring is now very complex!
- We should use the invoke export-records function now, rather than relying on dbbackup / dbrestore
- Documentation will be updated to match
 2021-04-25 12:14:36 +10:00
Oliver Walters 2f2354afdc Pre-process json data before importing 
- Removes any unwanted "permissions" entries from data imported from an *older* version of InvenTree
 2021-04-25 12:07:58 +10:00
Oliver Walters b6cfa50e12 Allow data operations to run for 'test' 2021-04-25 11:59:35 +10:00
Oliver Walters f766711838 Add fixture for users / groups 2021-04-25 11:41:48 +10:00
Oliver Walters e13850515d PEP fixes 2021-04-25 11:30:17 +10:00