Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,933 Commits 6 Branches 99 Tags 484 MiB
4a0dd72c3d
Commit Graph

7391 Commits

Author SHA1 Message Date
github-actions[bot]
3f9fd04997 updated translation base 2021-09-07 13:58:29 +00:00
Oliver
a70f4c86eb
Merge pull request #2013 from SchrodingersGat/receive-via-api 
Receive via api
 2021-09-07 23:56:44 +10:00
Oliver Walters
f349dc01ea JS lint 2021-09-07 23:41:13 +10:00
Oliver Walters
f38bf6e20a Adds unit testing for barcode field 2021-09-07 23:34:14 +10:00
Oliver
88097235d8 Fix: New translations django.po from Crowdin 2021-09-07 23:15:16 +10:00
Oliver
3dc13273ad Fix: New translations django.po from Crowdin 2021-09-07 23:15:15 +10:00
Oliver
de86d77ccd Fix: New translations django.po from Crowdin 2021-09-07 23:15:13 +10:00
Oliver
61380df9b9 Fix: New translations django.po from Crowdin 2021-09-07 23:15:12 +10:00
Oliver
d88383803a Fix: New translations django.po from Crowdin 2021-09-07 23:15:10 +10:00
Oliver
28671258e3 Fix: New translations django.po from Crowdin 2021-09-07 23:15:09 +10:00
Oliver
fa10171653 Fix: New translations django.po from Crowdin 2021-09-07 23:15:07 +10:00
Oliver
6452a4fb34 Fix: New translations django.po from Crowdin 2021-09-07 23:15:06 +10:00
Oliver
e78a562a93 Fix: New translations django.po from Crowdin 2021-09-07 23:15:04 +10:00
Oliver
2d00e465ca Fix: New translations django.po from Crowdin 2021-09-07 23:15:01 +10:00
Oliver
9f041d6ece Fix: New translations django.po from Crowdin 2021-09-07 23:14:59 +10:00
Oliver
aee7e95a14 Fix: New translations django.po from Crowdin 2021-09-07 23:14:58 +10:00
Oliver
40689bd5a8 Fix: New translations django.po from Crowdin 2021-09-07 23:14:56 +10:00
Oliver
1fc263e122 Fix: New translations django.po from Crowdin 2021-09-07 23:14:55 +10:00
Oliver
c2ca3e21b6 Fix: New translations django.po from Crowdin 2021-09-07 23:14:52 +10:00
Oliver
796d44e8c0 Fix: New translations django.po from Crowdin 2021-09-07 23:14:50 +10:00
Oliver
f8863ab638 Fix: New translations django.po from Crowdin 2021-09-07 23:14:47 +10:00
Oliver
531f3a23fe Fix: New translations django.po from Crowdin 2021-09-07 23:14:45 +10:00
Oliver Walters
bf05c9cfae Adds "barcode" field to POLineItem receive serializer 2021-09-07 23:06:36 +10:00
Oliver Walters
ccb191e5b1 Bump API version 2021-09-07 23:06:17 +10:00
github-actions[bot]
d03edf70b5 updated translation base 2021-09-07 12:53:29 +00:00
Oliver Walters
125554c53f Merge remote-tracking branch 'upstream/master' into receive-via-api 
# Conflicts:
#	InvenTree/templates/js/dynamic/inventree.js
#	InvenTree/templates/js/translated/forms.js
#	InvenTree/templates/js/translated/tables.js
 2021-09-07 22:34:00 +10:00
Oliver Walters
ecc7bd2d5b Unit test fixes 2021-09-07 22:27:39 +10:00
Oliver
5ab4be7025 Unit test fixes 2021-09-07 17:36:53 +10:00
Oliver
918106c225 Adds a background task to remove StockItem objects which are scheduled for deletion 2021-09-07 16:45:58 +10:00
Oliver
7d3cd03d6c Add "scheduled_for_deletion" field to StockItem 
- If set to True, this StockItem will be deleted (soon) by the background worker
- As deletion takes significant time, this prevents delete operations from blocking the UI
 2021-09-07 16:28:57 +10:00
