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,876 Commits 6 Branches 99 Tags 484 MiB
771c453c40
Commit Graph

1099 Commits

Author SHA1 Message Date
Oliver Walters
2e5d5bcc84 Fix part settings page 2021-08-07 20:50:32 +10:00
Matthias Mair
96378cb556
Merge branch 'inventree:master' into trans-improv 2021-08-05 08:17:21 +02:00
Matthias
58f2dce18d
show translation level in ui 2021-08-05 01:23:11 +02:00
Oliver
be67832821
Merge pull request #1908 from eeintech/fix_typo 
Fixed typo for build responsible column header
 2021-08-05 08:14:51 +10:00
eeintech
c0ccb8f588 Fixed typo for build responsible column header 2021-08-04 17:11:35 -04:00
Matthias
3ecb1e6577
cleaner structure 2021-08-04 19:44:01 +02:00
Oliver Walters
aa4ed9feb0 Refactor MakeVariant form 
- Now is essentially identical to the DuplicatePart form
- Uses the API form structure
 2021-08-05 00:24:38 +10:00
Oliver Walters
0e8fb6a5ad Refactored DuplicatePart form 
- API endpoint now takes care of duplication of other data
 2021-08-05 00:16:42 +10:00
Oliver Walters
2cb0b448b7 Fix error message styles for API errors 
- django ValidationError uses "__all__" key for non_field_errors
- whyyyyyyyyyyyy
 2021-08-05 00:15:55 +10:00
Oliver Walters
408ff639dd Adds ability to pre-fill a form with a complete dataset 2021-08-04 23:48:21 +10:00
Oliver Walters
1fafaf8577 Refactor partfields function (was essentially duplicated) 2021-08-04 23:29:39 +10:00
Oliver Walters
2bf3e3ab02 Function to construct part form fields 2021-08-04 23:26:17 +10:00
Oliver Walters
a64ee23afc Add more options for form rendering 
- "before" a field
- "after" a field
- pure "eye candy" field
 2021-08-04 23:16:11 +10:00
Oliver Walters
75a1be0284 Use API forms for creating and editing BomItem objects 2021-08-04 17:25:51 +10:00
Matthias
efd4644045
translation information 2021-08-04 07:55:58 +02:00
Oliver
1f70538b04 Adds a button to tables to reload data 2021-08-04 14:24:17 +10:00
Oliver
7911801dbf
Merge pull request #1900 from SchrodingersGat/part-image-search 
Make the part thumbnail selection window searchable
 2021-08-04 12:28:52 +10:00
Oliver
f95346f214 Make the part thumbnail selection window searchable 2021-08-04 12:10:49 +10:00
Oliver
83d8226ad6 Refactor "CreatePartCategory" form to API 
(cherry picked from commit 06ff961564)
 2021-08-04 11:34:42 +10:00
Matthias
fa3c5ae108 updating language to be clearer 
see https://github.com/inventree/InvenTree/issues/1889#issuecomment-891901070
 2021-08-04 00:45:56 +02:00
Matthias
55762f2a96 do not use safe in template 
that can cause wrong escaping and generally is considered unsafe
 2021-08-01 01:41:46 +02:00
Oliver
7756c766c3 Fix stock.js 2021-07-29 12:35:21 +10:00
Oliver
4381a16b0e Template cleanup 2021-07-29 12:31:07 +10:00
Oliver
6fe5f0e0e6 Fixes for order.js 2021-07-29 11:58:32 +10:00
Oliver
ba5479090a Fix nav.js 2021-07-29 11:54:04 +10:00
Oliver
28bf5bfdbc Fix table_filters.js 2021-07-29 11:52:50 +10:00
Oliver
a222efda33 Fix rendering issues 2021-07-29 11:43:50 +10:00
Oliver
27ec65a002 Add 'settings.js' which provides all settings (global and user) as a dynamic javascript file 
- Minimal database hits required
 2021-07-29 11:28:04 +10:00
Oliver
14aebfdae1 Split dynamic javascript files into two separate directories 
- One gets translated and is served statically
- One does not get translated and is served dynamically
- Add CI step
 2021-07-29 09:23:24 +10:00
eeintech
d43312d162 Missing comma propagating to translated JS files 2021-07-28 13:29:12 -04:00
Oliver
6fd70e4741 Fix search settings page 2021-07-28 14:18:42 +10:00
Oliver
1fe00ef7df Refactor 'category' setttings 2021-07-28 14:16:55 +10:00
Oliver
c08cb43c39 Template rendering fix for inventree.js 2021-07-27 17:22:44 +10:00
Oliver
a93d96de58 Cleanjup 2021-07-27 17:13:02 +10:00
Oliver
990b987692 Reload settings values "live" (without a page refresh) 2021-07-27 17:03:37 +10:00
Oliver
46d5a6f00b - Convert "PART_RECENT_COUNT" to user setting 
- Convert "STOCK_RECENT_COUNT" to user setting
 2021-07-27 14:53:32 +10:00
