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
7,809 Commits 6 Branches 99 Tags 484 MiB
fa1ea2f701
Commit Graph

1115 Commits

Author SHA1 Message Date
Oliver
293b5d4c07 Allow file and image fields 
- Use FormData class
- Replace existing Company image upload form
 2021-06-30 00:13:53 +10:00
Oliver
c25967eff6 Replace CompanyCreate and CompanyEdit forms with AJAX form 
- Adds the ability to specify an "icon" for each field
 2021-06-29 21:17:48 +10:00
Oliver
cf0feffe26 Allow override of values from calling function 2021-06-29 20:44:44 +10:00
Matthias
d10169932d option to hide related parts #1733 2021-06-29 12:33:54 +02:00
Oliver
5230a5a41b Add "success" functionality for form posting 2021-06-29 19:55:32 +10:00
Oliver
f18c2a7a3d Fix rendering during search 2021-06-29 12:48:56 +10:00
Oliver
9312a5d3b4 Correctly render selected value of a related field 
Ref: https://select2.org/programmatic-control/add-select-clear-items#preselecting-options-in-an-remotely-sourced-ajax-select2
 2021-06-29 12:39:39 +10:00
Oliver
798bc17311 Merge remote-tracking branch 'inventree/master' into drf-api-forms 2021-06-29 09:57:03 +10:00
Oliver
374344d0e2 Refactor switch statement 2021-06-29 09:28:00 +10:00
Oliver
0037056ee8 Better default renderer 2021-06-29 09:26:40 +10:00
Oliver
25a01be995 Added warning message for missing model information 2021-06-29 09:25:40 +10:00
Oliver
c3ef8d2dfb Fixes for model renderers 2021-06-29 09:14:26 +10:00
Matthias
153be2df13 Merge branch 'master' of https://github.com/inventree/InvenTree into allocated-sort-qty 2021-06-29 00:17:29 +02:00
Oliver
ed2f21f583 Display field prefix element in form 2021-06-28 21:38:42 +10:00
Oliver
ac7564d069 Extract "limit_choices_to" options for relatedfields 
- Specify as 'filters' for 'related field' type
- Extremely handy to be able to filter AJAX requests in a DRY manner!
 2021-06-28 21:29:51 +10:00
Oliver
e585079779 Callback function for fields after editing 2021-06-28 19:32:48 +10:00
Oliver
fbff9bfb2d Insert buttons for secondary modals 2021-06-28 15:10:17 +10:00
Oliver
41539b75db Adds custom filters for AJAX queries 2021-06-28 14:19:05 +10:00
Oliver
e2942238a9 Bug fix - check for null rather than just ! 2021-06-28 13:10:41 +10:00
Oliver
ba2537d125 Refactor the way that field options are passed to a form 2021-06-28 13:03:34 +10:00
Oliver
6335372208 Store instance data when performing an "update" 2021-06-28 09:28:38 +10:00
Matthias
5598f7fad1 added sale price history 2021-06-27 21:32:27 +02:00
Matthias
d71aee00cd refactor of variable names 2021-06-27 17:54:33 +02:00
Matthias
984efd7493 sort graph-data as well 2021-06-27 17:51:49 +02:00
Matthias
547f7a8f36 Merge branch 'master' of https://github.com/inventree/InvenTree into one-pricing-view 2021-06-27 14:40:17 +02:00
Matthias
cd6d13fa7d Merge branch 'master' of https://github.com/inventree/InvenTree into bom-pricing 2021-06-27 14:38:23 +02:00
Oliver
0e9b82c475 Load default values into rendered form 2021-06-27 21:58:22 +10:00
Matthias
a3ec24fbcc Reenabling prices for BOM items 
Closes #1721
 2021-06-27 13:48:08 +02:00
Oliver
67f76c8bca Merge remote-tracking branch 'inventree/master' into drf-api-forms 2021-06-27 09:26:23 +10:00
Matthias Mair
e760aa172a
Merge branch 'master' into part-import 2021-06-26 23:58:41 +02:00
Oliver
f696bb2e2a Correctly read out boolean fields 2021-06-26 19:49:56 +10:00
Oliver
2eb7565683 Callback handler for form success 2021-06-26 19:30:57 +10:00
Oliver
9dd2765bd2 Handle returned error messages 2021-06-26 19:11:20 +10:00
Oliver
e9db72017d Extract field data on submit 2021-06-26 17:54:14 +10:00
Oliver
949c7dd81b Set modal form title 2021-06-26 14:30:14 +10:00
Oliver
565631ef87 More features 
- Custom renderers depending on specified model name
- Paginate API results
 2021-06-26 14:09:35 +10:00
