matmair / InvenTree

89%

master: 84%

LAST BUILD ON BRANCH platform-ui_base

branch: platform-ui_base

CHANGE BRANCH

x

Reset

Sync Branches

• platform-ui_base
• 2284
• 3rdparty-info
• BUG-copy
• BUG/calender
• BUG/decimal
• BUG/polish
• OSSF_score
• __retire-fix-for-1628
• __retire__fix-for-1628
• __retire__one-pricing
• __retire__show-order-price
• __retire__so-price-and-validation
• __retire_fix-base-currency
• __retire_matmair/issue2210
• __test_mfa/webauthn
• _fork_shared-company-reference
• abc
• add-badge
• add-bleach
• add-changelog
• add-formatters
• add-report-check
• add-translations
• added-state-transitions
• adjust-dependabot
• allocated-sort-qty
• allow-no-icon
• api-mixin
• auth
• auto-update
• auto_trans
• azure-pipelines
• bandit
• bashscript-update
• bleach
• bom-internal
• bom-pricing
• bpm-purchase-price
• bug-timezone-waning
• bump-deps
• bump-deps-0.12
• bump-ruff
• bump-weasy
• bumps
• check-branching
• check-improvements
• check-spelling
• ci-docstring
• ci-format
• ci-only-in-inventree
• ci-reformat
• ci-updates
• clipboard-ui
• code-fix
• codebase-cleanup
• cov-use-xml
• coverage
• coverage-adaption
• coverage-changes
• coverage-fix
• coverage-fixes
• coverage-to-setup
• create_tests_in_seperate_folder
• credits
• currency-migration-change
• custom-states
• dead-code-owner
• deb12
• debug-i18n_static
• deepsource-autofix-0233536a
• deepsource-autofix-bd3e5c3c
• deepsource-autofix-d5bf8b4b
• deepsource-coverage
• deepsource_add
• dep-bump
• dep-update
• dependabot/npm_and_yarn/src/backend/InvenTree/InvenTree/static/script/jquery-ui/grunt-1.5.3
• dependabot/npm_and_yarn/src/frontend/follow-redirects-1.15.6
• dependabot/npm_and_yarn/src/frontend/vite-4.5.2
• dependabot/pip/cryptography-42.0.0
• dependabot/pip/cryptography-42.0.4
• dependabot/pip/django-3.2.12
• dependabot/pip/django-3.2.13
• dependabot/pip/django-3.2.5
• dependabot/pip/django-4.2.10
• dependabot/pip/django-4.2.11
• dependabot/pip/jinja2-3.1.3
• dependabot/pip/pillow-10.2.0
• dependabot/pip/pillow-8.3.2
• dependabot/pip/pillow-9.0.0
• dependabot/pip/pillow-9.0.1
• dependabot/pip/pillow-9.1.1
• dependabot/pip/src/backend/cryptography-41.0.4
• depleted-stock
• deploy
• deploy-test
• dev-codescan
• dev-codesec
• devOps
• dev_vendor-files
• devel-env
• devops-isort
• devtool-update
• dio
• disable-broken-views
• disable-codeowners
• display-serial
• dj-4.x
• dj-paths
• doc-update
• docker-cleanup
• docker-tests
• docs-security-commitment
• docupdates
• email-warning
• exchange-rate-emergency-fix
• expose-api-version-string
• extend-build-order
• extend-reference
• faster-tests
• feature/js_translation
• feature/performance-op
• feature/price-history
• feature/translation-action
• feature/translations
• filter_duplication
• fix-actions
• fix-anguage
• fix-anon-static
• fix-api-generation
• fix-attachment
• fix-autoinstaller
• fix-base-currency
• fix-boolean
• fix-cli-22.04
• fix-css
• fix-date-formats
• fix-django-vul
• fix-eeintech
• fix-email-settingins
• fix-for-1628
• fix-for-1678
• fix-for-1775
• fix-for-1888
• fix-for-1986
• fix-for-2004
• fix-gitpod
• fix-html-tag
• fix-html-tags
• fix-is_ajax
• fix-new-manifest-path
• fix-password-change
• fix-plugin-links
• fix-po_so-name
• fix-price-breaksfilters
• fix-provider-signup
• fix-set_user
• fix-settings-fnc
• fix-sso-signup
• fix-startup
• fix-style
• fix-tag
• fix-test-cfg-file
• fix-time-handeling
• fix-todos
• fix-tooltip-linebreak
• fix-translate
• fix-translation-perm
• fix-whitespace-paths
• fr-1421-sso
• fully-remove-deepsource-cov
• gitpod
• hide-related
• homepage-settings
• housekeeping
• html-code-smells
• human-readable-cur
• improve-cli-experience
• improve-devdocs
• initial-amount
• inline-dev
• inline-dev-docs
• installer-fix
• instance-name-in-title
• internal-price
• internal-price-op
• issue1425
• issue3358
• issue3530
• l10_base
• l10n
• l10n_l10_base
• l10n_maser
• l10n_master
• l10n_master2
• l10n_test
• l10n_tranlated
• l10n_trans
• l10n_translated
• label-printing-unit-test
• layout-fix
• load-minified-fa
• locate-coverage
• make-mixins.discoverable
• make-plugin-tests-faster
• master
• matmair-patch-1
• matmair-patch-2
• matmair-plattform
• matmair/issue1438
• matmair/issue1484
• matmair/issue1513
• matmair/issue1519
• matmair/issue1524
• matmair/issue1527
• matmair/issue1543
• matmair/issue1574
• matmair/issue1693
• matmair/issue1697
• matmair/issue2042
• matmair/issue2181
• matmair/issue2201
• matmair/issue2210
• matmair/issue2213
• matmair/issue2250
• matmair/issue2257
• matmair/issue2278
• matmair/issue2279
• matmair/issue2284
• matmair/issue2301
• matmair/issue2327
• matmair/issue2331
• matmair/issue2335
• matmair/issue2347
• matmair/issue2353
• matmair/issue2385
• matmair/issue2400
• matmair/issue2403
• matmair/issue2501
• matmair/issue2519
• matmair/issue2524
• matmair/issue2585
• matmair/issue2652
• matmair/issue2663
• matmair/issue2670
• matmair/issue2672
• matmair/issue2681
• matmair/issue2694
• matmair/issue2742
• matmair/issue2756
• matmair/issue2788
• matmair/issue2980
• matmair/issue2989
• matmair/issue2992
• matmair/issue2996
• matmair/issue3005
• matmair/issue3157
• matmair/issue3196
• matmair/issue3226
• matmair/issue3359
• matmair/issue3367
• matmair/issue3411
• matmair/issue3418
• matmair/issue3464
• matmair/issue3477
• matmair/issue3520
• matmair/issue3531
• matmair/issue3546
• matmair/issue3549
• matmair/issue3558
• matmair/issue3722
• matmair/issue3907
• matmair/issue3978
• matmair/issue4175
• matmair/issue4182
• matmair/issue4184
• matmair/issue4428
• matmair/issue4473
• matmair/issue4560
• matmair/issue4616
• matmair/issue4672
• matmair/issue4719
• matmair/issue4729
• matmair/issue4730
• matmair/issue4942
• matmair/issue4965
• matmair/issue5578
• matmair/issue5729
• matmair/issue5746
• matmair/issue5748
• matmair/issue5753
• matmair/issue6208
• matmair/issue6269
• matmair/issue6281
• matmair/issue6282
• matmair/issue6285
• matmair/issue6391
• matmair/issue6531
• matmair/issue83
• mfa-change
• mfa/webauthn
• missing-new-line
• modal-options
• money-format
• money-update
• more-copy-info
• more-cov
• more-templatetags
• multi_part_forms
• multiple-admin-btn
• nav-style
• new-readme
• news-reader
• next-btn-leadingzero
• not-working-tests
• notification-new-order
• onboarding-group
• one-pricing
• one-pricing-view
• order-modal-show-price
• order-notifications
• package-logs
• packages-force3.9
• paralell
• part-import
• part-table-cat-sort
• patch-1
• path-aintian-scores
• pathlib
• pipeline
• plattform
• plugin-2037
• plugin-advanced-reload
• plugin-api-refactor
• plugin-app-refactor
• plugin-install
• plugin-mark-sample
• plugin-meta
• plugin-meta-testing
• plugin-mixin-api
• plugin-registry
• plugin-trigger
• plugin-updates
• po-total
• pr/30350n/5509
• pr/ChristianSchindler/6305
• pr/rocheparadox/2138
• pr1600
• prep_readme
• price-history
• price-reload
• price-terms
• pricing-more-info
• pricing-reformat
• protected-settings
• pui-AboutInvenTree-modal
• pui-ServerInfo-modal
• pui-add-coverage
• pui-add-user-mgmt
• pui-licenses-text
• pui-more-rests
• pui-optimize-bundle
• pui-remplate-helpers
• pui-seperate-cui-logic
• pui-settings-unification
• pui-sign-in-behaviour
• pui-test-coverage
• pui-testing-add
• pui-url-fixes
• purchase-price-zero
• qc-build
• reduce-vertical-space
• refactor-file-lookup
• refactor-labels
• refactor-states
• refactor-typecasting
• remove-breadrcumb-space
• remove-cui
• remove-dead-code
• remove-old-tag
• remove-os-usage
• remove-signaturs
• remove-unneeded-gunicorn
• restruc-oneliner
• s3-storage
• sample/badges
• save-lb
• save2284
• search-autocomplete
• sec-svg-xss
• sentry
• settings-safety
• settings-typ
• show-order-price
• smal-trans
• small-code-fixes
• small-fixes
• small-python-fixes-plugin
• sn-append
• snyk-fix-28849ed9a6b58f04c2f9e1d789dd3540
• snyk-fix-4d163e2e5820e49b72446434bc8c8d55
• snyk-fix-db318e2024b60b91ad75bc3c59d9b941
• snyk-fix-fc3a0235542c6198ce8cd000fd53d220
• snyk-upgrade-347dcab413830fd42abe4e03db086f53
• snyk-upgrade-695e5685dea72ec1b1e76f7c179a4be7
• snyk-upgrade-90ab03050dbb2386a4fb8f4c8768ceb9
• snyk-upgrade-b139ce4749dbe734b055b4d5243a3806
• snyk-upgrade-d5e6e6efc9fdeea52b5c92b309f57a21
• snyk-upgrade-f63bd3f6019a978997adfff9395a9545
• so-total
• so_fix_clean
• sonar
• sonarcloud
• spaces!
• split-requirements
• stale
• stock-history
• stock-next-prev
• stock-taable-fix
• stock-table-has-price
• stock-table-supplier-part
• style-fix
• style-fixes
• suggested_fixes_4824
• supplier-integration
• switch-to-enum
• task-restructure
• template
• template-reduce-duplication
• template-remaster
• templates
• test-branch
• test-comand
• test-merg
• test-metadata-change
• test-simplify
• test_checker
• test_tags
• test_tasks
• tests-add-codecov
• the_price_refactor
• theme-changes
• trans-improv
• translation-action
• translation-fixes
• translation-strings-from-1438
• translation_fnc
• translation_improv
• tst_fix
• ttt
• turn-of-functions
• typing
• ui-navbar
• ui-settings-header
• ui-tewaks2
• ui-tweaks
• update-pre-commit
• upgrade-deps
• use-error-report-fork
• use-spaces
• user-model
• uv-testing
• version-bump
• webhook-2036
• webhooks
• webp-support
• welcome-action
• wolfu05_bare_metal_ci
• workflow-remaster
• yarn-bump

fixed merge error