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
10,101 Commits 6 Branches 99 Tags 484 MiB
72da18719f
Commit Graph

317 Commits

Author SHA1 Message Date
Matthias
ce3f7b698d InvenTreeUserSettings added 2021-07-20 01:35:58 +02:00
Matthias
ec53099872 abstracting Settings model 2021-07-20 01:34:35 +02:00
eeintech
53f2aa107a Umm watch out for the true fix! 2021-07-19 15:51:04 -04:00
eeintech
9acd57f8e0 CI was not completely fixed 2021-07-19 15:29:04 -04:00
eeintech
c1db4c7b3d Try to catch encoding error, fixed CI 2021-07-19 15:14:08 -04:00
eeintech
3ab058e84b Fixed default currency selection 2021-07-19 14:49:55 -04:00
Matthias
210a4bccde setting for #1796 2021-07-18 02:20:56 +02:00
Oliver
09d175f7cf Fix purchase order import form 2021-07-15 23:11:59 +10:00
Matthias
1bfa3cdd63 makes currency selection human-readable 2021-07-02 20:02:15 +02:00
Matthias
5aaced6e66 migration for file-based currency setting 2021-07-01 18:20:39 +02:00
Matthias
14c904c0c5 style fixes 2021-07-01 10:45:33 +02:00
Matthias
951e8910ba using functions for currency codes 2021-07-01 10:41:23 +02:00
Matthias
983255a05e naming refactor 2021-07-01 10:37:16 +02:00
Matthias
66c1e9c97d currency codes in own function 2021-07-01 10:32:07 +02:00
Matthias
fcdefc4f83 removing default_currency in fields 2021-07-01 00:40:26 +02:00
Matthias
e2278fc261 removing lambda 2021-07-01 00:33:24 +02:00
Matthias
3a57093b4e replace MoneyFields with inherited classes 2021-07-01 00:13:38 +02:00
Matthias
56b23389d3 missed the settings definition 2021-06-30 23:54:56 +02:00
Matthias
4fa57aee16 changing method call to avoid circle ref 2021-06-30 23:48:43 +02:00
Matthias
92645d790b use setting for currency_code_default 2021-06-30 23:36:46 +02:00
Matthias
88f57a211f setting for default currency 2021-06-30 23:35:57 +02:00
Matthias
d10169932d option to hide related parts #1733 2021-06-29 12:33:54 +02:00
Matthias Mair
e760aa172a
Merge branch 'master' into part-import 2021-06-26 23:58:41 +02:00
Matthias
7d5aa8189d Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-18 23:30:54 +02:00
Matthias
59e6cc1a10 Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-18 23:10:59 +02:00
Matthias Mair
8d317581dd
Merge branch 'master' into order-modal-show-price 2021-06-18 09:41:10 +02:00
Matthias
2cbdeae914 style-fix 2021-06-18 00:18:45 +02:00
Matthias
2d8b96a6b8 setting to control visibility of price 2021-06-17 23:15:42 +02:00
Matthias
74c4c559e4 clearer wording for internal price settings 2021-06-07 05:33:20 +02:00
Matthias
37c0025399 settings for internal prices added 2021-06-07 04:58:37 +02:00
Matthias
27282c8049 Merge branch 'master' of https://github.com/inventree/InvenTree into internal-price 2021-06-06 18:15:41 +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
4f7edac213 back button 2021-06-06 17:43:16 +02:00
Matthias
a2a2c61e31 refactor and fix rendering on error 2021-06-06 16:36:01 +02:00
Matthias
7439f72ab1 hide error messagre on error 2021-06-06 16:33:19 +02:00
Matthias
5e6919f14e hide error message 2021-06-06 16:32:46 +02:00
Matthias
35451248c2 reseting modal on open 2021-06-06 15:25:56 +02:00
Matthias
81f00753c6 style 2021-06-05 17:24:04 +02:00
Matthias
768080f9a0 Adding internal functions to use internal prices 2021-06-05 17:06:58 +02:00
Matthias
d87592aedb use the default currency in forms 2021-06-05 13:22:11 +02:00
Matthias
daf3d06cf0 added in optional matches 2021-06-05 01:19:12 +02:00
eeintech
74bd975a0b Revert back to form_list 
Moved OrderMatchItemForm to forms.py
 2021-06-04 13:41:07 -04:00