Matthias
d28d66795d linked price break graphs 2021-06-25 07:41:00 +02:00
Matthias
4921cd47f9 refactor for better readabilty 2021-06-25 07:40:01 +02:00
Oliver
b29db6f258 Remove old debug message 2021-06-25 15:22:40 +10:00
Oliver
d411728be6 Start of custom rendering support based on model 2021-06-25 13:58:36 +10:00
Oliver
4cf69a5a4c Custom rendering functions 2021-06-25 13:47:33 +10:00
Oliver
341467ae8d Fixes for base template 2021-06-25 13:47:09 +10:00
Oliver
9e7d1710db Fixes for select2 rendering issues 2021-06-25 13:23:29 +10:00
Oliver
b20af54b76 Create select2 instance for related field 2021-06-25 07:36:37 +10:00
Oliver
970a5d5eed Include API endpoints in OPTIONS metadata 2021-06-25 00:36:22 +10:00
Oliver
a12790d5ca Fixes table data nesting 
Sometimes you just need a quick break
 2021-06-24 13:23:12 +10:00
Oliver
b350a971a4 Working on custom field info in metadata class 2021-06-24 13:12:46 +10:00
Matthias
9f27a77689 price break js refactor 2021-06-24 01:19:09 +02:00
Oliver
9feef935f4 Readonly fields 2021-06-24 00:16:30 +10:00
Oliver
c8085ad39d Skip nested objects 2021-06-24 00:13:40 +10:00
Oliver
9f3f07aff3 Refactor toot-toot 
- Now can specify the "order" of fields
 2021-06-24 00:06:27 +10:00
Oliver
1754af3d43 Adds ability to specify which fields are displayed 2021-06-24 00:00:20 +10:00
Oliver
e7bc53a548 Working on a 'update' form 
- Fetch existing data from the API
 2021-06-23 23:51:11 +10:00
Oliver
6162129e3d Support choice field 2021-06-23 23:36:38 +10:00
Oliver
96ecd2640a Support email fields 2021-06-23 23:27:02 +10:00
Oliver
d77ca8aa3a Support URL fields 2021-06-23 23:23:28 +10:00
Oliver
78232c2ca2 Refactorin' 2021-06-23 23:18:36 +10:00
Oliver
b71977bb6a Add field support 
- Support text field
- Support checkbox field
 2021-06-23 22:59:27 +10:00
Oliver
66687a6915 Now with error messages! 2021-06-23 22:37:45 +10:00
Oliver
aa02377665 Updates for field rendering 2021-06-23 22:25:53 +10:00
Oliver
c387e1a6fc Working on functions to construct the various form components 2021-06-23 22:11:26 +10:00
Oliver
0d9808fbb8 Adds 'constructForm' javascript function 
- Skeleton only (for now!)
 2021-06-23 21:41:19 +10:00
Oliver
eaa5913c8c Adds custom DRF metadata handler 
- Limit available "actions" data to only what the user is allowed to do
 2021-06-23 20:30:26 +10:00
Oliver
058e53459b Add simple function for determining OPTIONS 2021-06-23 20:07:56 +10:00
Oliver
962badc36d
Merge pull request #1682 from matmair/order-modal-show-price 
Order modal show price
 2021-06-22 21:27:59 +10:00
Oliver
650d31ae32 Remove debug statements 2021-06-22 10:43:00 +10:00
Oliver
6886570d0f Bug fix for build order allocation sorting 2021-06-22 10:30:15 +10:00
Matthias
b503c62464 Merge branch 'master' of https://github.com/inventree/InvenTree into order-modal-show-price 2021-06-22 00:27:56 +02:00
Matthias
c8defae575 fixing allocation sorting 2021-06-22 00:03:54 +02:00
Matthias
8b515571ca I think a fix for #1663 
Closes #1663
 2021-06-21 23:33:27 +02:00
Oliver
044650ca10
Merge pull request #1698 from SchrodingersGat/po-stock-pricing 
Displays "purchase order" column in StockItem table
 2021-06-21 17:19:38 +10:00
Oliver
e6598b5115 Displays "purchase order" column in StockItem table 2021-06-21 16:58:39 +10:00
Oliver
5e5fc35655
Merge pull request #1688 from SchrodingersGat/supplier-part-parameters 
Adds "parameters" for manufacturer parts
 2021-06-21 16:39:15 +10:00
Oliver
e0e560352e Add forms / views for ManufacturerPartParameter CRUD 2021-06-21 16:14:58 +10:00
Matthias
80e47b6f76 addd in sorting for category 
fixes #1689
 2021-06-20 22:49:06 +02:00
