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
9,729 Commits 6 Branches 99 Tags 484 MiB
57240865e8
Commit Graph

8124 Commits

Author SHA1 Message Date
Oliver
ea4c4c514f Add uniqueness checking for the BomItemSubstitute model 2021-10-13 22:01:32 +11:00
Oliver
0e1e8226b1 Add a callback to remove individual rows 2021-10-13 21:42:50 +11:00
Oliver
8b41e68e6b Launch a dialog displaying the available BOM substitutes 2021-10-13 21:33:41 +11:00
Oliver
6803f3cf63 Display "substitutes available" icon 2021-10-13 20:36:31 +11:00
rocheparadox
0742fb063c comment cleanup 2021-10-13 10:58:36 +05:30
rocheparadox
294011a973 Merge remote-tracking branch 'upstream/master' 2021-10-13 10:10:59 +05:30
Oliver
6816071388 Simplify BOM editing view 
- A user with permission to edit BOM data can immediately access the BOM editing tools
 2021-10-13 14:44:59 +11:00
Oliver
51efd6b2e4 Add permissions for new mdoel 2021-10-13 14:06:36 +11:00
Oliver
37bd5c0507 Add serializer and API endpoint for BomItemSubstitute class 2021-10-13 13:58:41 +11:00
Oliver
f3f41730be Add "substitutes" column to BOM table 2021-10-13 11:58:40 +11:00
Oliver
324ccd805d Include BomItem substitutes in the serializer 2021-10-13 11:07:44 +11:00
Oliver
7c396f9f39 Enable optional pagination for the BomItem API endpoint 2021-10-13 11:07:34 +11:00
Oliver
a00dc9b0b1 Add migration file for new database model 2021-10-13 10:50:24 +11:00
Oliver
e20ddc289e Merge branch 'master' into bom-substitutes 2021-10-13 10:15:03 +11:00
Oliver
4f985ae225 Revert 1fb76b9 
Removes global functions to enable / disable entire sections of functionality
 2021-10-13 09:40:17 +11:00
rocheparadox
a01918d4b9 removed blank line at the end of file 2021-10-12 19:54:09 +05:30
rocheparadox
4fddc656c4 removed unused import 
added unit tests for PART_NAME_FORMAT
 2021-10-12 19:51:21 +05:30
rocheparadox
2bf51b0ac3 Added PART_NAME_FORMAT to Inventree settings and exposed the same in settings window with a validator 2021-10-12 19:06:23 +05:30
rocheparadox
f4239fbfd3 Merge remote-tracking branch 'upstream/master' 2021-10-12 18:54:51 +05:30
Oliver Walters
4eb8c60ee0 Add new BomItemSubstitute model 2021-10-12 22:22:49 +11:00
Oliver
75bfdd615e Fixes for unit tests 2021-10-12 11:38:25 +11:00
rocheparadox
beadfb4659 Merge remote-tracking branch 'upstream/master' 2021-10-11 22:29:01 +05:30
rocheparadox
2d77b21a4e PART_NAME_FORMAT is introduced to display the names of parts in custom format. - For Feature Request InvenTree#2085 
full_name construction in part.js is obsolete/redundant since the same is constructed in backend and sent through api response
 2021-10-11 22:21:12 +05:30
Oliver
40e5536300 Handle rare case where user instance has no name assigned 2021-10-11 21:39:34 +11:00
Oliver
772d3fa67d Merge remote-tracking branch 'inventree/l10_crowdin' 2021-10-11 21:02:35 +11:00
Oliver
5b4d646ca3
Merge pull request #2135 from SchrodingersGat/docs-fix-fix 
re-simplify the documentation URL
 2021-10-11 18:54:56 +11:00
