2
0
mirror of https://github.com/inventree/InvenTree.git synced 2026-05-14 05:27:34 +00:00

Commit Graph

  • 413fa2e842 merging in sidebar icon changes fr upstream matmair 2021-06-06 17:50:13 +02:00
  • 5a869d247f Merge branch 'master' of https://github.com/inventree/InvenTree into part-import matmair 2021-06-06 17:46:33 +02:00
  • d70b4bcabb refactor matmair 2021-06-06 17:44:02 +02:00
  • 4f7edac213 back button matmair 2021-06-06 17:43:16 +02:00
  • a535f8df42 hide scrollbar if not needed matmair 2021-06-06 16:40:51 +02:00
  • 63cbcde4c1 Fix: New translations django.po from Crowdin Oliver 2021-06-07 00:38:35 +10:00
  • e861a0e417 Fix: New translations django.po from Crowdin Oliver 2021-06-07 00:38:34 +10:00
  • b0522ee439 Fix: New translations django.po from Crowdin Oliver 2021-06-07 00:38:32 +10:00
  • ac906ce608 Fix: New translations django.po from Crowdin Oliver 2021-06-07 00:38:31 +10:00
  • d4f30d4f4c Fix: New translations django.po from Crowdin Oliver 2021-06-07 00:38:30 +10:00
  • 5e98d912c2 Fix: New translations django.po from Crowdin Oliver 2021-06-07 00:38:29 +10:00
  • 7206930e20 Fix: New translations django.po from Crowdin Oliver 2021-06-07 00:38:28 +10:00
  • 989d40eafd Fix: New translations django.po from Crowdin Oliver 2021-06-07 00:38:26 +10:00
  • c02ed78eb5 Fix: New translations django.po from Crowdin Oliver 2021-06-07 00:38:25 +10:00
  • a2a2c61e31 refactor and fix rendering on error matmair 2021-06-06 16:36:01 +02:00
  • 7439f72ab1 hide error messagre on error matmair 2021-06-06 16:33:19 +02:00
  • 5e6919f14e hide error message matmair 2021-06-06 16:32:46 +02:00
  • d756289efe updated translation base github-actions[bot] 2021-06-06 14:31:22 +00:00
  • 4f18db181d updated translation base github-actions[bot] 2021-06-06 14:14:32 +00:00
  • ded68bb4f6 change titel with modal submit matmair 2021-06-06 16:09:51 +02:00
  • 35451248c2 reseting modal on open matmair 2021-06-06 15:25:56 +02:00
  • fcf360f2a3 clearer information text? as in #1577 matmair 2021-06-06 14:33:26 +02:00
  • 992cf57064 Merge remote-tracking branch 'inventree/master' Oliver 2021-06-06 22:29:15 +10:00
  • 36ff21f11e hide supply part price on start matmair 2021-06-06 14:21:08 +02:00
  • ced7768030 calculate button added matmair 2021-06-06 14:20:30 +02:00
  • 534fd491c1 Merge pull request #1637 from SchrodingersGat/lib-update Oliver 2021-06-07 00:30:03 +10:00
  • d2e35426c2 Merge pull request #1636 from SchrodingersGat/l10-merge Oliver 2021-06-07 00:13:18 +10:00
  • 172700da10 Update django-import-export to 2.5.0 Oliver 2021-06-07 00:12:52 +10:00
  • 5377d860f4 Merge remote-tracking branch 'inventree/master' into l10-merge Oliver 2021-06-06 22:27:27 +10:00
  • 62682c686b Merge pull request #1629 from inventree/l10_crowdin Oliver 2021-06-06 22:21:35 +10:00
  • e977be9c1b Merge pull request #1630 from inventree/dependabot/pip/django-3.2.1 Oliver 2021-06-06 22:20:47 +10:00
  • 573f601752 Merge pull request #1632 from matmair/nav-style Oliver 2021-06-06 22:14:20 +10:00
  • 8301eb3be3 Merge pull request #1633 from matmair/money-format Oliver 2021-06-06 22:12:55 +10:00
  • 06d3489ede fix: added ruleset matmair 2021-06-05 18:06:26 +02:00
  • 81f00753c6 style matmair 2021-06-05 17:24:04 +02:00
  • 0bac7ebf3e styling matmair 2021-06-05 17:18:46 +02:00
  • 768080f9a0 Adding internal functions to use internal prices matmair 2021-06-05 17:06:58 +02:00
  • 0d93c96f2a adding internal price breaks as in #1606 matmair 2021-06-05 17:01:49 +02:00
  • 05d79a4c19 same nav sidebar distance for everything matmair 2021-06-05 15:18:08 +02:00
  • 44717b646f using new tag for currency matmair 2021-06-05 15:07:42 +02:00
  • 0eff7d000a added tag to replace dynamic setting matmair 2021-06-05 15:05:05 +02:00
  • 691142ea4c fixing currency display matmair 2021-06-05 13:27:39 +02:00
  • d87592aedb use the default currency in forms matmair 2021-06-05 13:22:11 +02:00
  • daf3d06cf0 added in optional matches matmair 2021-06-05 01:19:12 +02:00
  • 7d7e518c1b Bump django from 3.2 to 3.2.1 dependabot[bot] 2021-06-04 21:37:26 +00:00
  • 74bd975a0b Revert back to form_list Moved OrderMatchItemForm to forms.py eeintech 2021-06-04 13:41:07 -04:00
  • 3e9adec4ff Fix: New translations django.po from Crowdin Oliver 2021-06-04 03:03:42 +10:00
  • 6f3593220a Fix: New translations django.po from Crowdin Oliver 2021-06-04 02:08:23 +10:00
  • f0a1cca914 Fix: New translations django.po from Crowdin Oliver 2021-06-03 14:40:53 +10:00
  • 4af74a5ba5 Fix: New translations django.po from Crowdin Oliver 2021-06-03 09:52:21 +10:00
  • 92f77b6bbb Merge pull request #1627 from eeintech/price_break_sort_fix Oliver 2021-06-03 09:18:49 +10:00
  • 625d868a3f fix for form_list matmair 2021-06-03 00:29:24 +02:00
  • fc9e1e6770 suggested changes @eeintech matmair 2021-06-03 00:17:29 +02:00
  • 2948cf5671 Fix: New translations django.po from Crowdin Oliver 2021-06-03 05:11:59 +10:00
  • 3b6aba7153 Fix: New translations django.po from Crowdin Oliver 2021-06-03 04:12:58 +10:00
  • 69ed180034 Fix: New translations django.po from Crowdin Oliver 2021-06-03 03:15:00 +10:00
  • 7b1bd87d84 Merge remote-tracking branch 'inventree/l10_crowdin' into l10 Oliver 2021-06-02 22:58:34 +10:00
  • 1f6fc5eb1a Merge remote-tracking branch 'inventree/master' Oliver 2021-06-02 18:53:52 +10:00
  • 7df72f09f4 Fix: New translations django.po from Crowdin Oliver 2021-06-02 09:57:53 +10:00
  • 56afcfa91f Fix: New translations django.po from Crowdin Oliver 2021-06-02 08:50:33 +10:00
  • 75cdec81ae style fix matmair 2021-06-02 00:39:38 +02:00
  • 495babe712 Merge branch 'master' of https://github.com/inventree/InvenTree into part-import matmair 2021-06-02 00:36:15 +02:00
  • 3c384947b2 spaces cleanup matmair 2021-06-02 00:26:30 +02:00
  • ee582a5490 fixes the problem reported by @eeintech ? matmair 2021-06-02 00:21:01 +02:00
  • ffaa6ee3a9 Fixed price break row actions after sorting eeintech 2021-06-01 14:22:00 -04:00
  • 61af4ca1b3 Fix: New translations django.po from Crowdin Oliver 2021-06-01 20:22:45 +10:00
  • ddf1f5c5ba Fix: New translations django.po from Crowdin Oliver 2021-06-01 20:22:43 +10:00
  • 1a3943fd7c Fix: New translations django.po from Crowdin Oliver 2021-06-01 20:22:42 +10:00
  • 3df5ef5676 Fix: New translations django.po from Crowdin Oliver 2021-06-01 20:22:40 +10:00
  • 235b2632ed Fix: New translations django.po from Crowdin Oliver 2021-06-01 20:22:39 +10:00
  • a4d63ad9b0 Fix: New translations django.po from Crowdin Oliver 2021-06-01 20:22:37 +10:00
  • 85a0cd84d4 Fix: New translations django.po from Crowdin Oliver 2021-06-01 20:22:36 +10:00
  • feb1b47f93 Fix: New translations django.po from Crowdin Oliver 2021-06-01 20:22:34 +10:00
  • f9b5f78716 Fix: New translations django.po from Crowdin Oliver 2021-06-01 20:22:33 +10:00
  • 60752d2619 updated translation base github-actions[bot] 2021-06-01 10:08:09 +00:00
  • 720184790e Merge pull request #1626 from SchrodingersGat/bom-allow-variants Oliver 2021-06-01 20:07:03 +10:00
  • b31796cbeb Simplified "installed_in" table Oliver Walters 2021-06-01 16:40:02 +10:00
  • ee9df039cb allocatedItems function now takes variants into account Oliver Walters 2021-06-01 16:19:24 +10:00
  • 9baf856d75 Fixes for build item allocation rendering Oliver Walters 2021-06-01 16:14:26 +10:00
  • ab16e1efc3 Custom migration to find BomItem / BuildItem links where they exist Oliver Walters 2021-06-01 15:39:21 +10:00
  • 7578cab9a8 Add 'bom_item' field to BuildItem model Oliver Walters 2021-06-01 15:25:39 +10:00
  • 9f407df15a Update BOM table display Oliver Walters 2021-06-01 14:17:31 +10:00
  • 0bd0e57f16 BomList can be filtered by "allow_variants" flag Oliver Walters 2021-06-01 14:03:21 +10:00
  • 5c71f04360 Add "allow_variants" field to BomItem Oliver Walters 2021-06-01 13:59:01 +10:00
  • bd83888717 Fix: New translations django.po from Crowdin Oliver 2021-06-01 10:20:41 +10:00
  • beae6c55e8 Fix: New translations django.po from Crowdin Oliver 2021-06-01 09:15:10 +10:00
  • f0354a90fe Fix: New translations django.po from Crowdin Oliver 2021-06-01 09:15:09 +10:00
  • cc2192aed5 Fix: New translations django.po from Crowdin Oliver 2021-06-01 09:15:08 +10:00
  • 96f6152f91 Fix: New translations django.po from Crowdin Oliver 2021-06-01 09:15:06 +10:00
  • 9ceb6353c8 Fix: New translations django.po from Crowdin Oliver 2021-06-01 09:15:05 +10:00
  • 49abacdc86 Fix: New translations django.po from Crowdin Oliver 2021-06-01 09:15:04 +10:00
  • 9dceba77bc Fix: New translations django.po from Crowdin Oliver 2021-06-01 09:15:03 +10:00
  • 416e69bdc5 Fix: New translations django.po from Crowdin Oliver 2021-06-01 09:15:02 +10:00
  • c2fb582a4e Fix: New translations django.po from Crowdin Oliver 2021-06-01 09:15:00 +10:00
  • 19e48708d0 updated translation base github-actions[bot] 2021-05-31 22:53:08 +00:00
  • 96624d1175 Merge pull request #1625 from SchrodingersGat/parent-node-fixes Oliver 2021-06-01 08:48:57 +10:00
  • 0375d5b940 Specify a unique parent node that cannot shadow an existing pk Oliver Walters 2021-06-01 08:30:50 +10:00
  • ba1d283e64 Fix: New translations django.po from Crowdin Oliver 2021-06-01 08:16:19 +10:00
  • 76059a4694 Fix: New translations django.po from Crowdin Oliver 2021-05-31 17:32:26 +10:00
  • 4e4bcd5b65 Fix: New translations django.po from Crowdin Oliver 2021-05-31 17:32:25 +10:00