Oliver
|
5377d860f4
|
Merge remote-tracking branch 'inventree/master' into l10-merge
# Conflicts:
# InvenTree/locale/de/LC_MESSAGES/django.po
# InvenTree/locale/en/LC_MESSAGES/django.po
# InvenTree/locale/es/LC_MESSAGES/django.po
# InvenTree/locale/fr/LC_MESSAGES/django.po
# InvenTree/locale/it/LC_MESSAGES/django.po
# InvenTree/locale/ja/LC_MESSAGES/django.po
# InvenTree/locale/pl/LC_MESSAGES/django.po
# InvenTree/locale/ru/LC_MESSAGES/django.po
# InvenTree/locale/tr/LC_MESSAGES/django.po
# InvenTree/locale/zh/LC_MESSAGES/django.po
|
2021-06-06 22:27:27 +10:00 |
|
Oliver
|
62682c686b
|
Merge pull request #1629 from inventree/l10_crowdin
New Crowdin updates
|
2021-06-06 22:21:35 +10:00 |
|
|
|
36ff21f11e
|
hide supply part price on start
|
2021-06-06 14:21:08 +02:00 |
|
Oliver
|
e977be9c1b
|
Merge pull request #1630 from inventree/dependabot/pip/django-3.2.1
Bump django from 3.2 to 3.2.1
|
2021-06-06 22:20:47 +10:00 |
|
|
|
ced7768030
|
calculate button added
|
2021-06-06 14:20:30 +02:00 |
|
Oliver
|
573f601752
|
Merge pull request #1632 from matmair/nav-style
same nav sidebar distance for everything
|
2021-06-06 22:14:20 +10:00 |
|
Oliver
|
8301eb3be3
|
Merge pull request #1633 from matmair/money-format
Money format
|
2021-06-06 22:12:55 +10:00 |
|
|
|
06d3489ede
|
fix: added ruleset
|
2021-06-05 18:06:26 +02:00 |
|
|
|
81f00753c6
|
style
|
2021-06-05 17:24:04 +02:00 |
|
|
|
0bac7ebf3e
|
styling
|
2021-06-05 17:18:46 +02:00 |
|
|
|
768080f9a0
|
Adding internal functions to use internal prices
|
2021-06-05 17:06:58 +02:00 |
|
|
|
0d93c96f2a
|
adding internal price breaks as in #1606
|
2021-06-05 17:01:49 +02:00 |
|
|
|
05d79a4c19
|
same nav sidebar distance for everything
|
2021-06-05 15:18:08 +02:00 |
|
|
|
44717b646f
|
using new tag for currency
|
2021-06-05 15:07:42 +02:00 |
|
|
|
0eff7d000a
|
added tag to replace dynamic setting
|
2021-06-05 15:05:05 +02:00 |
|
|
|
691142ea4c
|
fixing currency display
|
2021-06-05 13:27:39 +02:00 |
|
|
|
d87592aedb
|
use the default currency in forms
|
2021-06-05 13:22:11 +02:00 |
|
dependabot[bot]
|
7d7e518c1b
|
Bump django from 3.2 to 3.2.1
Bumps [django](https://github.com/django/django) from 3.2 to 3.2.1.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2...3.2.1)
---
updated-dependencies:
- dependency-name: django
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2021-06-04 21:37:26 +00:00 |
|
Oliver
|
3e9adec4ff
|
Fix: New translations django.po from Crowdin
|
2021-06-04 03:03:42 +10:00 |
|
Oliver
|
6f3593220a
|
Fix: New translations django.po from Crowdin
|
2021-06-04 02:08:23 +10:00 |
|
Oliver
|
f0a1cca914
|
Fix: New translations django.po from Crowdin
|
2021-06-03 14:40:53 +10:00 |
|
Oliver
|
4af74a5ba5
|
Fix: New translations django.po from Crowdin
|
2021-06-03 09:52:21 +10:00 |
|
Oliver
|
92f77b6bbb
|
Merge pull request #1627 from eeintech/price_break_sort_fix
Fixed price break row actions after sorting
|
2021-06-03 09:18:49 +10:00 |
|
Oliver
|
2948cf5671
|
Fix: New translations django.po from Crowdin
|
2021-06-03 05:11:59 +10:00 |
|
Oliver
|
3b6aba7153
|
Fix: New translations django.po from Crowdin
|
2021-06-03 04:12:58 +10:00 |
|
Oliver
|
69ed180034
|
Fix: New translations django.po from Crowdin
|
2021-06-03 03:15:00 +10:00 |
|
Oliver
|
7b1bd87d84
|
Merge remote-tracking branch 'inventree/l10_crowdin' into l10
# Conflicts:
# InvenTree/locale/de/LC_MESSAGES/django.po
# InvenTree/locale/es/LC_MESSAGES/django.po
# InvenTree/locale/fr/LC_MESSAGES/django.po
# InvenTree/locale/it/LC_MESSAGES/django.po
# InvenTree/locale/ja/LC_MESSAGES/django.po
# InvenTree/locale/pl/LC_MESSAGES/django.po
# InvenTree/locale/ru/LC_MESSAGES/django.po
# InvenTree/locale/tr/LC_MESSAGES/django.po
# InvenTree/locale/zh/LC_MESSAGES/django.po
|
2021-06-02 22:58:34 +10:00 |
|
Oliver
|
7df72f09f4
|
Fix: New translations django.po from Crowdin
|
2021-06-02 09:57:53 +10:00 |
|
Oliver
|
56afcfa91f
|
Fix: New translations django.po from Crowdin
|
2021-06-02 08:50:33 +10:00 |
|
eeintech
|
ffaa6ee3a9
|
Fixed price break row actions after sorting
|
2021-06-01 14:22:00 -04:00 |
|
Oliver
|
61af4ca1b3
|
Fix: New translations django.po from Crowdin
|
2021-06-01 20:22:45 +10:00 |
|
Oliver
|
ddf1f5c5ba
|
Fix: New translations django.po from Crowdin
|
2021-06-01 20:22:43 +10:00 |
|
Oliver
|
1a3943fd7c
|
Fix: New translations django.po from Crowdin
|
2021-06-01 20:22:42 +10:00 |
|
Oliver
|
3df5ef5676
|
Fix: New translations django.po from Crowdin
|
2021-06-01 20:22:40 +10:00 |
|
Oliver
|
235b2632ed
|
Fix: New translations django.po from Crowdin
|
2021-06-01 20:22:39 +10:00 |
|
Oliver
|
a4d63ad9b0
|
Fix: New translations django.po from Crowdin
|
2021-06-01 20:22:37 +10:00 |
|
Oliver
|
85a0cd84d4
|
Fix: New translations django.po from Crowdin
|
2021-06-01 20:22:36 +10:00 |
|
Oliver
|
feb1b47f93
|
Fix: New translations django.po from Crowdin
|
2021-06-01 20:22:34 +10:00 |
|
Oliver
|
f9b5f78716
|
Fix: New translations django.po from Crowdin
|
2021-06-01 20:22:33 +10:00 |
|
github-actions[bot]
|
60752d2619
|
updated translation base
|
2021-06-01 10:08:09 +00:00 |
|
Oliver
|
720184790e
|
Merge pull request #1626 from SchrodingersGat/bom-allow-variants
[Feature] Support BOM items which can allow use of variant stock
|
2021-06-01 20:07:03 +10:00 |
|
Oliver Walters
|
b31796cbeb
|
Simplified "installed_in" table
|
2021-06-01 16:40:02 +10:00 |
|
Oliver Walters
|
ee9df039cb
|
allocatedItems function now takes variants into account
|
2021-06-01 16:19:24 +10:00 |
|
Oliver Walters
|
9baf856d75
|
Fixes for build item allocation rendering
|
2021-06-01 16:14:26 +10:00 |
|
Oliver Walters
|
ab16e1efc3
|
Custom migration to find BomItem / BuildItem links where they exist
|
2021-06-01 15:39:21 +10:00 |
|
Oliver Walters
|
7578cab9a8
|
Add 'bom_item' field to BuildItem model
- Required to link the build to the output in case of variant stock
|
2021-06-01 15:25:39 +10:00 |
|
Oliver Walters
|
9f407df15a
|
Update BOM table display
|
2021-06-01 14:17:31 +10:00 |
|
Oliver Walters
|
0bd0e57f16
|
BomList can be filtered by "allow_variants" flag
|
2021-06-01 14:03:21 +10:00 |
|
Oliver Walters
|
5c71f04360
|
Add "allow_variants" field to BomItem
|
2021-06-01 13:59:01 +10:00 |
|
Oliver
|
bd83888717
|
Fix: New translations django.po from Crowdin
|
2021-06-01 10:20:41 +10:00 |
|