Oliver
1f2c2c0ab0 Fix: New translations django.po from Crowdin 2021-09-07 07:12:51 +10:00
github-actions[bot]
60df5a9b09 updated translation base 2021-09-05 23:44:25 +00:00
github-actions[bot]
bc4b6e186b updated translation base 2021-09-03 23:44:26 +00:00
Oliver
9b001cd298 Another fix 2021-09-04 08:48:34 +10:00
Oliver
f0e5d1984c Fix for about.html 2021-09-04 08:46:30 +10:00
Oliver
0a8365e3bc Fix for clip.html 2021-09-04 08:45:06 +10:00
Oliver
4ffc1bcf89 Fix: New translations django.po from Crowdin 2021-09-03 23:38:52 +10:00
Oliver
46f9ead019 Fix: New translations django.po from Crowdin 2021-09-03 23:38:51 +10:00
Oliver
5733a115bb Fix: New translations django.po from Crowdin 2021-09-03 23:38:49 +10:00
Oliver
7c669b964b Fix: New translations django.po from Crowdin 2021-09-03 23:38:48 +10:00
Oliver
20c8e8ffff Fix: New translations django.po from Crowdin 2021-09-03 23:38:47 +10:00
Oliver
00e3dd899a Fix: New translations django.po from Crowdin 2021-09-03 23:38:45 +10:00
Oliver
2eb96e48d9 Fix: New translations django.po from Crowdin 2021-09-03 23:38:44 +10:00
Oliver
9bee4b86f8 Fix: New translations django.po from Crowdin 2021-09-03 23:38:43 +10:00
Oliver
8fd7a06ab5 Fix: New translations django.po from Crowdin 2021-09-03 23:38:41 +10:00
Oliver
1ebd271c7b Fix: New translations django.po from Crowdin 2021-09-03 23:38:39 +10:00
Oliver
8123b1bcfc Fix: New translations django.po from Crowdin 2021-09-03 23:38:38 +10:00
Oliver
71e34ca427 Fix: New translations django.po from Crowdin 2021-09-03 23:38:37 +10:00
Oliver
55d3f1b681 Fix: New translations django.po from Crowdin 2021-09-03 23:38:35 +10:00
Oliver
d045047a67 Fix: New translations django.po from Crowdin 2021-09-03 23:38:34 +10:00
Oliver
fa3eadbdff Fix: New translations django.po from Crowdin 2021-09-03 23:38:32 +10:00
Oliver
73a0baa499 Fix: New translations django.po from Crowdin 2021-09-03 23:38:31 +10:00
Oliver
8e0a288aea Fix: New translations django.po from Crowdin 2021-09-03 23:38:29 +10:00
Oliver
4d37c87063 Fix: New translations django.po from Crowdin 2021-09-03 23:38:28 +10:00
github-actions[bot]
08cea7a2f3 updated translation base 2021-09-03 13:36:41 +00:00
Oliver
c275bf8d98
Merge pull request #2026 from inventree/js-linting 
Js linting
 2021-09-03 23:35:14 +10:00