Oliver
62ce278fb7 Fix: New translations django.po from Crowdin 2021-10-11 17:29:16 +11:00
Oliver
c125cc4b29 Fix: New translations django.po from Crowdin 2021-10-11 17:29:15 +11:00
Oliver
e9350ca0e4 Fix: New translations django.po from Crowdin 2021-10-11 17:29:13 +11:00
Oliver
004bb35245 Fix: New translations django.po from Crowdin 2021-10-11 17:29:12 +11:00
Oliver
b1f51afac1 Fix: New translations django.po from Crowdin 2021-10-11 17:29:11 +11:00
Oliver
f0d2a32990 Fix: New translations django.po from Crowdin 2021-10-11 17:29:09 +11:00
Oliver
fe06542498 Fix: New translations django.po from Crowdin 2021-10-11 17:29:08 +11:00
Oliver
20874ca68a Fix: New translations django.po from Crowdin 2021-10-11 17:29:07 +11:00
Oliver
e1b0dc3669 Fix: New translations django.po from Crowdin 2021-10-11 17:29:05 +11:00
Oliver
b56c0e3a56 Fix: New translations django.po from Crowdin 2021-10-11 17:29:04 +11:00
Oliver
181091ce2d Fix: New translations django.po from Crowdin 2021-10-11 17:29:02 +11:00
Oliver
51e822a1f5 Fix: New translations django.po from Crowdin 2021-10-11 17:29:01 +11:00
Oliver
b334b85363 Fix: New translations django.po from Crowdin 2021-10-11 17:28:59 +11:00
Oliver
f722c765b3 Fix: New translations django.po from Crowdin 2021-10-11 17:28:58 +11:00
Oliver
ce550cfcd0 Fix: New translations django.po from Crowdin 2021-10-11 17:28:57 +11:00
Oliver
0299dda74c Fix: New translations django.po from Crowdin 2021-10-11 17:28:55 +11:00
Oliver
4a701a7a3a Fix: New translations django.po from Crowdin 2021-10-11 17:28:54 +11:00
Oliver
76b0ed3243 Fix: New translations django.po from Crowdin 2021-10-11 17:28:53 +11:00
Oliver
00f8d98094 re-simplify the documentation URL 
- dev version = "latest"
- stable version = "x.y.z"
- Requires an explicit docs version release for every software release
 2021-10-11 17:26:48 +11:00
Oliver
19a8c712d4
Merge pull request #2017 from matmair/fr-1421-sso 
SSO!
 2021-10-11 17:20:08 +11:00
Oliver
d874dc29b1 Fix: New translations django.po from Crowdin 2021-10-11 12:03:48 +11:00
Oliver
20ab5c7cf0 Fix: New translations django.po from Crowdin 2021-10-11 12:03:47 +11:00
Oliver
5d619cbd0e Fix: New translations django.po from Crowdin 2021-10-11 12:03:46 +11:00
Oliver
2755ae1b4c Fix: New translations django.po from Crowdin 2021-10-11 12:03:44 +11:00
Oliver
581a3ffb2a Fix: New translations django.po from Crowdin 2021-10-11 12:03:43 +11:00
Oliver
50a1fa42de Fix: New translations django.po from Crowdin 2021-10-11 12:03:42 +11:00
Oliver
681452db3d Fix: New translations django.po from Crowdin 2021-10-11 12:03:40 +11:00
Oliver
f7d66875c4 Fix: New translations django.po from Crowdin 2021-10-11 12:03:39 +11:00
Oliver
9952ff1eae Fix: New translations django.po from Crowdin 2021-10-11 12:03:38 +11:00
Oliver
7b417460e6 Fix: New translations django.po from Crowdin 2021-10-11 12:03:37 +11:00
Oliver
fb943638c0 Fix: New translations django.po from Crowdin 2021-10-11 12:03:35 +11:00
Oliver
1adf77be86 Fix: New translations django.po from Crowdin 2021-10-11 12:03:34 +11:00
Oliver
1235e3e149 Fix: New translations django.po from Crowdin 2021-10-11 12:03:33 +11:00
Oliver
af576d5e90 Fix: New translations django.po from Crowdin 2021-10-11 12:03:32 +11:00
Oliver
629dad5e07 Fix: New translations django.po from Crowdin 2021-10-11 12:03:30 +11:00
Oliver
710e0e2c3b Fix: New translations django.po from Crowdin 2021-10-11 12:03:29 +11:00
Oliver
32f13c6bef Fix: New translations django.po from Crowdin 2021-10-11 12:03:28 +11:00
Oliver
2da8c81537 Fix: New translations django.po from Crowdin 2021-10-11 12:03:26 +11:00
Oliver
e45f50acd3
Merge pull request #2133 from SchrodingersGat/convert-out-of-stock 
Allow conversion of out-of-stock items
 2021-10-11 12:00:09 +11:00
