Oliver Walters
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
Oliver
41177f8611
Merge pull request #2918 from SchrodingersGat/translation-adjustment
...
Translation adjustment
2022-05-02 11:25:56 +10:00
Oliver
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
Oliver Walters
d49763bd25
Adjust translation compilation step performed as part of "invoke update"
2022-05-02 10:53:43 +10:00
Oliver Walters
18080f329b
Remove compiled .mo files from tracking
2022-05-02 10:52:30 +10:00
Oliver Walters
cfb523adec
Adds option to delete existing data when importing records
2022-05-02 10:45:26 +10:00
Oliver
422e22b8e6
Merge pull request #2916 from SchrodingersGat/use-the-force
...
Force push translation files
2022-05-02 10:38:42 +10:00
Oliver
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
Oliver Walters
36da363188
Force push translation files
2022-05-02 09:37:33 +10:00
Oliver
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
Matthias
105818dd0d
Add docs about target versions and upgrades
2022-05-01 22:44:36 +02:00
Matthias
96e6752324
remove double import
2022-05-01 22:13:35 +02:00
Matthias
e7a0cf7342
fix old url() usage
2022-05-01 22:04:37 +02:00
Matthias
de6507e918
update translation commands
2022-05-01 22:03:49 +02:00
Matthias
67ab45bdee
update depreciated paths
2022-05-01 22:00:18 +02:00
Matthias
d05472b30c
upgrade to pyhton 3.9 syntax
...
using pyupgrade
2022-05-01 21:53:12 +02:00
Oliver
b59a4d53f0
Merge pull request #2911 from SchrodingersGat/translation-ci
...
Fix CI
2022-05-01 23:51:22 +10:00
Oliver Walters
8635cb8267
Fix CI
2022-05-01 23:21:49 +10:00
Oliver
cc42977233
Merge pull request #2910 from SchrodingersGat/translation-ci
...
Translation CI
2022-05-01 23:19:58 +10:00
Oliver
2927835a7d
Merge pull request #2909 from SchrodingersGat/settings-bug-fixes
...
Settings bug fixes
2022-05-01 23:17:28 +10:00
Oliver Walters
526571c062
Prevent recursion
2022-05-01 22:50:56 +10:00
Oliver Walters
e3c3ed28da
PEP fixes
2022-05-01 22:46:50 +10:00
Oliver Walters
9e469a949f
Push from latest master to l10 branch
2022-05-01 22:43:25 +10:00
Oliver Walters
8abc96a79a
Ignore .mo files
2022-05-01 22:42:25 +10:00
Oliver Walters
ef530956a8
Run translation as part of the update process
2022-05-01 22:38:18 +10:00
Oliver Walters
0a3613476c
Fix empty translation string
2022-05-01 22:34:03 +10:00
Oliver Walters
d72efc3757
Small tweaks
...
- Factor out native_value property (not needed!)
- PEP fixes
2022-05-01 22:30:24 +10:00
Oliver Walters
f794d91e5c
Adds more unit tests for global settings objects
2022-05-01 22:26:51 +10:00
Oliver Walters
0f8f9f3e5e
Add unit test for integer settings with validator
2022-05-01 22:21:57 +10:00
Oliver Walters
f972551246
Add unit test for multiple-choice setting type
2022-05-01 22:07:16 +10:00
Oliver Walters
eabe082f0a
Add unit tests for boolean user settings (via the API)
2022-05-01 20:23:50 +10:00
Oliver Walters
75fa0bed26
Render "native value" in serializer
2022-05-01 20:13:58 +10:00
Oliver Walters
5d4972d981
Convert settings to 'native' values before running callable valiators
2022-05-01 19:46:17 +10:00
Oliver Walters
3777686c92
503 page was missing inventree_extras
...
(cherry picked from commit 1a8fd7878ea253f7cdfd50f54850827e634fcb0f)
2022-05-01 19:44:52 +10:00
Oliver
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
Oliver
937232a238
Merge pull request #2904 from matmair/patch-1
...
Adding permissions to hook
2022-05-01 10:03:19 +10:00
Oliver
6497dd7d31
Merge pull request #2779 from rkalman/feat-qr-scanner
...
Camera QR scanner
2022-05-01 09:56:05 +10:00
Kálmán Rózsahegyi
b8399e4887
Increment number of JS files in test_js_load
2022-04-30 21:56:05 +02:00
Kálmán Rózsahegyi
c7692475a8
Add onBarcodeScanClicked() to exported functions
2022-04-30 21:28:55 +02:00
Matthias Mair
b1019abb45
adding permissions to hook
...
see https://github.com/inventree/InvenTree/pull/2895#issuecomment-1112733654
2022-04-30 20:01:30 +02:00
Matthias Mair
e75daec695
Merge branch 'inventree:master' into matmair/issue2694
2022-04-30 19:50:25 +02:00
Kálmán Rózsahegyi
84bfb0a827
One more try to pass JS checks...
2022-04-30 12:33:44 +02:00
Kálmán Rózsahegyi
51152eee53
More JS style fixes
2022-04-30 12:22:10 +02:00
Kálmán Rózsahegyi
b37bb3eb3e
Fix JS styling
2022-04-30 12:14:13 +02:00
Kálmán Rózsahegyi
8b279edee0
Merge branch 'master' into feat-qr-scanner
2022-04-30 11:57:09 +02:00
Oliver
d7e9e15c21
Merge pull request #2901 from SchrodingersGat/multi-bom-fix
...
Refactor BOM table to not load multi level BOMs by default
2022-04-29 17:57:33 +10:00
Oliver
35de490f72
JS linting fixes
2022-04-29 17:13:59 +10:00
Oliver
260680c5c4
Refactor BOM table to not load multi level BOMs by default
...
- Click to select which ones to load
2022-04-29 17:07:54 +10:00
Oliver
227b3d6aec
Merge pull request #2893 from SchrodingersGat/build-output-table-improvements
...
Build output table improvements
2022-04-29 15:05:52 +10:00
Oliver
1bb2551edb
Fixes for model rendering code
2022-04-29 13:51:49 +10:00
