Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,361 Commits 6 Branches 99 Tags 484 MiB
1da1753b23
Commit Graph

5361 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthias
1da1753b23 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-05-23 02:31:07 +02:00
Oliver
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
Oliver
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
Oliver
efe888056f
Merge pull request #1596 from SchrodingersGat/banner-reworks 
Banner reworks
 2021-05-18 19:34:18 +10:00
Oliver
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
Oliver
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
Oliver
b3206f729e
Merge pull request #1591 from matmair/more-copy-info 
More copy info
 2021-05-17 08:52:27 +10:00
Matthias
cfa6994302 docker-mode in stats 2021-05-16 18:20:32 +02:00
Matthias
ff9970f1cc docker in version copy 2021-05-16 18:20:06 +02:00
Matthias
b2a912c770 docker-mode switch in settings and tags 2021-05-16 18:19:35 +02:00
Matthias
16b7d6c34d database and debug info in version copy 2021-05-16 18:18:58 +02:00
Matthias
6c30d128a1 removing duplicate information 2021-05-16 17:33:24 +02:00
Oliver
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
Oliver
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
Nigel
30a2194fe1
feat(admin): Show the line items on the PO on the Admin Site 2021-05-14 13:24:13 -06:00
Oliver
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
Oliver
033aa29531
Merge pull request #1580 from matmair/BUG-copy 
fixing bug from refactor
 2021-05-14 07:50:33 +10:00
Oliver
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
Matthias
be92efe7b9 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-05-13 22:58:01 +02:00
Nigel
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
eeintech
a64ab5956b Removed leftover print 2021-05-13 16:07:57 -04:00
eeintech
22249206d2 Fixed duplicate check 2021-05-13 16:06:57 -04:00
Matthias
e382f2a57e fixing bug from refactor 2021-05-13 15:46:27 +02:00
Oliver
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
Oliver
8f6e14193a
Merge pull request #1576 from matmair/matmair/issue1574 
copy-btn in all the places
 2021-05-13 10:45:51 +10:00
Matthias
ba3f3108d7 missing translation 2021-05-13 00:21:42 +02:00
Matthias
5077419b68 fewer js-functions 2021-05-13 00:20:51 +02:00
Matthias Mair
b1410c7c2b Merge branch 'inventree:master' into price-history 2021-05-12 23:39:57 +02:00
Matthias
8a8f61c568 functionality for #725 2021-05-12 23:25:39 +02:00
Matthias
0ff7ee21d0 usage of new templates 2021-05-12 15:41:48 +02:00
Matthias
3d574f6a18 templates for mailto and tel - links 2021-05-12 15:41:15 +02:00
Matthias
cdcb6504f9 fixing wrong position 2021-05-12 15:33:49 +02:00
Matthias
f9f191b5e3 Inclusion in all tamplates 
#1574
 2021-05-12 15:31:35 +02:00
Oliver
07c7af1f2e
Merge pull request #1569 from SchrodingersGat/docker-dev 
Development docker image
 2021-05-12 22:27:50 +10:00
Oliver
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