Oliver
d3e5bc3141
Merge pull request #2132 from SchrodingersGat/esc-forms 
Adds setting to close forms using escape key
 2021-10-11 11:41:56 +11:00
Oliver
ab4c428031 Allow conversion of out-of-stock items 2021-10-11 11:31:23 +11:00
Oliver
49601d2b7e
Merge pull request #2130 from SchrodingersGat/links-fix 
Fix various documentation links
 2021-10-11 11:23:53 +11:00
Oliver
f978924c4e Adds required tabindex 2021-10-11 11:23:35 +11:00
Oliver
25031e09e4 Enable setting for legacy launchModalForm function 2021-10-11 11:22:17 +11:00
Oliver
a32b5fdd64 Adds setting to close forms using escape key 
- Configurable per user
- Default = false (to preserve behavior)
 2021-10-11 11:16:33 +11:00
Oliver
8d33ee6298
Merge pull request #2129 from SchrodingersGat/sub-part-from-bom 
Add option to BomItem form to create a new part
 2021-10-11 10:59:30 +11:00
Oliver
c7bfce4a64 Fix various documentation links 
- Reference the configured docs verrsion
 2021-10-11 10:53:49 +11:00
Oliver
2f59e31a40
Merge pull request #2128 from SchrodingersGat/bom-focus 
Auto-focus on the 'sub_part' field
 2021-10-11 10:46:29 +11:00
Oliver
ede4ac9219 Add option to BomItem form to create a new part 2021-10-11 10:40:03 +11:00
Oliver
00275d61eb Auto-focus on the 'sub_part' field 2021-10-11 10:25:36 +11:00
Oliver
cfbcb80285 Documentation URL is now hard-coded 
- Also checked as part of CI step
 2021-10-11 10:19:59 +11:00