Oliver Walters
e5872f4b67 improve js debug comment 2021-09-03 23:16:35 +10:00
Oliver
888fa51cd7 lots of linting fixes for JS files 2021-09-03 22:54:17 +10:00
Oliver
2b5181c138 Fix: New translations django.po from Crowdin 2021-09-02 12:17:30 +10:00
Oliver
03363812ed Fix: New translations django.po from Crowdin 2021-09-02 12:17:29 +10:00
Oliver
c5b151d87d Fix: New translations django.po from Crowdin 2021-09-02 12:17:28 +10:00
Oliver
4a49065aa1 Fix: New translations django.po from Crowdin 2021-09-02 12:17:26 +10:00
Oliver
238649bc5a Fix: New translations django.po from Crowdin 2021-09-02 12:17:25 +10:00
Oliver
0596e9f554 Fix: New translations django.po from Crowdin 2021-09-02 12:17:23 +10:00
Oliver
51ff93a000 Fix: New translations django.po from Crowdin 2021-09-02 12:17:22 +10:00
Oliver
913027e895 Fix: New translations django.po from Crowdin 2021-09-02 12:17:21 +10:00
Oliver
cbea271582 Fix: New translations django.po from Crowdin 2021-09-02 12:17:20 +10:00
Oliver
837ea0b476 Fix: New translations django.po from Crowdin 2021-09-02 12:17:18 +10:00
Oliver
258631872b Fix: New translations django.po from Crowdin 2021-09-02 12:17:17 +10:00
Oliver
440a2ea0ed Fix: New translations django.po from Crowdin 2021-09-02 12:17:16 +10:00
Oliver
ae4a5360ef Fix: New translations django.po from Crowdin 2021-09-02 12:17:15 +10:00
Oliver
97962a2546 Fix: New translations django.po from Crowdin 2021-09-02 12:17:13 +10:00
Oliver
4054440e54 Fix: New translations django.po from Crowdin 2021-09-02 12:17:12 +10:00
Oliver
6ff42fddbd Fix: New translations django.po from Crowdin 2021-09-02 12:17:11 +10:00
Oliver
a3ae53c8c3 Fix: New translations django.po from Crowdin 2021-09-02 12:17:09 +10:00
Oliver
1cccc7b80c Fix: New translations django.po from Crowdin 2021-09-02 12:17:08 +10:00
github-actions[bot]
5f1e544c72 updated translation base 2021-09-02 01:39:25 +00:00
Oliver
5d703af932 Add migration file 2021-09-02 11:11:25 +10:00
Oliver
43c4e936a7 Fix on_delete for PurchaseOrderLineItem.destination 
- Currently set to DO_NOTHING
- However when deleting a StockLocation which has a PurchaseOrderLineItem.destionation point to it, this will cause an IntegrityError
 2021-09-02 10:41:23 +10:00