Matthias
625d868a3f fix for form_list 2021-06-03 00:29:24 +02:00
Matthias
fc9e1e6770 suggested changes @eeintech 2021-06-03 00:17:29 +02:00
Matthias
75cdec81ae style fix 2021-06-02 00:39:38 +02:00
Matthias
495babe712 Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-02 00:36:15 +02:00
Matthias
3c384947b2 spaces cleanup 2021-06-02 00:26:30 +02:00
Matthias
ee582a5490 fixes the problem reported by @eeintech ? 2021-06-02 00:21:01 +02:00
Oliver Walters
4520bb7447 PEP style fixes 2021-05-27 16:36:26 +10:00
Oliver Walters
af1904b6e4 Simplify exhange rate backend 2021-05-27 15:45:38 +10:00
Matthias
9d5b90190b style + merge fix 2021-05-26 13:18:07 +02:00
Matthias Mair
859a3178a4
Merge branch 'master' into part-import 2021-05-26 13:08:58 +02:00
Matthias
421b0a896d AjaxView for reuse of FormViews 2021-05-26 13:04:21 +02:00
Matthias
002706849c enrich context with form if not set 2021-05-26 12:20:37 +02:00
Matthias
4319ba16af Settings to show import-button 2021-05-26 09:20:50 +02: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
eeintech
747b0554e1 Ready for review 2021-05-20 13:45:26 -04:00
Oliver Walters
01d444279c Add setting for fixer.io API key 2021-05-18 22:11:24 +10:00
Matthias
64f8846e99 generalising for done() 2021-05-18 10:47:56 +02:00
Matthias
ad4902ea44 restucture 2021-05-18 10:19:35 +02:00
Matthias
cb0ef30eff form overrides 2021-05-18 10:17:19 +02:00
Matthias
92f8bd36f1 inherited setup method 2021-05-18 01:55:47 +02:00
Matthias
46723f42ca Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-05-18 00:57:10 +02:00
Matthias
508099e536 style fixing 2021-05-16 19:53:01 +02:00
Matthias
3a5b4ab74b crispy forms for FileManagementFormView 2021-05-16 16:00:02 +02:00
Matthias
b9c73b1e60 simpler code 2021-05-16 15:58:35 +02:00
Matthias
8168db8061 implementation for part import 2021-05-16 15:57:57 +02:00
Matthias
90ae281387 adding in optional headers 2021-05-16 15:50:13 +02:00
Matthias
941ac25d53 style fixes 2021-05-15 08:45:01 +02:00
Matthias
888154e30b added todo for cleaner implemention 2021-05-15 01:01:57 +02:00
Matthias
f136f90e12 config for all form-fields 2021-05-15 00:59:47 +02:00
Matthias
8effdffe6f templates and FileManagement config 2021-05-15 00:57:18 +02:00
eeintech
a64ab5956b Removed leftover print 2021-05-13 16:07:57 -04:00
eeintech
22249206d2 Fixed duplicate check 2021-05-13 16:06:57 -04:00
eeintech
e9c4ce8c5f Added support for reference and notes fields 2021-05-11 17:11:09 -04:00
eeintech
ba561d6d19 Fixed import for excel formats 2021-05-11 14:06:38 -04:00
eeintech
a093118856 Few more fixes 2021-05-11 11:02:54 -04:00
eeintech
10eb69caf9 Merge branch 'master' of github.com:inventree/InvenTree into multi_part_forms 2021-05-11 10:22:34 -04:00
eeintech
c9e77edf04 Almost there? 2021-05-10 17:31:29 -04:00
eeintech
6d8f94619b Improved template render, raised bar for automatic field matching 2021-05-10 12:52:34 -04:00
eeintech
f0932040ee Fixed form validation for previous step, hide tab depending on order status, added purchase_price field 2021-05-10 11:42:22 -04:00
Matthias
f931ba405b style fixes 2021-05-08 21:08:12 +02:00
Matthias
89e0856824 fix for deleting items 
in step 2 not working in step 3
 2021-05-08 21:05:02 +02:00