Matthias Mair
848a72604e
Merge branch 'inventree:master' into fr-1421-sso 2021-10-08 22:38:16 +02:00
Oliver
b6d966b3fd Fix: New translations django.po from Crowdin 2021-10-08 13:15:41 +11:00
Oliver
b60feea8cf Fix: New translations django.po from Crowdin 2021-10-08 13:15:40 +11:00
Oliver
c62042c836 Fix: New translations django.po from Crowdin 2021-10-08 13:15:38 +11:00
Oliver
6254182059 Fix: New translations django.po from Crowdin 2021-10-08 13:15:37 +11:00
Oliver
b234b18324 Fix: New translations django.po from Crowdin 2021-10-08 13:15:36 +11:00
Oliver
49162331d5 Fix: New translations django.po from Crowdin 2021-10-08 13:15:34 +11:00
Oliver
2aa0897a6f Fix: New translations django.po from Crowdin 2021-10-08 13:15:33 +11:00
Oliver
10abaae43d Fix: New translations django.po from Crowdin 2021-10-08 13:15:32 +11:00
Oliver
a18be6328f Fix: New translations django.po from Crowdin 2021-10-08 13:15:30 +11:00
Oliver
0db184fab6 Fix: New translations django.po from Crowdin 2021-10-08 13:15:29 +11:00
Oliver
533d16d3e1 Fix: New translations django.po from Crowdin 2021-10-08 13:15:27 +11:00
Oliver
8237e1a327 Fix: New translations django.po from Crowdin 2021-10-08 13:15:26 +11:00
Oliver
9c0b629cea Fix: New translations django.po from Crowdin 2021-10-08 13:15:24 +11:00
Oliver
6733c1e1ff Fix: New translations django.po from Crowdin 2021-10-08 13:15:23 +11:00
Oliver
ac48e36070 Fix: New translations django.po from Crowdin 2021-10-08 13:15:22 +11:00
Oliver
5755b615cb Fix: New translations django.po from Crowdin 2021-10-08 13:15:20 +11:00
Oliver
5e818f7bd8 Fix: New translations django.po from Crowdin 2021-10-08 13:15:19 +11:00
Oliver
71443bd003 Fix: New translations django.po from Crowdin 2021-10-08 13:15:17 +11:00
Oliver
07d05ed000 PEP fix 2021-10-08 12:50:24 +11:00
Oliver
77c6e5e57e Update display of BOM table based on the configurable setting 2021-10-08 12:47:51 +11:00
Oliver
69d932e193 Add a global setting to control price display in BOM tables 2021-10-08 12:47:27 +11:00
Oliver
d8b9420d2d Add a query param `?include_pricing' to the BomItem API 
- Set this to false to disable pricing info in BOM
- Drastic reduction in query speed
 2021-10-08 12:47:03 +11:00
Oliver
b0098d3ddc Fix: New translations django.po from Crowdin 2021-10-08 04:48:11 +11:00
Oliver
2b73e7b9ac Fix: New translations django.po from Crowdin 2021-10-08 03:43:05 +11:00
Matthias
fe7ab40b48
Merge branch 'master' of https://github.com/inventree/InvenTree into fr-1421-sso 2021-10-07 18:12:25 +02:00
Matthias
68f5af26b6
dont show mail functions if not enabled 2021-10-07 18:08:55 +02:00
Matthias
a45b8dcf0e
check also here if mail is enabled 2021-10-07 17:50:36 +02:00
Matthias
9a310bdd5c
do not send if not configured 2021-10-07 17:42:20 +02:00
Matthias
6c0c8bf1b6
PEP fix 2021-10-07 17:32:58 +02:00
Matthias
c37e40d144
use tag for testing 2021-10-07 17:31:18 +02:00
Matthias
c83d244663
change of strategies 2021-10-07 17:30:34 +02:00
Matthias
b4d9f0ff7e
fix save arguments 2021-10-07 17:11:47 +02:00
Matthias
8ef07dcf61
custom reset form 2021-10-07 15:08:08 +02:00
Matthias
f89dd84daf
check if mail is enabled 2021-10-07 14:24:20 +02:00
Matthias
a6c6b5c248
check if registration should be open in python 2021-10-07 14:08:19 +02:00
Oliver
4c653f1ba1 Fix: New translations django.po from Crowdin 2021-10-07 14:02:14 +11:00
Oliver
60f6e58f55 Fix: New translations django.po from Crowdin 2021-10-07 14:02:13 +11:00
Oliver
ef3070075f Fix: New translations django.po from Crowdin 2021-10-07 14:02:11 +11:00
Oliver
358c41ba1a Fix: New translations django.po from Crowdin 2021-10-07 14:02:10 +11:00
Oliver
64b7e05aa9 Fix: New translations django.po from Crowdin 2021-10-07 14:02:09 +11:00
Oliver
682cc6474e Fix: New translations django.po from Crowdin 2021-10-07 14:02:07 +11:00
Oliver
6ff5a515f8 Fix: New translations django.po from Crowdin 2021-10-07 14:02:06 +11:00
Oliver
dd210d358e Fix: New translations django.po from Crowdin 2021-10-07 14:02:03 +11:00
Oliver
48495baeb4 Fix: New translations django.po from Crowdin 2021-10-07 14:02:02 +11:00
Oliver
f31aab99fa Fix: New translations django.po from Crowdin 2021-10-07 14:02:00 +11:00
Oliver
6349237608 Fix: New translations django.po from Crowdin 2021-10-07 14:01:59 +11:00
Oliver
4f25763d89 Fix: New translations django.po from Crowdin 2021-10-07 14:01:57 +11:00
Oliver
5e13712eca Fix: New translations django.po from Crowdin 2021-10-07 14:01:55 +11:00
Oliver
f55c241e94 Fix: New translations django.po from Crowdin 2021-10-07 14:01:54 +11:00
Oliver
3eefaa41ce Fix: New translations django.po from Crowdin 2021-10-07 14:01:52 +11:00
Oliver
72a4ba217e Fix: New translations django.po from Crowdin 2021-10-07 14:01:50 +11:00
Oliver
000ee58d37 Fix: New translations django.po from Crowdin 2021-10-07 14:01:48 +11:00
Oliver
f48a2c21d1 Fix: New translations django.po from Crowdin 2021-10-07 14:01:47 +11:00
Oliver
50d861e763
Merge pull request #2119 from SchrodingersGat/sales-order-export 
Adds view for exporting sales order
 2021-10-07 13:54:34 +11:00
Oliver
64cf916c50 Add a form to select export format 2021-10-07 13:33:10 +11:00
Oliver
d391c5059b Adds button to sales order page to export to file 2021-10-07 13:21:30 +11:00
Oliver
996ccbe5bd Adds view for exporting sales order 2021-10-07 13:16:25 +11:00
Oliver
fece2c8c94 Fix: New translations django.po from Crowdin 2021-10-07 12:23:11 +11:00
Oliver
59afb2b236 Fix: New translations django.po from Crowdin 2021-10-07 12:23:10 +11:00
Oliver
725644fc21 Fix: New translations django.po from Crowdin 2021-10-07 12:23:08 +11:00
Oliver
644574af8b Fix: New translations django.po from Crowdin 2021-10-07 12:23:06 +11:00
Oliver
d62576cb19 Fix: New translations django.po from Crowdin 2021-10-07 12:23:04 +11:00
Oliver
98e5c4889b Fix: New translations django.po from Crowdin 2021-10-07 12:23:03 +11:00
Oliver
24c92f07d1 Fix: New translations django.po from Crowdin 2021-10-07 12:23:02 +11:00
Oliver
951d05ae30 Fix: New translations django.po from Crowdin 2021-10-07 12:23:00 +11:00
Oliver
41b363916a Fix: New translations django.po from Crowdin 2021-10-07 12:22:58 +11:00
Oliver
c4edb35ca9 Fix: New translations django.po from Crowdin 2021-10-07 12:22:56 +11:00
Oliver
13646f4885 Fix: New translations django.po from Crowdin 2021-10-07 12:22:55 +11:00
Oliver
0b73d3e2a9 Fix: New translations django.po from Crowdin 2021-10-07 12:22:54 +11:00
Oliver
0af0055535 Fix: New translations django.po from Crowdin 2021-10-07 12:22:52 +11:00
Oliver
9cc993a2c3 Fix: New translations django.po from Crowdin 2021-10-07 12:22:51 +11:00
Oliver
f54a0e16a2 Fix: New translations django.po from Crowdin 2021-10-07 12:22:50 +11:00
Oliver
dc8cc3ca78 Fix: New translations django.po from Crowdin 2021-10-07 12:22:49 +11:00
Oliver
aa0bf05cd1 Fix: New translations django.po from Crowdin 2021-10-07 12:22:47 +11:00
Oliver
eef6e39ed1 Fix: New translations django.po from Crowdin 2021-10-07 12:22:46 +11:00
Oliver
a69bcb9f18
Merge pull request #2118 from SchrodingersGat/bom-export-fix 
Fix error on BOM export
 2021-10-07 12:14:31 +11:00
Oliver
22d3b05dc6 Fix error on BOM export 2021-10-07 11:52:41 +11:00
Oliver
5a8cf990a2 Fix: New translations django.po from Crowdin 2021-10-07 11:24:38 +11:00
Oliver
8c28dd2513 Fix: New translations django.po from Crowdin 2021-10-07 11:24:37 +11:00
Oliver
4961e90783 Fix: New translations django.po from Crowdin 2021-10-07 11:24:35 +11:00
Oliver
8a407b4f76 Fix: New translations django.po from Crowdin 2021-10-07 11:24:34 +11:00
Oliver
3cc3e0deb9 Fix: New translations django.po from Crowdin 2021-10-07 11:24:33 +11:00
Oliver
9bbda5129f Fix: New translations django.po from Crowdin 2021-10-07 11:24:30 +11:00
Oliver
2b68e19113 Fix: New translations django.po from Crowdin 2021-10-07 11:24:28 +11:00
Oliver
c071d5705d Fix: New translations django.po from Crowdin 2021-10-07 11:24:27 +11:00
Oliver
54723fac28 Fix: New translations django.po from Crowdin 2021-10-07 11:24:26 +11:00
Oliver
3b80737cab Fix: New translations django.po from Crowdin 2021-10-07 11:24:23 +11:00
Oliver
b49355a639 Fix: New translations django.po from Crowdin 2021-10-07 11:24:22 +11:00
Oliver
8e1d852958 Fix: New translations django.po from Crowdin 2021-10-07 11:24:20 +11:00
Oliver
256b09b9ab Fix: New translations django.po from Crowdin 2021-10-07 11:24:19 +11:00
Oliver
6afd184dd0 Fix: New translations django.po from Crowdin 2021-10-07 11:24:17 +11:00
Oliver
3294d259b5 Fix: New translations django.po from Crowdin 2021-10-07 11:24:16 +11:00
Oliver
63e11be783 Fix: New translations django.po from Crowdin 2021-10-07 11:24:15 +11:00
Oliver
42d1481d98 Fix: New translations django.po from Crowdin 2021-10-07 11:24:13 +11:00
Oliver
80b328c6f3 Fix: New translations django.po from Crowdin 2021-10-07 11:24:12 +11:00
Oliver
31665e3b8d Enable editing of "sales order" from build order 
- Add a renderer for the sales order model
 2021-10-07 10:45:14 +11:00
Oliver
55fd2da123 Fix: New translations django.po from Crowdin 2021-10-06 22:47:57 +11:00
Oliver
589476f96e Fix: New translations django.po from Crowdin 2021-10-06 22:47:56 +11:00
Oliver
b5b3cb47e1 Fix: New translations django.po from Crowdin 2021-10-06 22:47:55 +11:00
Oliver
7ad1b9f8f1 Fix: New translations django.po from Crowdin 2021-10-06 22:47:53 +11:00
Oliver
e5474504b8 Fix: New translations django.po from Crowdin 2021-10-06 22:47:52 +11:00
Oliver
6d6e62c329 Fix: New translations django.po from Crowdin 2021-10-06 22:47:51 +11:00
Oliver
65ff7d7530 Fix: New translations django.po from Crowdin 2021-10-06 22:47:49 +11:00
Oliver
82066bc24e Fix: New translations django.po from Crowdin 2021-10-06 22:47:48 +11:00
Oliver
3587eda9f2 Fix: New translations django.po from Crowdin 2021-10-06 22:47:46 +11:00
Oliver
bd178ddf6b Fix: New translations django.po from Crowdin 2021-10-06 22:47:45 +11:00
Oliver
02960444e4 Fix: New translations django.po from Crowdin 2021-10-06 22:47:44 +11:00
Oliver
53af1b6b08 Fix: New translations django.po from Crowdin 2021-10-06 22:47:41 +11:00
Oliver
b68003a6c7 Fix: New translations django.po from Crowdin 2021-10-06 22:47:40 +11:00
Oliver
355cb39e18 Fix: New translations django.po from Crowdin 2021-10-06 22:47:39 +11:00
Oliver
f025dbef51 Fix: New translations django.po from Crowdin 2021-10-06 22:47:37 +11:00
Oliver
1c1f736401 Fix: New translations django.po from Crowdin 2021-10-06 22:47:36 +11:00
Oliver
f6a827462f Fix: New translations django.po from Crowdin 2021-10-06 22:47:35 +11:00
Oliver
22384ac27d Fix: New translations django.po from Crowdin 2021-10-06 22:47:33 +11:00
Oliver
d9fddf64f1 Make this setting a per-user setting 2021-10-06 22:22:20 +11:00
Oliver
166af3592d Add optional display of part stock quantity in forms 2021-10-06 22:12:59 +11:00
Oliver
a19203d17d Fix: New translations django.po from Crowdin 2021-10-06 21:23:44 +11:00
Oliver
3192eea68f Fix: New translations django.po from Crowdin 2021-10-06 21:23:43 +11:00
Oliver
7e3192896e Fix: New translations django.po from Crowdin 2021-10-06 21:23:41 +11:00
Oliver
c5e67004bf Fix: New translations django.po from Crowdin 2021-10-06 21:23:40 +11:00
Oliver
9ed842b8d7 Fix: New translations django.po from Crowdin 2021-10-06 21:23:38 +11:00
Oliver
ffed4b4818 Fix: New translations django.po from Crowdin 2021-10-06 21:23:37 +11:00