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
5,835 Commits 6 Branches 99 Tags 484 MiB
3228c0673c
Commit Graph

712 Commits

Author SHA1 Message Date
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