Oliver
70b6a3c13f Display table of parameters 2021-06-21 00:39:18 +10:00
Oliver
bea7ab7175 Add python version information to the "about" window 2021-06-21 00:25:27 +10:00
Oliver
847d946fa4 Bug fixes 2021-06-20 17:39:00 +10:00
Matthias
59e6cc1a10 Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-18 23:10:59 +02:00
Matthias
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
Matthias
865a2b4af8 Merge branch 'modal-options' of https://github.com/matmair/InvenTree into order-modal-show-price 2021-06-17 23:44:45 +02:00
Matthias
2d8b96a6b8 setting to control visibility of price 2021-06-17 23:15:42 +02:00
Matthias
c74ee4e925 doc for option.buttons 2021-06-17 19:24:08 +02:00
Matthias
96c29847e1 add custom buttons with response 2021-06-17 19:23:30 +02:00
Matthias
3d17388b48 set modal title with response 2021-06-17 19:22:00 +02:00
Matthias
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
Matthias
37c0025399 settings for internal prices added 2021-06-07 04:58:37 +02:00
Matthias
5a869d247f Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-06 17:46:33 +02:00
Matthias
d70b4bcabb refactor 2021-06-06 17:44:02 +02:00
Matthias
4f7edac213 back button 2021-06-06 17:43:16 +02:00
Matthias
5e6919f14e hide error message 2021-06-06 16:32:46 +02:00
Matthias
ded68bb4f6 change titel with modal submit 2021-06-06 16:09:51 +02:00
Matthias
35451248c2 reseting modal on open 2021-06-06 15:25:56 +02:00
Matthias
691142ea4c fixing currency display 2021-06-05 13:27:39 +02:00
Matthias
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
Matthias
79374c5dfd ajax implementation for part import 2021-05-26 13:05:20 +02:00
Matthias
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
Matthias
b4c9edcd27 bom-price ranges as pie-chart 2021-05-24 22:31:33 +02:00
Matthias
3363969c17 added in randomColor for dynamic color gen 2021-05-24 19:14:38 +02:00
Matthias
206bab137b refactor 2021-05-24 17:39:32 +02:00
Matthias
b803fbae72 remofing setting 2021-05-24 00:18:04 +02:00
Matthias
1da1753b23 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-05-23 02:31:07 +02:00
Matthias
53ce848145 better translation 2021-05-22 14:48:56 +02:00
Oliver Walters
240ff59b30 Bump API version to 3 
- New stock item history tracking is incompatible
- Adds API info to the "about" dialog
 2021-05-22 20:56:56 +10:00
eeintech
27799b43b2 Template fix/improvement 2021-05-20 13:51:54 -04:00
eeintech
747b0554e1 Ready for review 2021-05-20 13:45:26 -04:00
eeintech
bed6a7e49c Added exchange rates form 2021-05-20 09:49:56 -04:00
eeintech
6d5b2d3227 Added 'Currencies' settings view in global settings 2021-05-19 17:06:41 -04:00
eeintech
7a175f13a1 Merge branch 'master' of github.com:inventree/InvenTree into bom_items_purchase_price 2021-05-19 13:25:13 -04:00
Oliver Walters
01d444279c Add setting for fixer.io API key 2021-05-18 22:11:24 +10:00
Oliver Walters
a1c4662e91 Move status messages for stock item 2021-05-18 19:11:37 +10:00
Oliver Walters
5204567628 Bug fix for stock item tracking API 2021-05-18 19:06:41 +10:00
Oliver Walters
64c1503fe4 Disable "purchase price" field for non-purchaseable parts 2021-05-17 20:15:53 +10:00
Matthias
cfa6994302 docker-mode in stats 2021-05-16 18:20:32 +02:00
Matthias
ff9970f1cc docker in version copy 2021-05-16 18:20:06 +02:00
Matthias
16b7d6c34d database and debug info in version copy 2021-05-16 18:18:58 +02:00
eeintech
1940fd5199 Now processing currencies 2021-05-14 16:16:23 -04:00
Oliver Walters
f76bc5a7b8 Add debug mode and database backend as info to the "stats" dialog 2021-05-14 12:38:38 +10:00
Matthias
be92efe7b9 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-05-13 22:58:01 +02:00
eeintech
f2e9f58f1b Added purchase price range and average to BOM items/view 2021-05-13 15:47:42 -04:00
Matthias
ba3f3108d7 missing translation 2021-05-13 00:21:42 +02:00
Matthias Mair
b1410c7c2b Merge branch 'inventree:master' into price-history 2021-05-12 23:39:57 +02:00
Matthias
8a8f61c568 functionality for #725 2021-05-12 23:25:39 +02:00
Matthias
3d574f6a18 templates for mailto and tel - links 2021-05-12 15:41:15 +02:00
Oliver Walters
03a231bffb Updates 
- Add StockHistoryCode to custom context
- Add simple form for editing stock item history
- Add tracking entry when stock status is changed
 2021-05-11 23:38:26 +10:00
