2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-05-03 22:08:49 +00:00

836 Commits

Author SHA1 Message Date
15804f873b Merge branch 'master' of https://github.com/inventree/InvenTree into order-modal-show-price 2021-06-18 16:46:11 +02:00
Oliver
778aa0314d Load and display build order allocation items via AJAX 2021-06-18 19:18:35 +10:00
Oliver
245c9bfd28 Enhancement for the BuildItem API / serializer
- Add optional "part_detail" information
- Add optional "build_detail" information
- Add optional "location_detail" information
2021-06-18 19:08:54 +10:00
Matthias Mair
8d317581dd
Merge branch 'master' into order-modal-show-price 2021-06-18 09:41:10 +02:00
Oliver Walters
0b8a50cd92 Add 'location_detail' filter 2021-06-18 16:51:34 +10:00
Oliver
43478a0be7
Merge pull request #1634 from matmair/internal-price
Internal price
2021-06-18 10:36:29 +10:00
865a2b4af8 Merge branch 'modal-options' of https://github.com/matmair/InvenTree into order-modal-show-price 2021-06-17 23:44:45 +02:00
2d8b96a6b8 setting to control visibility of price 2021-06-17 23:15:42 +02:00
c74ee4e925 doc for option.buttons 2021-06-17 19:24:08 +02:00
96c29847e1 add custom buttons with response 2021-06-17 19:23:30 +02:00
3d17388b48 set modal title with response 2021-06-17 19:22:00 +02:00
ebe2ae77a5 hide error message with response 2021-06-17 19:18:34 +02:00
Matthias Mair
44464de2b6
Merge branch 'inventree:master' into internal-price 2021-06-17 16:42:57 +02:00
eeintech
08fbdf660b Fix for #1661 2021-06-14 14:19:10 -04:00
Oliver
3aadf94a9c Stock Test: Fix display of stock test table
- Incorrect parent node was set
2021-06-08 16:15:40 +10:00
37c0025399 settings for internal prices added 2021-06-07 04:58:37 +02:00
5a869d247f Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-06 17:46:33 +02:00
d70b4bcabb refactor 2021-06-06 17:44:02 +02:00
4f7edac213 back button 2021-06-06 17:43:16 +02:00
5e6919f14e hide error message 2021-06-06 16:32:46 +02:00
ded68bb4f6 change titel with modal submit 2021-06-06 16:09:51 +02:00
35451248c2 reseting modal on open 2021-06-06 15:25:56 +02:00
691142ea4c fixing currency display 2021-06-05 13:27:39 +02:00
495babe712 Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-02 00:36:15 +02:00
Oliver Walters
b31796cbeb Simplified "installed_in" table 2021-06-01 16:40:02 +10:00
Oliver Walters
9baf856d75 Fixes for build item allocation rendering 2021-06-01 16:14:26 +10:00
Oliver Walters
9f407df15a Update BOM table display 2021-06-01 14:17:31 +10:00
Oliver Walters
0375d5b940 Specify a unique parent node that cannot shadow an existing pk 2021-06-01 08:30:50 +10:00
Oliver Walters
3ba7b2d136 Visual hack for custom part card view 2021-05-31 17:05:12 +10:00
Oliver Walters
f0cf83a0b8 Use tree-grid instead of group-by for showing test results
- Much more predictable display
2021-05-31 16:55:21 +10:00
Oliver Walters
b10410ca1f Update bootstrap-table library
Updated javascript / css to latest version
2021-05-31 12:47:07 +10:00
Oliver Walters
e846c744f4 Buttons to toggle between list and grid views 2021-05-30 00:23:05 +10:00
Oliver Walters
ee95cf5c21 Clicking on thumbnail shows modal image 2021-05-30 00:10:46 +10:00
Oliver Walters
887adf35f4 Add simple tile grid view for part list 2021-05-29 23:59:27 +10:00
Matthias Mair
9cc81df276 Merge branch 'inventree:master' into price-history 2021-05-28 12:14:03 +02:00
eeintech
cdb453b09c Merge branch 'master' of github.com:inventree/InvenTree into bom_items_purchase_price 2021-05-27 10:20:40 -04:00
Oliver Walters
6085478672 Simplify settings view
- Show various currency exchange rates
- Button to "refresh now"
2021-05-27 16:34:37 +10:00
Oliver Walters
af1904b6e4 Simplify exhange rate backend 2021-05-27 15:45:38 +10:00
eeintech
bf83cfb04c Merge branch 'master' of github.com:inventree/InvenTree into bom_items_purchase_price 2021-05-26 09:28:55 -04:00
Matthias Mair
859a3178a4
Merge branch 'master' into part-import 2021-05-26 13:08:58 +02:00
79374c5dfd ajax implementation for part import 2021-05-26 13:05:20 +02:00
4319ba16af Settings to show import-button 2021-05-26 09:20:50 +02:00
eeintech
b04ad48178 Fixed test using manual exchange backend, template update 2021-05-25 11:39:04 -04:00
eeintech
93bfe4c5f1 Added 'Custom Exchange Rate' boolea setting
Removed Fixer.io exchange rate backend
2021-05-25 11:19:07 -04:00
eeintech
654d4ecf46 Merged @SchrodingersGat ExchangeRateHost integration work 2021-05-25 10:34:20 -04:00
Oliver Walters
619cba6007 Currency: Use ExchangeRateHost backend by default, rather than fixer.io
- No longer support fixer.io as it requires an API key and does not support "base" currency
2021-05-25 10:37:53 +10:00
b4c9edcd27 bom-price ranges as pie-chart 2021-05-24 22:31:33 +02:00
3363969c17 added in randomColor for dynamic color gen 2021-05-24 19:14:38 +02:00
206bab137b refactor 2021-05-24 17:39:32 +02:00
b803fbae72 remofing setting 2021-05-24 00:18:04 +02:00