Matthias
e6372fd600 added translations 2021-05-08 20:54:23 +02:00
Matthias
a0d9bf692e simpler code - same function 2021-05-08 20:53:26 +02:00
Matthias Mair
e59f467c79
Merge branch 'master' into spaces! 2021-05-08 12:27:19 +02:00
eeintech
88000200b3 Merged master and resolved conflicts 2021-05-07 18:02:40 -04:00
eeintech
ceccdf3909 Now creating PurchaseOrderLineItem instances! 2021-05-07 18:00:30 -04:00
eeintech
fbf24621f3 Getting there... 2021-05-07 16:46:10 -04:00
eeintech
6e269ae41a Now displaying item match table 2021-05-07 13:23:10 -04:00
eeintech
4f942fd9f7 Working towards item match form 2021-05-06 17:07:22 -04:00
eeintech
e31452a6ad Match field step is now managed through form 2021-05-06 16:05:58 -04:00
Matthias
f2b0717d10 removes all lines consisting only of spaces 
this really bothers me for some reason - nothing technical
 2021-05-06 12:11:38 +02:00
Matthias
1a227faec4 abstracting get_price 2021-05-05 23:42:52 +02:00
eeintech
9773fee50b Validation of matching fields is working 2021-05-05 12:40:48 -04:00
eeintech
b4342d6203 Fixed templates, not sure why can't keep FileManager across forms... and also need to save form data 2021-05-04 17:35:27 -04:00
eeintech
64fb492b97 Added match parts step, need to process fields data 2021-05-04 14:45:52 -04:00
eeintech
7cdf0af04a Added upload file step 2021-05-04 12:20:57 -04:00
eeintech
373898d43e Added step description and crispy form tag 2021-05-04 10:28:00 -04:00
eeintech
b847604f15 Started implementation of multi-step form for purchase order file uplod 2021-05-03 17:30:33 -04:00
Matthias
e668577d97 fix as noted in #1481 2021-04-18 12:31:17 +02:00
Matthias
d49977bed3 initial implementation as described in #1463 2021-04-15 14:51:11 +02: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
Matthias
efd14fca64 made translation lazy 2021-04-04 22:47:01 +02:00
Matthias
446bc06c1b switched translation methode to lazy 2021-04-03 04:01:40 +02: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
Oliver
57289fe141
Merge pull request #1410 from SchrodingersGat/image-downloader 
Image downloader
 2021-03-18 11:10:07 +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
eeintech
b152f7041b Add setting to disable IPN editing after part is created (web only) 2021-03-12 10:30:31 -05:00
Oliver Walters
18defcff16 Read version number from GitHub 2021-03-11 19:56:22 +11:00
Oliver Walters
648d322f54 Style fixes 2021-02-23 14:24:09 +11:00
Oliver Walters
8717be66fc Configure number of "recent items" shown on index page 2021-02-23 14:15:12 +11:00
Oliver Walters
8972a51bd6 Fixes for integer validator for inventree setting 2021-02-23 14:12:16 +11:00
Oliver Walters
098b494047 Add option to disable stock item grouping 2021-02-19 11:31:38 +11:00
Oliver Walters
6cc0880b4a Add INVENTREE_BASE_URL setting 
- Also adds callable validator!
 2021-02-16 15:31:04 +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