Oliver Walters
0c19a94f5c Add run-time addition of extra data to the API 2021-05-11 22:50:58 +10:00
Matthias
4156b71c4b Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-05-11 13:32:14 +02:00
Matthias
fc83458bdb changes as suggested by @SchrodingersGat 2021-05-10 07:53:58 +02:00
Matthias
9f6f69a815 rename for shorter inclusion str 2021-05-09 14:29:35 +02:00
Matthias
783b039eb1 initial functionality for #997 2021-05-09 14:28:46 +02:00
Matthias Mair
e59f467c79
Merge branch 'master' into spaces! 2021-05-08 12:27:19 +02:00
Matthias
f73863ea51 adding in cstm action buttons function 2021-05-07 07:18:13 +02:00
Matthias
8c63b53c16 here we go js 2021-05-06 14:35:23 +02:00
Matthias
a77d9d9de7 same treatment for html 2021-05-06 14:33:03 +02:00
Matthias
75f487aee9 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-05-04 00:02:15 +02:00
Matthias
036c5661ec Link for credits in UI and README Closes #1533 2021-04-30 23:40:52 +02:00
Oliver
c60f4c4f2f
Merge pull request #1529 from matmair/matmair/issue1527 
per session user-language settings
 2021-04-30 11:53:39 +10:00
eeintech
a63d5012f0 Purchase order fixes 2021-04-28 13:16:40 -04:00
Matthias
15eb835ffc explicit redirection url Fixes #1527 2021-04-28 14:38:07 +02:00
Matthias
c5640fe6c6 renamed theme to appearance 2021-04-28 14:37:11 +02:00
Matthias
660f2673ac added in language-change form 2021-04-28 14:26:55 +02:00
Matthias
f4502aecca Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-04-26 21:48:42 +02:00
Oliver Walters
d6ef9ee212 Adds some more translatable strings 
- Mostly just to check the workflow integration
 2021-04-22 23:19:11 +10:00
Matthias
294dd0525f use spaces instead of tabs 2021-04-22 12:53:49 +02:00
Matthias
a0154067d2 added setting -> default false 2021-04-22 12:05:48 +02:00
Matthias
07d68f7fde Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-04-21 11:12:48 +02:00
Oliver Walters
5a44a50f3b Fix date in build table 2021-04-21 16:44:17 +10:00
Oliver Walters
76e2b67f36 Fix logic for completing builds 
- Display better messages to the user, too
 2021-04-21 16:44:17 +10:00
Oliver Walters
05e2b62305 Bug fix - calculate button PK at run time!! 2021-04-21 16:44:17 +10:00
Oliver Walters
16b01ed772 significant rework of the build allocation tables / views 2021-04-21 16:44:16 +10:00
Oliver Walters
9e470d4064 Add separate section for "untracked" part allocation 2021-04-21 16:44:16 +10:00
Oliver
4903826be1
Merge pull request #1494 from matmair/feature/js_translation 
Translating JS-Files once
 2021-04-20 22:58:43 +10:00
Matthias
2943dc6083 initial implementation as in #1485 2021-04-20 13:37:19 +02:00
Oliver Walters
c5fa0bb459 Improved API filtering for PartCategory 2021-04-20 20:15:06 +10:00
Oliver Walters
38eea21f4f Enable printing of multiple stock location labels 2021-04-20 20:06:13 +10:00
Oliver Walters
412b05d76c Allow API filtering by "cascading" stock locations 2021-04-20 20:00:15 +10:00
Oliver Walters
6986709fb8 Reorganized stock location view 2021-04-20 19:49:07 +10:00
Oliver Walters
f578f68001 Split "part category" view into separate pages 2021-04-20 19:30:43 +10:00
Oliver
157d58b157
Merge pull request #1481 from matmair/instance-name-in-title 
Instance name in title
 2021-04-18 21:48:37 +10:00
Matthias
6c3a66f7d6 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-04-18 12:58:19 +02:00
Matthias
7a0a901c2b translations fo true/false yes /no 2021-04-17 23:28:10 +02:00
Matthias
b1e08dae78 Merge branch 'master' of https://github.com/inventree/InvenTree into instance-name-in-title 2021-04-17 12:19:38 +02:00
Matthias
3598c36043 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-04-17 09:59:05 +02:00
eeintech
2b4723cc32 Hide system alert for non-staff users, introduced orange icon for less severe alert than background workers not running (like missing email config) 2021-04-16 12:22:13 -04:00
Oliver
d4529ec1c4
Merge pull request #1464 from matmair/translation_improv 
Translation improvments
 2021-04-16 21:46:07 +10:00
