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
7,245 Commits 6 Branches 99 Tags 484 MiB
69437220ce
Commit Graph

7245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthias
0bac7ebf3e styling 2021-06-05 17:18:46 +02:00
Matthias
768080f9a0 Adding internal functions to use internal prices 2021-06-05 17:06:58 +02:00
Matthias
0d93c96f2a adding internal price breaks as in #1606 2021-06-05 17:01:49 +02:00
Matthias
05d79a4c19 same nav sidebar distance for everything 2021-06-05 15:18:08 +02:00
Matthias
44717b646f using new tag for currency 2021-06-05 15:07:42 +02:00
Matthias
0eff7d000a added tag to replace dynamic setting 2021-06-05 15:05:05 +02:00
Matthias
691142ea4c fixing currency display 2021-06-05 13:27:39 +02:00
Matthias
d87592aedb use the default currency in forms 2021-06-05 13:22:11 +02:00
Matthias
daf3d06cf0 added in optional matches 2021-06-05 01:19:12 +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
eeintech
74bd975a0b Revert back to form_list 
Moved OrderMatchItemForm to forms.py
 2021-06-04 13:41:07 -04: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
Matthias
625d868a3f fix for form_list 2021-06-03 00:29:24 +02:00
Matthias
fc9e1e6770 suggested changes @eeintech 2021-06-03 00:17:29 +02: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
1f6fc5eb1a Merge remote-tracking branch 'inventree/master' 2021-06-02 18:53:52 +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
Matthias
75cdec81ae style fix 2021-06-02 00:39:38 +02:00
Matthias
495babe712 Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-02 00:36:15 +02:00
Matthias
3c384947b2 spaces cleanup 2021-06-02 00:26:30 +02:00
Matthias
ee582a5490 fixes the problem reported by @eeintech ? 2021-06-02 00:21:01 +02: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