Oliver
e74d06e511 Fix: New translations django.po from Crowdin 2021-09-02 08:51:35 +10:00
Oliver
714e38384c Fix: New translations django.po from Crowdin 2021-09-02 08:51:34 +10:00
Oliver
c76561103a Fix: New translations django.po from Crowdin 2021-09-02 08:51:33 +10:00
Oliver
9cd9150966 Fix: New translations django.po from Crowdin 2021-09-02 08:51:31 +10:00
Oliver
e79b49e6e1 Fix: New translations django.po from Crowdin 2021-09-02 08:51:30 +10:00
Oliver
0da451a03e Fix: New translations django.po from Crowdin 2021-09-02 08:51:29 +10:00
Oliver
cfedb4a697 Fix: New translations django.po from Crowdin 2021-09-02 08:51:27 +10:00
Oliver
9dca401680 Fix: New translations django.po from Crowdin 2021-09-02 08:51:26 +10:00
Oliver
d7a80dafe9 Fix: New translations django.po from Crowdin 2021-09-02 08:51:25 +10:00
Oliver
3d0eda2b6f Fix: New translations django.po from Crowdin 2021-09-02 08:51:24 +10:00
Oliver
3536017f2e Fix: New translations django.po from Crowdin 2021-09-02 08:51:22 +10:00
Oliver
6e5a6ff14b Fix: New translations django.po from Crowdin 2021-09-02 08:51:21 +10:00
Oliver
0d4523ba52 Fix: New translations django.po from Crowdin 2021-09-02 08:51:20 +10:00
Oliver
76da1a00e9 Fix: New translations django.po from Crowdin 2021-09-02 08:51:19 +10:00
Oliver
234aeeb986 Fix: New translations django.po from Crowdin 2021-09-02 08:51:17 +10:00
Oliver
cf2af4058d Fix: New translations django.po from Crowdin 2021-09-02 08:51:16 +10:00
Oliver
c6f0e93e46 Fix: New translations django.po from Crowdin 2021-09-02 08:51:14 +10:00
Oliver
c389863d6c Fix: New translations django.po from Crowdin 2021-09-02 08:51:13 +10:00
github-actions[bot]
062a3e78bb updated translation base 2021-09-01 22:49:28 +00:00
Matthias
0ebc45e834
replace i html tags 2021-09-02 00:18:47 +02:00
Matthias
6a420fd95c
replace bold tags 2021-09-02 00:17:12 +02:00
github-actions[bot]
4ac1765937 updated translation base 2021-09-01 21:11:52 +00:00
Matthias Mair
2b1279e647 now with closing tags 2021-09-01 08:14:08 +02:00
Oliver
928c7ffd3e Fix: New translations django.po from Crowdin 2021-09-01 05:43:07 +10:00
Oliver
7c48ead388 Fix: New translations django.po from Crowdin 2021-09-01 04:47:03 +10:00
Oliver
8c970b3fd2 Fix: New translations django.po from Crowdin 2021-08-31 23:42:18 +10:00
Oliver
19dd8863cf Fix: New translations django.po from Crowdin 2021-08-31 22:46:58 +10:00
Matthias Mair
5ad2eabab1 fix html templates 2021-08-31 13:17:38 +02:00
Oliver
f29b54b567 Fix: New translations django.po from Crowdin 2021-08-31 13:18:36 +10:00
Oliver
358fcbf043 Fix: New translations django.po from Crowdin 2021-08-31 12:14:22 +10:00
Oliver Walters
cb403a5b29 More work 2021-08-30 22:28:01 +10:00
Oliver Walters
4c39607e00 Brace style fixes 2021-08-30 20:30:26 +10:00
Oliver Walters
e1adef5010 typo fix 2021-08-30 20:08:18 +10:00
Oliver Walters
6177fe0c5a build.js 2021-08-30 19:52:28 +10:00
Oliver Walters
2112c6a9ad barcode.js 2021-08-30 19:33:43 +10:00
Oliver Walters
7d4945d302 company.js 2021-08-30 16:01:45 +10:00
Oliver Walters
0835fe92a0 bom.js 2021-08-30 15:54:31 +10:00
Oliver Walters
51eb40f3bc forms.js 2021-08-30 15:47:58 +10:00
Oliver Walters
bb3b6fdc4d label.js 2021-08-30 15:34:46 +10:00
Oliver Walters
e0e7788af6 More js fixes 2021-08-30 15:32:01 +10:00
Oliver Walters
50b54f0966 order.js 2021-08-30 14:57:17 +10:00
Oliver Walters
00f012311d inventree.js 2021-08-30 14:49:40 +10:00
Oliver Walters
90a75ac7cb nav.js 2021-08-30 14:44:44 +10:00
Oliver Walters
7d5b859233 part.js 2021-08-30 14:39:58 +10:00
Oliver Walters
3e03b1c31d report.js 2021-08-30 14:12:35 +10:00
Oliver Walters
c846aeb60f stock.js 2021-08-30 14:07:34 +10:00
Oliver Walters
65874447ed bug fix 2021-08-30 13:13:12 +10:00
Oliver Walters
5d45fce240 remove import / export calls 2021-08-30 13:10:58 +10:00
Oliver Walters
24ca1c5641 Add "helpers.js" for common functions 2021-08-30 13:06:02 +10:00
Oliver Walters
140a2092c8 fixes for table_filters.js 2021-08-28 22:18:20 +10:00
Oliver Walters
0620e656a0 Fix linting errors or tables.js 2021-08-28 22:12:41 +10:00
Oliver Walters
d0ccf8647d Add js linting to github workflow 2021-08-28 20:59:41 +10:00
Oliver Walters
f57a31c9b5 Add a test framework script to pull down rendered javascript files 
- Use the testing framework so we don't need to spin up a server
 2021-08-28 20:46:51 +10:00
Oliver
83b38ec33b Merge remote-tracking branch 'inventree/l10_crowdin' into l10 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/el/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/locale/fr/LC_MESSAGES/django.po
#	InvenTree/locale/he/LC_MESSAGES/django.po
#	InvenTree/locale/id/LC_MESSAGES/django.po
#	InvenTree/locale/it/LC_MESSAGES/django.po
#	InvenTree/locale/ja/LC_MESSAGES/django.po
#	InvenTree/locale/ko/LC_MESSAGES/django.po
#	InvenTree/locale/nl/LC_MESSAGES/django.po
#	InvenTree/locale/no/LC_MESSAGES/django.po
#	InvenTree/locale/pl/LC_MESSAGES/django.po
#	InvenTree/locale/ru/LC_MESSAGES/django.po
#	InvenTree/locale/sv/LC_MESSAGES/django.po
#	InvenTree/locale/th/LC_MESSAGES/django.po
#	InvenTree/locale/tr/LC_MESSAGES/django.po
#	InvenTree/locale/vi/LC_MESSAGES/django.po
#	InvenTree/locale/zh/LC_MESSAGES/django.po
 2021-08-27 17:48:09 +10:00