Matthias
098ac0c461 using feature in views 2021-04-15 14:52:08 +02:00
Matthias
d49977bed3 initial implementation as described in #1463 2021-04-15 14:51:11 +02:00
Matthias
cfae92e22b more translated strings for api-titles and filters 2021-04-15 12:15:02 +02:00
Matthias
75381cbb7b Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-04-14 21:18:21 +02:00
eeintech
42a73576da Merge branch 'master' of github.com:inventree/InvenTree into manufacturer_part 2021-04-13 09:48:55 -04:00
Oliver Walters
96efb0eb28 Remove "forgot password" link if the email backend is not configured 2021-04-13 20:02:20 +10:00
eeintech
3eae70e745 Merged master and company migrations 2021-04-12 11:10:35 -04:00
Oliver Walters
f902b79d79 And more templates 2021-04-12 20:07:38 +10:00
Oliver Walters
12a4c22a9b Password reset templates 2021-04-12 20:02:05 +10:00
Oliver Walters
b74d365529 Merge remote-tracking branch 'upstream/master' into django-q 2021-04-10 22:46:20 +10:00
eeintech
97e1bc0a67 Added missing part_detail reference 2021-04-08 21:46:11 -04:00
eeintech
b5a5f5b409 Simplified stock table view in Part and SupplierPart detail pages 2021-04-08 13:42:35 -04:00
eeintech
ccd35fc4b4 Fixed supplier part list bug and hide manufacturer fields in supplier part edit form 2021-04-07 11:50:11 -04:00
eeintech
f39928368e Merge branch 'master' of github.com:inventree/InvenTree into manufacturer_part 2021-04-07 10:33:55 -04:00
eeintech
b2264940a3 Dynamic control of information to make cleaner supplier and manufacturer tables 2021-04-07 09:54:20 -04:00
Oliver Walters
9c38d67b52 Merge remote-tracking branch 'upstream/master' into django-q 
# Conflicts:
#	InvenTree/InvenTree/status.py
#	InvenTree/templates/about.html
 2021-04-07 22:29:47 +10:00
Oliver
5e0e364b6c
Merge pull request #1441 from SchrodingersGat/missing-git 
Hide git information if there is an error
 2021-04-07 22:09:38 +10:00
Oliver Walters
6412cf1c87 Hide git information if there is an error 2021-04-07 20:55:44 +10:00
Matthias
f647120cd1 initial showcase implementation 2021-04-06 18:17:09 +02:00
eeintech
bd65a42410 Removed global setting for manufacturer parts (enabled for all users) 2021-04-06 08:49:45 -04:00
eeintech
fd66e8b136 Added MPN link to supplier part list 2021-04-05 15:41:18 -04:00
Matthias
adcb211572 set language in the used js scripts 2021-04-04 22:48:36 +02:00
Matthias
1854da380b made filters.js dynamic for translation 2021-04-03 04:07:27 +02:00
Matthias
0547e1c03b added more translations in html / js 2021-04-03 04:05:59 +02:00
Matthias
698b946403 activated translations for settings 2021-04-02 23:03:24 +02:00
eeintech
94574b37ae Added Manufacturer parts to search, fixed icons, added manufacturer view in supplier part detail page 2021-04-01 10:00:15 -04:00
Oliver Walters
731ec25b24 Merge remote-tracking branch 'inventree/master' into django-q 
# Conflicts:
#	.github/workflows/style.yaml
#	.travis.yml
#	InvenTree/InvenTree/settings.py
 2021-03-31 22:17:38 +11:00
eeintech
e6dfb7da52 Added global setting to enable manufacturer parts 
Created SourceItem model
Updated templates
 2021-03-29 13:22:15 -04:00
eeintech
afd2dacfc7 Can now create, view list of parts and view detail page 2021-03-24 11:44:51 -04:00
Oliver
57289fe141
Merge pull request #1410 from SchrodingersGat/image-downloader 
Image downloader
 2021-03-18 11:10:07 +11:00
Oliver Walters
9c91ba4692 Add image download functionality for company 2021-03-18 09:20:24 +11:00
Oliver Walters
e3a5a56371 Add "modal image" display for part thumbnails 2021-03-17 23:44:47 +11:00
Oliver Walters
15678f789c Add global setting to enable download of files / images from remote URL 2021-03-17 08:40:30 +11:00
Oliver Walters
6946abae13 CSS fix for modal error info dialog 2021-03-16 16:42:33 +11:00
eeintech
7b81a470b9 Merge branch 'master' of github.com:inventree/InvenTree into ipn_edit_setting 2021-03-15 08:50:31 -04:00
Oliver Walters
2de879d2ba Add option to hide form error message 2021-03-15 20:30:18 +11:00
eeintech
89c7c87f1e Add stock filter for parts assemblies 2021-03-12 11:18:19 -05:00
eeintech
b152f7041b Add setting to disable IPN editing after part is created (web only) 2021-03-12 10:30:31 -05:00
Oliver Walters
51616c8aca Merge remote-tracking branch 'upstream/master' into django-q 2021-03-12 15:47:03 +11:00
Oliver Walters
bfb0cb3b47 Add a "heartbeat" task which runs every 5 minutes 
- Allows us to track if the worker is running
- Due to Stat.get_all() not always working
 2021-03-12 15:27:28 +11:00
Oliver
ed028aed62
Merge pull request #1397 from SchrodingersGat/order-report 
Order report
 2021-03-12 14:44:10 +11:00
