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

1062 Commits

Author SHA1 Message Date
Oliver
39c58e4015 Move all "SalesOrder" content onto a single page 2021-07-13 19:59:11 +10:00
Oliver
77d80f5c0f Move "attachments" and "notes" to "Part Detail" page 
(cherry picked from commit daf0a082dc04c04cfd68cab70148a7d7cf28460f)
 2021-07-12 23:27:50 +10:00
Oliver
bd8b52d7d2
Merge pull request #1804 from SchrodingersGat/api-stock-adjustments 
Api stock adjustments
 2021-07-12 22:16:56 +10:00
Oliver
ccf17bf4c5 Fix dodgy CSS file 2021-07-12 21:19:00 +10:00
Oliver
77cfadad42 Add 'title' option for contsructed fields 2021-07-12 21:11:29 +10:00
Oliver
edf4aab063 Refactor "showQuestionDialog" function 2021-07-12 21:03:01 +10:00
Oliver
a1579eecfd Refactor "showAlertDialog" function 2021-07-12 20:55:28 +10:00
Oliver
9fc7976569 Refactor all "adjustment" forms to use the new API approach 2021-07-12 20:38:54 +10:00
Oliver
74e5b2cd3f Handle delete differently 2021-07-12 20:06:53 +10:00
Oliver
5329e3e56c Display per-line errors 2021-07-12 19:42:06 +10:00
Oliver
e04828214a Refactor showApiError() function 2021-07-12 19:20:29 +10:00
Oliver
0c41cc7c77 Handle form submissions 2021-07-12 18:13:06 +10:00
Oliver
747cccfa42 Refactor to use more generic forms approach 2021-07-12 16:55:35 +10:00
Oliver
7531984c78 Fix read_only attribute 2021-07-11 21:17:54 +10:00
Oliver
cc90c8abbe Move buttons to separate table column 2021-07-11 21:15:06 +10:00
Oliver
9eb1367d80 Add "location" field 2021-07-11 21:07:56 +10:00
Oliver
3efd7f7777 Add a "notes" field 2021-07-11 20:56:29 +10:00
Oliver
ca5d3a57de Set quantity input parameters based on action 2021-07-11 20:49:54 +10:00
Oliver
9e4bc274cf Allow custom code to be run on form submission 2021-07-11 20:40:27 +10:00
Oliver
c045a3b6f6 Refactorin' 2021-07-11 20:36:52 +10:00
Oliver
14ab1bef14 Callback to remove row 2021-07-11 00:15:46 +10:00
Oliver
0507e8a3bc Building stock adjustment modal 2021-07-10 23:59:35 +10:00
Oliver
6b73e7a408 Add more fields to ManufacturerPart and SupplierPart tables 2021-07-09 14:28:32 +10:00
Oliver
5235ad1b0c
Merge pull request #1787 from SchrodingersGat/bom-table-additions 
Add sub_part_assembly filter to BOM table
 2021-07-09 13:39:09 +10:00
Oliver
079e331bf6 Add sub_part_assembly filter to BOM table 2021-07-09 13:04:48 +10:00
Oliver
558e24c985
Merge pull request #1783 from SchrodingersGat/build-table-filtering 
Fix for strange table filtering bug
 2021-07-09 12:57:03 +10:00
Oliver
9d7f9a9aa3 Fix for strange table filtering bug 
- When a table was "refreshed" based on the selectable filters, table ordering was not observed
- This was due to the original query parameter conversion not being observed
- Refactored out the conversion function so it works correctly now
- Also removed some cruft from generated query strings
 2021-07-09 12:31:25 +10:00
Oliver
7539bd47fe Fix rendering issues 2021-07-09 12:10:27 +10:00
Oliver
4b6ca548b6 Improve form rendering for SupplierPart 2021-07-09 12:09:57 +10:00
Oliver
40ac1f39e0 Improve rendering of "Company" in API form 
- Add a thumbnail image
- Refactor select2 thumbnail code

(cherry picked from commit 2df7c520be)
 2021-07-09 11:14:38 +10:00
Oliver
433098ce6e
Merge pull request #1778 from SchrodingersGat/build-forms 
Refactor BuildOrderEdit form
 2021-07-09 09:02:39 +10:00