Oliver
25c19b5aa8 Fix: New translations django.po from Crowdin 2021-08-26 23:25:02 +10:00
Oliver
6338d704bc Fix: New translations django.po from Crowdin 2021-08-26 23:24:59 +10:00
Oliver
7db5518ec1 Fix: New translations django.po from Crowdin 2021-08-26 23:24:56 +10:00
Oliver
3a311227e2 Fix: New translations django.po from Crowdin 2021-08-26 23:24:55 +10:00
Oliver
1b54b177ca Fix: New translations django.po from Crowdin 2021-08-26 23:24:53 +10:00
Oliver
e29e96c747 Fix: New translations django.po from Crowdin 2021-08-26 23:24:52 +10:00
Oliver
ea246d816c Fix: New translations django.po from Crowdin 2021-08-26 23:24:49 +10:00
Oliver
7fceca746e Fix: New translations django.po from Crowdin 2021-08-26 23:24:46 +10:00
Oliver
b424fdca1e Fix: New translations django.po from Crowdin 2021-08-26 23:24:45 +10:00
Oliver
c34979719e Fix: New translations django.po from Crowdin 2021-08-26 23:24:42 +10:00
Oliver
1a13e82b96 Fix: New translations django.po from Crowdin 2021-08-26 23:24:39 +10:00
Oliver
62a8d3df9c Fix: New translations django.po from Crowdin 2021-08-26 23:24:38 +10:00
Oliver
564d03dbaf Fix: New translations django.po from Crowdin 2021-08-26 23:24:35 +10:00
Oliver
eb5675cb8a Fix: New translations django.po from Crowdin 2021-08-26 23:24:34 +10:00
Oliver
b11bf73d8a Fix: New translations django.po from Crowdin 2021-08-26 23:24:32 +10:00
Oliver
a93411a303 Fix: New translations django.po from Crowdin 2021-08-26 23:24:31 +10:00
Oliver
52d9e42e8b Fix: New translations django.po from Crowdin 2021-08-26 23:24:29 +10:00
Oliver
a2dd516145 Fix: New translations django.po from Crowdin 2021-08-26 23:24:28 +10:00
github-actions[bot]
089d9a3987 updated translation base 2021-08-26 13:13:19 +00:00
Oliver Walters
3adf30a00c Simple fix for category parameter settings 2021-08-26 22:50:50 +10:00
github-actions[bot]
17eca19ca6 updated translation base 2021-08-26 12:14:33 +00:00
github-actions[bot]
5201c703f0 updated translation base 2021-08-26 12:13:43 +00:00
Oliver
e5de69cd96
Update version.py 
Actually bump the API version
 2021-08-26 22:13:13 +10:00
Oliver
320ca451cc
Merge pull request #2023 from inventree/units-in-api 
Add "units" to PartBriefSerializer
 2021-08-26 22:12:27 +10:00