Oliver Walters
4925f24ca9 Add "up to date" info to the "about" window 2021-03-11 20:07:59 +11:00
Oliver Walters
e1ba0a9a99 Bug fix for tables 2021-03-11 14:24:28 +11:00
Oliver Walters
7ccd339b5c Print reports for multiple selected sales orders / purchase orders 2021-03-11 14:15:31 +11:00
Oliver Walters
fa95759a00 Enable printing for PO and SO 2021-03-11 14:09:57 +11:00
Andreas Kaiser
48cd227f06 german translation, HTML tags refactored 2021-03-06 21:52:57 +01:00
Oliver Walters
45b3c68930 New status info 2021-03-06 21:41:19 +11:00
Oliver Walters
8061669c70 Hacky fix for ordering parts form 2021-03-06 19:49:49 +11:00
Oliver Walters
979f543c3f Add build orders to search results list 2021-03-03 08:44:13 +11:00
Oliver Walters
14000517ce Fixes for build order table 2021-03-03 08:39:14 +11:00
Oliver Walters
339a02a6b2 Bug fix for sorting of sales orders 2021-03-03 08:32:57 +11:00
Oliver Walters
558ea98fa1 Add purchase order and sales order to search results 2021-03-03 08:30:20 +11:00
Oliver Walters
0b15b77140 Fix server-side ordering for purchase order table 2021-03-03 08:13:55 +11:00
Oliver Walters
4ff1c690cc Bug fix for paginated tables 2021-03-02 12:33:01 +11:00
Oliver Walters
04dbfbd892 Fix for stock item tracking table 2021-02-28 20:50:19 +11:00
Oliver Walters
44635d2499 Use server-side pagination for more list endpoints 2021-02-28 20:35:32 +11:00
Oliver Walters
90feb6d210 Server-side paginatino for build orders 2021-02-28 20:31:01 +11:00
Oliver Walters
1239d4af16 Fixes result limiting 
- Required for index page
 2021-02-28 20:16:05 +11:00
Oliver Walters
487794a938 Server side pagination for the part list 2021-02-28 16:29:25 +11:00
Oliver Walters
8ce7b572cc Optionally paginate the StockList table on the server 
- This makes the bootstrap table interface SO FREAKING MUCH FASTER
- Search is now performed on the server too!
 2021-02-28 16:18:45 +11:00
Oliver Walters
f2da1c990b Simplify process for marking a part as "starred" 2021-02-25 23:27:27 +11:00
Oliver Walters
3210af31b4 Sales order now uses menubar 2021-02-24 20:17:25 +11:00
Oliver Walters
213851e8aa Purchase Order now uses menu bar 2021-02-24 20:01:05 +11:00
Oliver Walters
a660578262 Move part menu to the left 2021-02-24 11:02:11 +11:00
Oliver Walters
2e87499fa5 Basic right-side menu for part 2021-02-23 21:51:41 +11:00
Oliver Walters
68f24e97ac Make tree sidenav resizable 2021-02-23 21:09:55 +11:00
Oliver Walters
0016628b41 Keep tree items constrained to a single line 2021-02-23 19:38:28 +11:00
Oliver Walters
15275d24b4 Better CSS for side nav bars 2021-02-23 18:01:42 +11:00
Oliver
94c8bb6805
Merge pull request #1350 from SchrodingersGat/recently-updated 
Adds "Recently Updated Stock" to index page
 2021-02-23 14:47:24 +11:00
Oliver Walters
8717be66fc Configure number of "recent items" shown on index page 2021-02-23 14:15:12 +11:00
Oliver Walters
571a03043e Show recently updated stock items on the index page 2021-02-23 13:43:41 +11:00
Oliver Walters
66e1b180e4 Add option to stock table to disable grouping at run-time 2021-02-23 13:42:59 +11:00
Oliver Walters
39d4ddd845 Enable filtering for "used in" table 2021-02-23 13:23:23 +11:00
Oliver Walters
58863b1924 Show child builds 2021-02-22 22:35:54 +11:00
Oliver Walters
7d54997cb8 Tweaks 2021-02-22 16:48:00 +11:00
Oliver Walters
caf4c293d9 Rename "barcode" module to "barcodes" to prevent import shadowing 
- Add 'barcode' support
 2021-02-22 15:15:25 +11:00
Oliver Walters
23da591c22 Remove old dependency on django_qr_code 2021-02-22 15:00:12 +11:00
Oliver Walters
89cdcda614 Add app info to about dialog 2021-02-22 01:10:11 +11:00
Oliver
d426e376c4
Merge pull request #1333 from SchrodingersGat/cleaner-homepage 
Cleaner homepage
 2021-02-21 21:36:28 +11:00