Oliver
0a86d947bc Refactor PartParameterCreate form 2021-07-09 02:03:33 +10:00
Oliver
cbf0e0bd4a Refactor forms for editing and deleting a PartParameter 
- PartParameters now loaded using the API, not pre-rendered
 2021-07-09 01:56:04 +10:00
Oliver
337223b8eb Modal form improvements 2021-07-09 01:20:40 +10:00
Oliver
60e8a17f07 bug fix: Prevent API forms from being submitted multiple times 
- A problem if you're a manic clicker
 2021-07-09 01:06:38 +10:00
Oliver
be6ecd9587 Fixes for BuildOrder forms 2021-07-09 00:36:54 +10:00
Oliver
004b36b1df Refactor BuildOrderCreate form 2021-07-09 00:18:03 +10:00
Oliver
245c04367b Refactor BuildOrderEdit form 2021-07-08 23:57:42 +10:00
Oliver
15cb1e0005 Print part labels 2021-07-08 22:54:41 +10:00
Oliver
ff8ddfbb5c Fix link to select2 2021-07-08 10:38:12 +10:00
eeintech
87a7081185 Fixed supplier part detail handling in stock table 2021-07-06 14:32:16 -04:00
Matthias
4711f0b823 fromatter for responsible group 2021-07-04 00:16:14 +02:00
Matthias
4f31cee6a3 Merge branch 'master' of https://github.com/inventree/InvenTree into extend-build-order 2021-07-04 00:02:29 +02:00
Oliver
20b0e399c0
Merge pull request #1716 from SchrodingersGat/drf-api-forms 
[WIP] API Forms
 2021-07-03 22:14:26 +10:00
Oliver
889834b693 Refactor POLineItemCreate form 2021-07-03 21:43:22 +10:00
Oliver
45704f7a8d
Merge pull request #1747 from matmair/depleted-stock 
Depleted stock on start page
 2021-07-03 16:23:27 +10:00
Oliver
83256b1014 Refactor BomItemDelete form 2021-07-03 16:10:41 +10:00
Oliver
359e92cd8e Merge remote-tracking branch 'inventree/master' into drf-api-forms 
# Conflicts:
#	InvenTree/InvenTree/static/css/inventree.css
 2021-07-03 12:59:13 +10:00
Oliver
2b32f04af2
Merge pull request #1712 from matmair/one-pricing-view 
One pricing view
 2021-07-03 12:55:34 +10:00
Oliver
90a3a8a288 Merge remote-tracking branch 'inventree/master' into drf-api-forms 2021-07-03 12:35:40 +10:00
Oliver
d8f5cc7f56
Merge pull request #1744 from matmair/stock-table-has-price 
Stock table filter: has purchase price
 2021-07-03 12:05:29 +10:00
Oliver
1d5429f07e
Merge pull request #1750 from matmair/stock-table-supplier-part 
Stock table add supplier part column
 2021-07-03 11:59:46 +10:00
Matthias
16fafbfb30 sock table link to stock 2021-07-03 02:05:37 +02:00
Matthias
57ce82de32 show supplier_part in stock-table 
#1323
 2021-07-03 02:04:39 +02:00
Matthias
ffa9dd18cf adding new fields into table 2021-07-03 01:49:18 +02:00
Matthias
f46d9537ec changes email-warning to yellow #1732 2021-07-03 00:36:07 +02:00
Matthias
54cb8fa736 adds depleted stock to index 2021-07-03 00:08:00 +02:00
Matthias
f8e2d53ad4 Merge branch 'master' of https://github.com/inventree/InvenTree into one-pricing-view 2021-07-02 16:44:43 +02:00
Oliver
1cdf03ef49 Added MinMoneyValidator to InvenTreeModelMoneyField 
- Refactor edit and delete forms for PurchaseOrderLineItem
 2021-07-03 00:34:41 +10:00
Matthias
9c8717574a implement purchase price filter for stock table 
Closes #1717
 2021-07-02 16:31:42 +02:00
Oliver
993abd9d91 Refactor forms for sales orders 2021-07-03 00:14:36 +10:00
Oliver
984828f3bb Specify 'default' functions for 'reference' field in SalesOrder and PurchaseOrder 
- Refactor CreatePurchaseOrder form
- Some migrations
 2021-07-02 23:59:02 +10:00