Oliver
33a0b73a05 Convert SEARCH_PREVIEW_RESULTS to a "user" setting 2021-07-27 14:44:51 +10:00
Oliver
3e0655a9d8 Add "homepage" settings page 2021-07-27 14:34:23 +10:00
Oliver
7fdc0546b4 Merge remote-tracking branch 'inventree/master' into settings-refactor 2021-07-27 14:28:17 +10:00
Oliver
c63a061cf3 Refactor "theme" selection 2021-07-27 08:31:43 +10:00
Oliver
57551d3ac3 inventreeDelete was not returning the promise 2021-07-27 08:17:53 +10:00
Oliver
0186d23563 inline theme form 2021-07-27 07:56:24 +10:00
Oliver
3349e9ff6c Refactor language selection 2021-07-27 00:58:31 +10:00
Oliver
b7b0574a44 Add "appearance" 2021-07-27 00:38:59 +10:00
Oliver
9b0fbb7006 Separate tab for "barcode" settings 2021-07-27 00:36:41 +10:00
Oliver
ca1c692b15 Refactor "Currency settings" view 2021-07-27 00:29:55 +10:00
Oliver
de89c3997d Refactoring a lot of existing settings views 2021-07-27 00:20:31 +10:00
Matthias
175b24a794 changing user settings icon 2021-07-24 00:45:37 +02:00
Matthias
a82483dbaa hiding homepage block when no setting is used 2021-07-24 00:44:16 +02:00
Matthias
31050f23aa adding all homepage settings 2021-07-24 00:08:46 +02:00
Matthias
32eace0c36 moving settings into own section 2021-07-23 11:05:41 +02:00
Matthias
46b0db8263 more hompage settings 2021-07-23 01:07:28 +02:00
Matthias
50356afd41 Merge branch 'master' of https://github.com/inventree/InvenTree into homepage-settings 2021-07-23 00:03:21 +02:00
Matthias
5f2bef7ee1 base implementation of user setting 2021-07-22 23:50:09 +02:00
Matthias
3f6c7df7a8 change template setting behaviour for user setting 2021-07-22 23:48:28 +02:00
Oliver
df48df8119 Catch recursive tree error for part / variant relationship 2021-07-21 21:10:31 +10:00
Oliver
2ffae368f1 Add an option to configure number of parts displayed in search preview box 2021-07-21 15:05:14 +10:00
Matthias Mair
ebb202b19b
Merge branch 'inventree:master' into search-autocomplete 2021-07-19 23:39:16 +02:00
Oliver
efb4f194b6 Refactor StockExportOptions form 2021-07-19 17:23:18 +10:00
Oliver
fa9ef02d23
Merge pull request #1836 from SchrodingersGat/supplier-part-forms 
Supplier part forms
 2021-07-19 11:17:45 +10:00
Oliver
efd0caba6e
Merge pull request #1829 from matmair/initial-amount 
Initial amount
 2021-07-19 09:53:40 +10:00
Matthias
6ca34276bd refactor 2021-07-19 01:17:32 +02:00
Matthias
866c8af393 adding styling to autocomplete 2021-07-19 01:07:33 +02:00
Matthias
17eee66b95 Adding search auto-complete #280 2021-07-19 00:46:51 +02:00
Oliver Walters
0288a1acbf Refactor edit and delete views for ManufacturerPart 2021-07-18 22:59:34 +10:00
Oliver Walters
29d7cb40e1 Add edit and delete buttons for supplier-part table 2021-07-18 22:31:04 +10:00
Oliver Walters
56fa6c512b Refactor SupplierPartCreate form 2021-07-18 22:21:11 +10:00
Oliver
f9b7257bdb
Merge pull request #1835 from SchrodingersGat/disable-secondary 
Disable secondary modals
 2021-07-18 21:46:22 +10:00
Oliver
b1165af3c3
Merge pull request #1833 from SchrodingersGat/part-cat-form-improvements 
Part cat form improvements
 2021-07-18 21:32:31 +10:00
Oliver Walters
b04d6051a4 Disable secondary modals 2021-07-18 21:32:25 +10:00
Oliver Walters
c33cfe9503 Small rendering improvements 2021-07-18 21:17:03 +10:00
Oliver Walters
753fe9c80f Ordering and rendering for StockLocation 2021-07-18 21:15:51 +10:00
Oliver Walters
36cf614aed Add "level" to PartCategory serializer 
- Also use tree ordering by default
 2021-07-18 21:11:53 +10:00
Oliver Walters
f4f7514b45 Similar fix for customer_reference field 2021-07-18 10:47:35 +10:00
Oliver Walters
9719a14587 Add supplier_reference field to form 2021-07-18 10:33:27 +10:00
Matthias
44482800e4 switching out icon for setting 2021-07-18 02:27:15 +02:00
Matthias
210a4bccde setting for #1796 2021-07-18 02:20:56 +02:00
Oliver
0fcb4e3170 Link fixes 2021-07-16 13:30:11 +10:00
eeintech
886d95e467 Easy fix! 2021-07-15 16:31:07 -04:00
Oliver
c61fc7c1df Refactor part pricing page 2021-07-15 23:06:37 +10:00
Oliver
0fc558068f Refactor BuildOrder pages 2021-07-15 22:40:14 +10:00
Oliver
533a3aa368 Refactor StockItem pages 2021-07-15 22:19:13 +10:00
Oliver
984e16d5af Return all part parameters to the main part edit form 
- refactor purchaseorder view
- refactor salesorder view
 2021-07-15 16:07:46 +10:00
Oliver
352a58b373 Can select nav based on URL query parameter 2021-07-15 13:41:26 +10:00
Oliver
c1c0a262b2 Refactor Company detail view 2021-07-13 21:53:48 +10:00
Oliver
b6227f7d28 Refactor PurchaseOrder display 2021-07-13 21:21:00 +10:00
Oliver
65de52b705 Add javascript to dynamically switch between views 2021-07-13 20:58:05 +10:00
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