Oliver Walters
2b1101e165 remove unused files 2021-02-21 21:09:55 +11:00
Oliver Walters
afd7199a69 Cleanup search page too 2021-02-21 21:06:52 +11:00
Oliver Walters
e53c6e9975 Fancy 2021-02-21 20:29:48 +11:00
Oliver Walters
d11adf3b34 fade in 2021-02-21 20:18:14 +11:00
Oliver Walters
dffff89e9d Add option to filter out variants in stock table 2021-02-21 20:08:23 +11:00
Oliver Walters
9d12d43574 Cleanup / refactor 2021-02-19 18:10:10 +11:00
Oliver Walters
116ea65160 Show / hide panels 2021-02-19 17:57:38 +11:00
Oliver Walters
6df6a460e4 Add items using javascript 2021-02-19 17:48:32 +11:00
Oliver Walters
098b494047 Add option to disable stock item grouping 2021-02-19 11:31:38 +11:00
Oliver Walters
644583f636 Display packaging info in stock table 2021-02-19 11:09:24 +11:00
Oliver Walters
0c053c6339 Add action buttons to order or build stock 2021-02-18 17:25:39 +11:00
Oliver Walters
bfbcbe252b Adds "required parts" tab to build view 2021-02-18 17:14:57 +11:00
Oliver Walters
1b73f56937 modal content wrapper for secondary modal 2021-02-18 14:56:35 +11:00
Oliver Walters
7a51e6cf78 Implement filtering which accommodates new inheritable BOM feature 
- Can no longer filter bom_items by sub_part
- Adds get_used_in_filter() and get_used_in() for part model (returns a query of other part objects)
 2021-02-18 14:35:21 +11:00
Oliver Walters
bb3440a8a4 Refactor bom item filter 
- Also updates a number of part functions to make use of inherited BOM items
 2021-02-17 22:53:56 +11:00
Oliver Walters
1eb2456e3d Display inherited rows a bit differenter 2021-02-17 22:25:43 +11:00
Oliver Walters
5b402b6bc0 BOM table formatting 
- Display link to external BOM
- Prevent item from being edited to selected
 2021-02-17 22:18:32 +11:00
Oliver Walters
43eba3f7ec Add ability to include bom items inherited from parent parts in the API list 2021-02-17 22:05:17 +11:00
Oliver Walters
c8650ce34c Bug fix for tables 2021-02-17 13:05:58 +11:00
Oliver Walters
baa352ca98 Add message if username / password combo is rejected 2021-02-16 22:34:24 +11:00
Oliver
a444f21e64
Merge pull request #1292 from SchrodingersGat/bom-report 
BOM report
 2021-02-16 21:32:28 +11:00
Oliver Walters
f87b15e4ea Refactoring 2021-02-16 20:14:13 +11:00
Oliver Walters
6cc0880b4a Add INVENTREE_BASE_URL setting 
- Also adds callable validator!
 2021-02-16 15:31:04 +11:00
Oliver Walters
247c4bdb4b Print multiple build reports 2021-02-16 08:45:28 +11:00
Oliver Walters
b222119653 Add option to print build report 2021-02-16 08:36:04 +11:00
Oliver Walters
39d9ecffec Add image attribution (need to work out how to make it more obvious) 2021-02-13 13:52:35 +11:00
Oliver Walters
99578e6986 Getting a little bit fancy 2021-02-13 13:49:21 +11:00
Oliver
998620b5f3
Merge pull request #1290 from SchrodingersGat/modal-css-fixes 
Modal form CSS fixes
 2021-02-12 21:32:46 +11:00
Oliver Walters
11099676ef Dialog for printing BOM reports 2021-02-12 21:23:56 +11:00
Oliver Walters
ba85ff63bf Refactor selectTestReport into selectReport 2021-02-12 20:38:30 +11:00
Oliver Walters
19143ed082 Modal form CSS fixes 2021-02-12 20:13:17 +11:00
Oliver Walters
efc2290613 Remove code which was causing issue 2021-02-12 19:57:44 +11:00
Oliver Walters
30d95e1511 Add 'REPORT_DEBUG_MODE' setting 
- If set, reports are printed in raw HTML
- Not pretty, but useful for debugging output of rendered template
 2021-02-06 17:36:22 +11:00
Oliver Walters
dbaa0fc300 Add default page size for reports 
- A4 / Legal / Letter
- Use this for the default page size for InvenTree reports
 2021-02-06 17:11:20 +11:00
Oliver Walters
d686fb5057 Fix typo in js file 2021-02-05 12:31:13 +11:00
Oliver Walters
a0e7d37a19 Add setting for enabling / disabling test reports 2021-02-04 21:15:19 +11:00
Oliver Walters
3ccc500e8e Add more context data to report 2021-02-04 12:58:19 +11:00
Oliver
27b8928a10
Merge pull request #1263 from SchrodingersGat/table-translations 
Table translations
 2021-01-30 09:48:47 +11:00