Oliver
7e5c9aa043 Refactor PurchaseOrderEdit form 2021-07-02 23:04:53 +10:00
Oliver
5e9372f2d6 Add API endpoints for Owner model 
- Will be necessary for PurchaseOrder, SalesOrder and BuildOrder forms
 2021-07-02 22:45:42 +10:00
Oliver
07910766b3 select2 fixes 2021-07-02 21:36:41 +10:00
Oliver
2a4cbd6eb9 Refactor setRelatedFieldData function 2021-07-02 21:17:20 +10:00
Oliver
6d73265f0e Add support for custom placeholder text 2021-07-02 19:47:47 +10:00
Oliver
746a0210fe Add option to focus on a particular field when launching 2021-07-02 19:40:02 +10:00
Oliver
c7f834e547 Display message when action is not allowed 2021-07-02 19:34:40 +10:00
Oliver
366a2d57c3 Improve docstring 2021-07-02 19:27:19 +10:00
Oliver
2e3bfd18cc Starting work on "secondary modal" functionality 2021-07-02 17:47:18 +10:00
Oliver
291149d733 New modal forms automatically work themselves out 2021-07-02 17:46:54 +10:00
Oliver
047b9d1ecd Capture enter key to submit form 2021-07-02 17:19:58 +10:00
Oliver
72526307ae Renderer for supplier part 2021-07-02 17:11:07 +10:00
Oliver
52952a8a8b Handle different form responses 2021-07-02 16:53:56 +10:00
Oliver
51ebe30754 Merge remote-tracking branch 'inventree/master' into drf-api-forms 
# Conflicts:
#	InvenTree/company/forms.py
 2021-07-02 11:26:09 +10:00
Oliver
00e921f505 More work on dynamic modal template 2021-07-02 11:13:24 +10:00
Oliver
3ff19f8c75 Refactorin' 2021-07-02 11:06:52 +10:00
Oliver
2f1dea1123 Modals can now be created programatically 
- INFINITE MODALS
- API forms now create a new modal as required
 2021-07-02 10:52:56 +10:00
Oliver
74d2334f36 Merge remote-tracking branch 'inventree/master' into drf-api-forms 2021-07-01 22:08:10 +10:00
Oliver
a771d7732b Icon tweak 2021-07-01 21:58:05 +10:00
Oliver
e0f8310ca8 Adds the ability to "clear" a non-required field with an obvious button 2021-07-01 21:57:07 +10:00
Oliver
225162ab8e Add ability to delete multiple selected manufacturer part parameters 2021-07-01 17:20:06 +10:00
Oliver
9bd71c1184 Refactor deletion of multiple manufacturer part objects 
- issues multiple DELETE requests via the API
 2021-07-01 17:01:30 +10:00
Oliver
870542e4c1 Refactor forms for ManufacturerPartParameter 2021-07-01 16:05:23 +10:00
Matthias
88f57a211f setting for default currency 2021-06-30 23:35:57 +02:00
Oliver
54731746d8 Render simple choice fields with select2 2021-06-30 23:18:50 +10:00
Oliver
30ac5dba55 Display attachment upload date 2021-06-30 17:44:23 +10:00
Oliver
9b4db43232 Refactoring "attachment" tables to use the API 
- Part attachments
- StockItem attachments
- PurchaseOrder attachments
- SalesOrder attachments
- BuildOrder attachments
 2021-06-30 17:40:44 +10:00
Oliver
682b2b4b2f Support rendering / updating of date inputs 2021-06-30 17:04:21 +10:00
Oliver
09fff5b644 Refactor PriceBreakCreate form 
- Handle non_field_errors
 2021-06-30 14:07:15 +10:00
Oliver
4d8e88c779 BuildAttachmentDelete form 2021-06-30 12:48:14 +10:00
Oliver
653e3cd135 Starting work on a DELETE form 2021-06-30 12:03:32 +10:00
Oliver
87235b7e6f Replace StockItemAttachmentCreate form 
- Also replace drag-and-drop
- Add 'hidden' option for form fields
- Adds renderer for StockItem model
 2021-06-30 09:17:28 +10:00
Oliver
43f26f2c65 Allow custom labels 2021-06-30 01:07:57 +10:00
Oliver
1f75530910 Specify custom help text for fields on the client side 2021-06-30 01:07:36 +10:00
Oliver
621f47e46c Replace "edit part category" form 2021-06-30 01:04:39 +10:00
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