2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-17 04:25:42 +00:00
Commit Graph

5466 Commits

Author SHA1 Message Date
7a175f13a1 Merge branch 'master' of github.com:inventree/InvenTree into bom_items_purchase_price 2021-05-19 13:25:13 -04:00
6c91d067d7 Merge pull request #1598 from SchrodingersGat/fixer-currency-integration
Fixer currency integration
2021-05-18 22:59:14 +10:00
4101e25680 Style fixes 2021-05-18 22:41:57 +10:00
663f5562e8 Schedule a daily task to update currency information 2021-05-18 22:41:26 +10:00
01d444279c Add setting for fixer.io API key 2021-05-18 22:11:24 +10:00
efe888056f Merge pull request #1596 from SchrodingersGat/banner-reworks
Banner reworks
2021-05-18 19:34:18 +10:00
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
7cd345aeb5 Change location of 'banner' messages
- Place them inside the main panel
- Generally underneath the thumbnail
2021-05-18 19:19:43 +10:00
a1c4662e91 Move status messages for stock item 2021-05-18 19:11:37 +10:00
5204567628 Bug fix for stock item tracking API 2021-05-18 19:06:41 +10:00
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
64c1503fe4 Disable "purchase price" field for non-purchaseable parts 2021-05-17 20:15:53 +10:00
b3206f729e Merge pull request #1591 from matmair/more-copy-info
More copy info
2021-05-17 08:52:27 +10:00
cfa6994302 docker-mode in stats 2021-05-16 18:20:32 +02:00
ff9970f1cc docker in version copy 2021-05-16 18:20:06 +02:00
b2a912c770 docker-mode switch in settings and tags 2021-05-16 18:19:35 +02:00
16b7d6c34d database and debug info in version copy 2021-05-16 18:18:58 +02:00
6c30d128a1 removing duplicate information 2021-05-16 17:33:24 +02:00
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
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
5ce262172d Fixed bom_item unit test 2021-05-14 16:59:59 -04:00
e9f41a8357 Currency finding fix 2021-05-14 16:38:30 -04:00
274eb51e48 Added read_only args 2021-05-14 16:29:55 -04:00
1940fd5199 Now processing currencies 2021-05-14 16:16:23 -04:00
30a2194fe1 feat(admin): Show the line items on the PO on the Admin Site 2021-05-14 13:24:13 -06:00
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
7deea1ec00 Style fixes 2021-05-14 12:40:42 +10:00
f76bc5a7b8 Add debug mode and database backend as info to the "stats" dialog 2021-05-14 12:38:38 +10:00
033aa29531 Merge pull request #1580 from matmair/BUG-copy
fixing bug from refactor
2021-05-14 07:50:33 +10:00
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
68f5ec8b6a Added currency conversion 2021-05-13 17:09:52 -04:00
be92efe7b9 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-05-13 22:58:01 +02:00
bca2f4a07b feat(sales_order): Stock Items show the PO number
Stock items show the PO number that they were purchased on when being
viewed in the sales order allocation modal and when viewing the sales
order details.
2021-05-13 14:18:25 -06:00
32d0f3039d Obviously new float fields should be read-only... 2021-05-13 16:17:45 -04:00
a64ab5956b Removed leftover print 2021-05-13 16:07:57 -04:00
22249206d2 Fixed duplicate check 2021-05-13 16:06:57 -04:00
f2e9f58f1b Added purchase price range and average to BOM items/view 2021-05-13 15:47:42 -04:00
e382f2a57e fixing bug from refactor 2021-05-13 15:46:27 +02:00
a1fa3315b1 Merge pull request #1579 from SchrodingersGat/report-naming
Adds a "filename_template" field to reports
2021-05-13 14:03:30 +10:00
82a3d9ca96 Implements custom naming for generated labels 2021-05-13 13:40:40 +10:00
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
8f6e14193a Merge pull request #1576 from matmair/matmair/issue1574
copy-btn in all the places
2021-05-13 10:45:51 +10:00
ba3f3108d7 missing translation 2021-05-13 00:21:42 +02:00
5077419b68 fewer js-functions 2021-05-13 00:20:51 +02:00
b1410c7c2b Merge branch 'inventree:master' into price-history 2021-05-12 23:39:57 +02:00
8a8f61c568 functionality for #725 2021-05-12 23:25:39 +02:00
0ff7ee21d0 usage of new templates 2021-05-12 15:41:48 +02:00
3d574f6a18 templates for mailto and tel - links 2021-05-12 15:41:15 +02:00
cdcb6504f9 fixing wrong position 2021-05-12 15:33:49 +02:00
f9f191b5e3 Inclusion in all tamplates
#1574
2021-05-12 15:31:35 +02:00