inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-11-04 07:05:41 +00:00
Code Activity
6,421 Commits 6 Branches 136 Tags
4600b0d33732f6442c1ae1970131ee7b61c8c7e4
Commit Graph

6421 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthias
62638f76ed fixing wrong page title 2021-06-07 04:00:12 +02:00
Matthias
6ae9fa716c added internal price to part_pricing 2021-06-07 00:19:37 +02:00
Matthias
27282c8049 Merge branch 'master' of https://github.com/inventree/InvenTree into internal-price 2021-06-06 18:15:41 +02:00
Matthias
413fa2e842 merging in sidebar icon changes fr upstream 2021-06-06 17:50:13 +02:00
Matthias
5a869d247f Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-06 17:46:33 +02:00
Matthias
d70b4bcabb refactor 2021-06-06 17:44:02 +02:00
Matthias
4f7edac213 back button 2021-06-06 17:43:16 +02:00
Matthias
a535f8df42 hide scrollbar if not needed 2021-06-06 16:40:51 +02:00
Matthias
a2a2c61e31 refactor and fix rendering on error 2021-06-06 16:36:01 +02:00
Matthias
7439f72ab1 hide error messagre on error 2021-06-06 16:33:19 +02:00
Matthias
5e6919f14e hide error message 2021-06-06 16:32:46 +02:00
Oliver
534fd491c1 Merge pull request #1637 from SchrodingersGat/lib-update 
Update django-import-export to 2.5.0
 2021-06-07 00:30:03 +10:00
Oliver
d2e35426c2 Merge pull request #1636 from SchrodingersGat/l10-merge 
L10 merge
 2021-06-07 00:13:18 +10:00
Oliver
172700da10 Update django-import-export to 2.5.0 
- Fixes an export error introduced after updating to latest django
 2021-06-07 00:12:52 +10:00
Matthias
ded68bb4f6 change titel with modal submit 2021-06-06 16:09:51 +02:00
Matthias
35451248c2 reseting modal on open 2021-06-06 15:25:56 +02:00
Matthias
fcf360f2a3 clearer information text? as in #1577 2021-06-06 14:33:26 +02:00
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
Matthias
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
Matthias
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
Matthias
06d3489ede fix: added ruleset 2021-06-05 18:06:26 +02:00
Matthias
81f00753c6 style 2021-06-05 17:24:04 +02:00
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
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