2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-14 19:15:41 +00:00
Commit Graph

12956 Commits

Author SHA1 Message Date
f8a2811d90 change hierarchy 2022-05-03 00:55:29 +02:00
87515b1b48 fix __str__ instance 2022-05-02 22:46:03 +02:00
e7b189ba29 fix templates 2022-05-02 22:41:24 +02:00
8f3899ffe6 move migrations 2022-05-02 22:10:50 +02:00
0c338cb2ae Merge branch 'inventree:master' into matmair/issue2788 2022-05-02 21:50:57 +02:00
4125803e6d Merge branch 'inventree:master' into matmair/issue2385 2022-05-02 21:50:52 +02:00
33a7d98dff remove screenshot
it is difficult to find the single thing that descirbes InvenTree
2022-05-02 21:12:11 +02:00
e87a02638e Merge remote-tracking branch 'inventree/master' into order-parts-wizard
# Conflicts:
#	InvenTree/order/serializers.py
#	InvenTree/templates/js/translated/model_renderers.js
2022-05-02 16:11:11 +10:00
41177f8611 Merge pull request #2918 from SchrodingersGat/translation-adjustment
Translation adjustment
2022-05-02 11:25:56 +10:00
4d7eda2572 Merge pull request #2919 from SchrodingersGat/import-delete
Adds option to delete existing data when importing records
2022-05-02 11:18:29 +10:00
d49763bd25 Adjust translation compilation step performed as part of "invoke update" 2022-05-02 10:53:43 +10:00
18080f329b Remove compiled .mo files from tracking 2022-05-02 10:52:30 +10:00
cfb523adec Adds option to delete existing data when importing records 2022-05-02 10:45:26 +10:00
422e22b8e6 Merge pull request #2916 from SchrodingersGat/use-the-force
Force push translation files
2022-05-02 10:38:42 +10:00
194d72e63e updated translation base (#2914)
* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-05-02 10:31:31 +10:00
9022bd3270 Add new readme 2022-05-02 01:46:06 +02:00
36da363188 Force push translation files 2022-05-02 09:37:33 +10:00
ef52be82d9 Merge pull request #2913 from matmair/codebase-cleanup
Codebase cleanup to python 3.9 / django 3.2
2022-05-02 09:25:52 +10:00
e418a54c25 PEP fix 2022-05-01 21:48:45 +00:00
8490589fa9 check for only unique methods to be added 2022-05-01 21:46:31 +00:00
105818dd0d Add docs about target versions and upgrades 2022-05-01 22:44:36 +02:00
96e6752324 remove double import 2022-05-01 22:13:35 +02:00
e7a0cf7342 fix old url() usage 2022-05-01 22:04:37 +02:00
de6507e918 update translation commands 2022-05-01 22:03:49 +02:00
67ab45bdee update depreciated paths 2022-05-01 22:00:18 +02:00
d05472b30c upgrade to pyhton 3.9 syntax
using pyupgrade
2022-05-01 21:53:12 +02:00
b59a4d53f0 Merge pull request #2911 from SchrodingersGat/translation-ci
Fix CI
2022-05-01 23:51:22 +10:00
8635cb8267 Fix CI 2022-05-01 23:21:49 +10:00
cc42977233 Merge pull request #2910 from SchrodingersGat/translation-ci
Translation CI
2022-05-01 23:19:58 +10:00
2927835a7d Merge pull request #2909 from SchrodingersGat/settings-bug-fixes
Settings bug fixes
2022-05-01 23:17:28 +10:00
526571c062 Prevent recursion 2022-05-01 22:50:56 +10:00
e3c3ed28da PEP fixes 2022-05-01 22:46:50 +10:00
9e469a949f Push from latest master to l10 branch 2022-05-01 22:43:25 +10:00
8abc96a79a Ignore .mo files 2022-05-01 22:42:25 +10:00
ef530956a8 Run translation as part of the update process 2022-05-01 22:38:18 +10:00
0a3613476c Fix empty translation string 2022-05-01 22:34:03 +10:00
d72efc3757 Small tweaks
- Factor out native_value property (not needed!)
- PEP fixes
2022-05-01 22:30:24 +10:00
f794d91e5c Adds more unit tests for global settings objects 2022-05-01 22:26:51 +10:00
0f8f9f3e5e Add unit test for integer settings with validator 2022-05-01 22:21:57 +10:00
f972551246 Add unit test for multiple-choice setting type 2022-05-01 22:07:16 +10:00
eabe082f0a Add unit tests for boolean user settings (via the API) 2022-05-01 20:23:50 +10:00
75fa0bed26 Render "native value" in serializer 2022-05-01 20:13:58 +10:00
5d4972d981 Convert settings to 'native' values before running callable valiators 2022-05-01 19:46:17 +10:00
3777686c92 503 page was missing inventree_extras
(cherry picked from commit 1a8fd7878ea253f7cdfd50f54850827e634fcb0f)
2022-05-01 19:44:52 +10:00
433ecdb2c3 Merge pull request #2714 from matmair/matmair/issue2694
[FR] Add delivery cost (excluding unit cost that already exists) in PO
2022-05-01 10:28:47 +10:00
937232a238 Merge pull request #2904 from matmair/patch-1
Adding permissions to hook
2022-05-01 10:03:19 +10:00
6497dd7d31 Merge pull request #2779 from rkalman/feat-qr-scanner
Camera QR scanner
2022-05-01 09:56:05 +10:00
93a05491ce PEP fix 2022-05-01 00:17:07 +02:00
58901a8cf6 fix migrations 2022-05-01 00:15:02 +02:00
0c72fa180c fix model backtrack 2022-05-01 00:09:17 +02:00