Oliver
c700e3f4ce Fix: New translations django.po from Crowdin 2021-08-26 22:11:49 +10:00
Oliver
ebb791dc97 Fix: New translations django.po from Crowdin 2021-08-26 22:11:46 +10:00
Oliver
459c220fc2 Fix: New translations django.po from Crowdin 2021-08-26 22:11:44 +10:00
Oliver
f75e09c39c Fix: New translations django.po from Crowdin 2021-08-26 22:11:41 +10:00
Oliver
fcb41e8f7d Fix: New translations django.po from Crowdin 2021-08-26 22:11:38 +10:00
Oliver
b354fb3d4d Fix: New translations django.po from Crowdin 2021-08-26 22:11:36 +10:00
Oliver
f492d5d93c Fix: New translations django.po from Crowdin 2021-08-26 22:11:34 +10:00
Oliver
88d60c3a61 Fix: New translations django.po from Crowdin 2021-08-26 22:11:31 +10:00
Oliver
39e6fbfcb7 Fix: New translations django.po from Crowdin 2021-08-26 22:11:30 +10:00
Oliver
6b18a06949 Fix: New translations django.po from Crowdin 2021-08-26 22:11:28 +10:00
Oliver
af8add599a Fix: New translations django.po from Crowdin 2021-08-26 22:11:26 +10:00
Oliver
9e6b85b902 Fix: New translations django.po from Crowdin 2021-08-26 22:11:25 +10:00
Oliver
d375962769 Fix: New translations django.po from Crowdin 2021-08-26 22:11:24 +10:00
Oliver
ab690e139c Fix: New translations django.po from Crowdin 2021-08-26 22:11:22 +10:00
Oliver
1b72b9005e Fix: New translations django.po from Crowdin 2021-08-26 22:11:21 +10:00
Oliver
dbb9b4a1b0 Fix: New translations django.po from Crowdin 2021-08-26 22:11:19 +10:00
Oliver
98e4226ba7 Fix: New translations django.po from Crowdin 2021-08-26 22:11:18 +10:00
Oliver
de271c0979 Fix: New translations django.po from Crowdin 2021-08-26 22:11:16 +10:00
github-actions[bot]
b0b7991689 updated translation base 2021-08-26 12:07:24 +00:00
Oliver
610c05384b
Merge pull request #2020 from SchrodingersGat/mpn-sorting-fix 
Mpn sorting fix
 2021-08-26 22:06:06 +10:00
Oliver Walters
ec88415f3d Add "units" to PartBriefSerializer 2021-08-26 21:54:25 +10:00
Oliver
74e91d61e9 Fix: New translations django.po from Crowdin 2021-08-26 18:08:43 +10:00
Oliver
ac8a0be74a Enable sorting by total_price 2021-08-26 08:48:19 +10:00
Oliver
bad246bca6 Fixes for ordering of stock table 2021-08-26 08:24:31 +10:00
Oliver
212a7eeed1 Disable filtering for total_price (as this is not a database field!) 2021-08-26 07:59:47 +10:00
Oliver
8660f13ef5 Allow sorting by purchase price (unit price) 2021-08-26 07:50:19 +10:00
Oliver
10f454b588 Fix: New translations django.po from Crowdin 2021-08-26 07:34:53 +10:00
Oliver
bcb82c57da Fix: New translations django.po from Crowdin 2021-08-26 07:34:52 +10:00
Oliver
d1ac087f71 Fix: New translations django.po from Crowdin 2021-08-26 07:34:50 +10:00
Oliver
7e88611c9a Fix: New translations django.po from Crowdin 2021-08-26 07:34:49 +10:00
Oliver
93592a13c3 Fix: New translations django.po from Crowdin 2021-08-26 07:34:48 +10:00
Oliver
061c4ee2f4 Fix: New translations django.po from Crowdin 2021-08-26 07:34:46 +10:00
Oliver
819a9e1539 Fix: New translations django.po from Crowdin 2021-08-26 07:34:45 +10:00
Oliver
04e65034e1 Fix: New translations django.po from Crowdin 2021-08-26 07:34:44 +10:00
Oliver
88bc92d745 Fix: New translations django.po from Crowdin 2021-08-26 07:34:42 +10:00
Oliver
3632a23525 Fix: New translations django.po from Crowdin 2021-08-26 07:34:41 +10:00
Oliver
98dd6b5dde Fix: New translations django.po from Crowdin 2021-08-26 07:34:40 +10:00
Oliver
815bc83f21 Fix: New translations django.po from Crowdin 2021-08-26 07:34:38 +10:00
Oliver
5e6a7a0f2d Fix: New translations django.po from Crowdin 2021-08-26 07:34:37 +10:00
Oliver
28fce51fe8 Fix: New translations django.po from Crowdin 2021-08-26 07:34:35 +10:00
Oliver
cdb9bd80ab Fix: New translations django.po from Crowdin 2021-08-26 07:34:34 +10:00
Oliver
65ec8e9f03 Fix: New translations django.po from Crowdin 2021-08-26 07:34:33 +10:00
Oliver
e42ab603b0 Fix: New translations django.po from Crowdin 2021-08-26 07:34:31 +10:00