a0e7d37a19 Add setting for enabling / disabling test reports 2021-02-04 21:15:19 +11:00
Oliver Walters
51a33e5dca Add setting to enable / disable barcode support 
(Default = True)
 2021-01-28 20:18:03 +11:00
eeintech
7d5571ba5b Merged changes from master 2021-01-14 08:52:56 -05: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
eeintech
587bf26d94 Fixed style 2021-01-08 14:23:35 -05:00
eeintech
2f78c7c036 Updated stock tests quantities 2021-01-08 14:05:53 -05:00
eeintech
f26f1c38a2 Merged master 2021-01-07 13:50:29 -05:00
Oliver Walters
e5b346e7fa PEP fixes 2021-01-06 23:09:26 +11:00
Oliver Walters
ba915da22b Filter StockItem API by staleness 2021-01-06 22:20:54 +11:00
Oliver Walters
d0fb69e67d Add option to enable / disable stock expiry feature 
- Simply hides fields in form views
 2021-01-05 08:50:07 +11:00
Oliver Walters
1335c85de1 Edit new stock settings on settings page 2021-01-05 00:59:10 +11:00
Oliver Walters
e715ea5d79 Merge remote-tracking branch 'inventree/master' into stock-expiry 
# Conflicts:
#	InvenTree/common/models.py
 2021-01-05 00:58:32 +11:00
Oliver Walters
213d6550d3 Add new setock settings 2021-01-05 00:54:05 +11:00
Oliver Walters
0f9c4703cf Update unit testing 2021-01-03 23:33:47 +11:00
Oliver Walters
b05504e1c4 Add PART_VIRTUAL setting 2021-01-03 23:13:58 +11:00
Oliver Walters
9fa37a9156 Improve visualisation of global settings 2021-01-03 22:57:39 +11:00
eeintech
3ff76fbdab Merging master and resolved conflict 2020-12-18 17:08:37 -05:00
Oliver Walters
13e924cc05 Fix default value for PO and SO codes 2020-12-18 16:10:55 +11:00
eeintech
de1dfdcc38 Improved naming of new setting and variables 2020-12-02 13:38:53 -05:00
eeintech
2c38be2d13 Added global setting and updated stock item templates 2020-12-01 15:54:05 -05:00
Oliver Walters
2e842503e6 Fix try statement 2020-11-14 07:39:51 +11:00
Oliver Walters
b738f8b143 Try transaction.atomic 2020-11-13 22:22:02 +11:00
Oliver Walters
aae1400929 Mayyyyyyyyyyyyybe? 2020-11-13 21:37:39 +11:00
Oliver Walters
5f9758e85f More fixes 2020-11-13 21:01:30 +11:00
Oliver Walters
03e852f957 Remove custom save method 2020-11-13 20:22:28 +11:00
Oliver Walters
ee70e27f7d Change function name 2020-11-13 13:21:43 +11:00
Oliver Walters
01ff562dcd Extra unit testing for settings forms / views 2020-11-13 11:50:58 +11:00
Oliver Walters
ae7fbd6112 Add PEP8-naming extension for flake 
- Enforcing python naming checks
 2020-11-12 21:53:04 +11:00
Oliver Walters
0988040172 Catch exception where InvenTree setting object is referenced but the database is not migrated yet 2020-11-12 18:04:50 +11:00
Oliver Walters
cb3c86f87a Merge remote-tracking branch 'inventree/master' into currency-support 
# Conflicts:
#	InvenTree/InvenTree/settings.py
#	InvenTree/InvenTree/urls.py
#	InvenTree/templates/InvenTree/settings/tabs.html
#	InvenTree/users/models.py
#	requirements.txt

IMPORTANT: Had to merge some migration files due to different migrations applied on the part model tables
 2020-11-12 17:24:48 +11:00
Oliver Walters
96ef5e1bde Travis fixes 2020-11-12 15:37:21 +11:00