Oliver Walters
c1a54ddffd Expose bootstrap table strings to translation layer 2021-01-29 12:04:36 +11:00
Oliver Walters
62501ecb93 Hide main QR button if setting is disabled 2021-01-29 09:48:16 +11:00
Oliver Walters
fc193c26d0 Delete unused function 2021-01-28 22:43:41 +11:00
Oliver Walters
489a15704c Refactoring 2021-01-28 22:41:20 +11:00
Oliver Walters
c61631a380 Refactor tractor 2021-01-28 22:24:06 +11:00
Oliver Walters
5e5bced0c7 Optionally include javascript code based on barcode feature 2021-01-28 21:51:34 +11:00
Oliver Walters
4641123cd8 Allow multiple stock items to be checked into a location using table selection 2021-01-28 21:47:39 +11:00
Oliver Walters
d61ae8532a Dialog for checking multiple items into a stock location 2021-01-28 21:36:57 +11:00
Oliver Walters
51a33e5dca Add setting to enable / disable barcode support 
(Default = True)
 2021-01-28 20:18:03 +11:00
Oliver Walters
69362ab960 Display link column in part table 2021-01-20 18:04:08 +11:00
Oliver Walters
436207b315 Merge remote-tracking branch 'inventree/master' into batch-reports 
# Conflicts:
#	InvenTree/templates/stock_table.html
 2021-01-18 23:23:58 +11:00
Oliver Walters
526d81481b Cleanup 2021-01-18 22:25:53 +11:00
Oliver Walters
697a338700 Add a smattering of unit tests 2021-01-18 22:14:38 +11:00
Oliver Walters
6a7c722efc Stock table button cleanup 2021-01-18 21:52:20 +11:00
Oliver Walters
952da19600 Print test report for multiple stock items at once 2021-01-18 21:42:55 +11:00
Oliver Walters
ef7cc3f78d Replace existing django form views with API request 2021-01-18 21:33:15 +11:00
eeintech
72c7ceb553 Merged master and updated stock_table.html 2021-01-17 13:11:59 -05:00
Oliver Walters
ef3ac43c4a Add "last updated" date to stock table 2021-01-15 15:27:40 +11:00
eeintech
7d5571ba5b Merged changes from master 2021-01-14 08:52:56 -05:00
Oliver Walters
0134597747 Merge remote-tracking branch 'inventree/master' into label-api 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
 2021-01-14 23:56:23 +11:00
Oliver Walters
75e1442fce Display overdue purchase orders on the index page 2021-01-14 17:48:16 +11:00
Oliver Walters
a8e6d0a89f Display overdue status in purchase order table 
- Allow table to be filtered by "overdue" status
 2021-01-14 17:37:10 +11:00
Oliver Walters
1dc2636e45 Add option to show part quantity in various forms 
Enabling this option can make BOM item forms *very* slow!
 2021-01-14 15:20:42 +11:00
Oliver
76c938762c
Merge pull request #1228 from SchrodingersGat/stock-status-ste 
Stock status ste
 2021-01-14 14:24:47 +11:00
Oliver Walters
bb9fe98a7e Set status for multiple stock items at once 2021-01-14 14:04:24 +11:00
Oliver Walters
aac835f634 Add menu item to set stock status for multiple items 2021-01-14 13:41:38 +11:00
Oliver Walters
d459947949 Add "Can Build" column in BOM view 2021-01-14 13:34:51 +11:00
Oliver Walters
df327d4e64 Add stocktake_date field to stock API, and to stock table 2021-01-14 11:29:35 +11:00
eeintech
b6135fda74 Updated templates and a lot of manual testing 2021-01-12 13:16:04 -05:00
Oliver Walters
d91700fd39 StockLocation labels are now printable 2021-01-11 18:41:57 +11:00
Oliver Walters
af47b211fd Add dialog for selection of stock location labels 2021-01-11 17:22:04 +11:00
Oliver Walters
e133fff03e Download PDF for labels 2021-01-09 21:50:42 +11:00
Oliver Walters
bdc7367e29 Add endpoint for printing labels 2021-01-09 20:43:48 +11:00
eeintech
f26f1c38a2 Merged master 2021-01-07 13:50:29 -05:00
Oliver Walters
76c86e7b2f Calendar view for purchase orders 2021-01-07 23:04:00 +11:00
Oliver Walters
b4277e09e8 Add fullcalendar javascript library 2021-01-07 14:21:32 +11:00
Oliver Walters
1d6a049c5a Annotate stock queryset with stale status 2021-01-06 23:06:49 +11:00
Oliver Walters
a5b18640af Display stale stock on index page 2021-01-06 22:30:12 +11:00
Oliver Walters
ba915da22b Filter StockItem API by staleness 2021-01-06 22:20:54 +11:00
Oliver Walters
580e7599a0 Prevent expired stock from being added to a sales order 2021-01-06 20:22:56 +11:00