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

746 Commits

Author SHA1 Message Date
Oliver
778aa0314d Load and display build order allocation items via AJAX 2021-06-18 19:18:35 +10:00
Oliver
10ecddf9b4 Fixes after rebase 2021-06-18 17:25:24 +10: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
997d68694e fix for part with no bom-price #1678 2021-06-17 18:21:11 +02:00
Matthias Mair
44464de2b6
Merge branch 'inventree:master' into internal-price 2021-06-17 16:42:57 +02:00
Matthias Mair
e77e89b16c
Merge branch 'inventree:master' into part-import 2021-06-17 16:42:49 +02:00
Oliver
8766c80233
Merge pull request #1645 from matmair/pricing-reformat 
Pricing reformat
 2021-06-17 22:36:07 +10:00
Matthias
c0e50128dd display latest serial on all part-views #1648 2021-06-11 23:43:23 +02:00
Matthias
0e8a97acb0 added permissions 2021-06-07 05:23:13 +02:00
Matthias
37c0025399 settings for internal prices added 2021-06-07 04:58:37 +02:00
Matthias
62638f76ed fixing wrong page title 2021-06-07 04:00:12 +02:00
Matthias
6ae9fa716c added internal price to part_pricing 2021-06-07 00:19: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
413fa2e842 merging in sidebar icon changes fr upstream 2021-06-06 17:50:13 +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
fcf360f2a3 clearer information text? as in #1577 2021-06-06 14:33:26 +02:00
Matthias
36ff21f11e hide supply part price on start 2021-06-06 14:21:08 +02:00
Matthias
ced7768030 calculate button added 2021-06-06 14:20:30 +02:00
Oliver
573f601752
Merge pull request #1632 from matmair/nav-style 
same nav sidebar distance for everything
 2021-06-06 22:14:20 +10:00
Matthias
768080f9a0 Adding internal functions to use internal prices 2021-06-05 17:06:58 +02:00
Matthias
0d93c96f2a adding internal price breaks as in #1606 2021-06-05 17:01:49 +02:00
Matthias
05d79a4c19 same nav sidebar distance for everything 2021-06-05 15:18:08 +02:00
Matthias
44717b646f using new tag for currency 2021-06-05 15:07:42 +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
eeintech
ffaa6ee3a9 Fixed price break row actions after sorting 2021-06-01 14:22:00 -04:00
Oliver Walters
f1ca17286f Save grid / list selection to local storage settings 2021-05-30 00:38:59 +10:00
Oliver Walters
e846c744f4 Buttons to toggle between list and grid views 2021-05-30 00:23:05 +10:00
Oliver Walters
f08c83d6e5 Fix part page heading 2021-05-29 18:48:18 +10:00
Matthias Mair
9cc81df276 Merge branch 'inventree:master' into price-history 2021-05-28 12:14:03 +02:00
Oliver Walters
c2fe5e08b4 Expand possibilities for variant conversion 
- Ref get_conversion_options
 2021-05-27 12:35:55 +10: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
Matthias
b4c9edcd27 bom-price ranges as pie-chart 2021-05-24 22:31:33 +02:00
Matthias
206bab137b refactor 2021-05-24 17:39:32 +02:00
Matthias
fe8e03c666 additional information for graph 2021-05-24 15:46:11 +02:00
Matthias
d5b2bfedbc re-layouting tables 2021-05-24 02:18:34 +02:00
Matthias
84d71d928f removing new stuff in pricing modal 2021-05-24 01:14:15 +02:00
Matthias
7c18ebbbe4 creating new tab 2021-05-24 01:13:46 +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
900f707ff9 permission added 2021-05-18 11:51:08 +02:00
Oliver Walters
7cd345aeb5 Change location of 'banner' messages 
- Place them inside the main panel
- Generally underneath the thumbnail
 2021-05-18 19:19:43 +10:00
Matthias
e49256a218 fixed bug pointed out by @eeintech 2021-05-18 10:52:27 +02:00
Matthias
eafaf92ae2 unified naming schema 2021-05-18 01:02:31 +02:00
Matthias
6c30d128a1 removing duplicate information 2021-05-16 17:33:24 +02:00
Matthias
3a5b4ab74b crispy forms for FileManagementFormView 2021-05-16 16:00:02 +02:00
Matthias
f1f75b45cb using messages for alerts 2021-05-15 01:02:25 +02:00
Matthias
4ae7debb2b navigation 2021-05-15 00:57:38 +02:00
Matthias
8effdffe6f templates and FileManagement config 2021-05-15 00:57:18 +02:00
Matthias
be92efe7b9 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-05-13 22:58:01 +02:00
Matthias
cdcb6504f9 fixing wrong position 2021-05-12 15:33:49 +02:00
Matthias
f9f191b5e3 Inclusion in all tamplates 
#1574
 2021-05-12 15:31:35 +02:00
Matthias
4156b71c4b Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-05-11 13:32:14 +02:00
Matthias
d38c1f6c0b sample implementation 2021-05-09 14:30:39 +02:00
Matthias Mair
e59f467c79
Merge branch 'master' into spaces! 2021-05-08 12:27:19 +02:00
Matthias
053793288b same spacing for tables 
thanks @eeintech
 2021-05-06 18:05:43 +02:00
Matthias
b09f49aaa5 Merge branch 'master' of https://github.com/inventree/InvenTree into issue1425 2021-05-06 14:54:26 +02:00
Matthias
a77d9d9de7 same treatment for html 2021-05-06 14:33:03 +02:00
Matthias
1259374822 removes layout-shift due to typo in menubar 2021-05-06 00:37:45 +02:00
Matthias
f9463fa277 fixes navbar-layout shift with narrow dollar-sign 2021-05-06 00:33:34 +02:00
Matthias
66f198baa9 removing duplicate information in pricing table 2021-05-06 00:17:46 +02:00
Matthias
030865f8dd sale price in pricing table 2021-05-05 23:49:04 +02:00
Matthias
287a05ddc5 clearer spacing in html 2021-05-05 21:48:58 +02:00
Matthias
f4502aecca Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-04-26 21:48:42 +02:00
Matthias
294dd0525f use spaces instead of tabs 2021-04-22 12:53:49 +02:00
Matthias
f7635fb1c0 reording form 2021-04-22 12:39:48 +02:00
Matthias
80d46fb3ab cleanup; using one currency 2021-04-22 12:30:38 +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
2bb86ff22b Adds missing template file 2021-04-20 20:20:00 +10:00
Oliver Walters
c5fa0bb459 Improved API filtering for PartCategory 2021-04-20 20:15:06 +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
c3319e88f4 typo fix 2021-04-18 01:21:44 +02:00
Matthias
5b9c4dc225 sipler translation strings 2021-04-18 01:21:11 +02:00
Matthias
59063bee6b extending translations to the whole sentence 2021-04-17 23:52:21 +02:00
Matthias
20af4c9ba0 template tag for translatable alerts with links 2021-04-17 23:48:47 +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
Matthias
098ac0c461 using feature in views 2021-04-15 14:52:08 +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
3eae70e745 Merged master and company migrations 2021-04-12 11:10:35 -04:00
eeintech
b5a5f5b409 Simplified stock table view in Part and SupplierPart detail pages 2021-04-08 13:42:35 -04:00
eeintech
0bb2507dd6 Added manufacturer part deletion warning when deleting a part 2021-04-07 14:02:50 -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
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
Matthias
20c455384e added more translation-strings 2021-04-04 22:44:14 +02:00
Matthias
0547e1c03b added more translations in html / js 2021-04-03 04:05:59 +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
eeintech
50adb2ac61 SourceItem only for SupplierPart, added logic to templates 2021-03-29 15:39:25 -04:00
eeintech
e6dfb7da52 Added global setting to enable manufacturer parts 
Created SourceItem model
Updated templates
 2021-03-29 13:22:15 -04:00
eeintech
cbb887ae79 Merge branch 'master' of github.com:inventree/InvenTree into manufacturer_part 2021-03-29 10:12:20 -04:00
Oliver Walters
7a4b90649a HTML / CSS fixes 2021-03-29 16:36:27 +11:00
eeintech
afd2dacfc7 Can now create, view list of parts and view detail page 2021-03-24 11:44:51 -04:00
eeintech
e28dde7f7b Fixed navbar, added missing template and urls 2021-03-23 17:45:03 -04:00
eeintech
08ffbee8ed Fixed model name and added to part navbar 2021-03-23 17:33:29 -04: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
be30933bfa Add custom form template 2021-03-17 23:06:56 +11:00
Oliver Walters
9a710ca28f Fix image download code 2021-03-17 23:02:32 +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
45edb7e802 Add button 2021-03-17 08:28:38 +11:00
Oliver Walters
2de879d2ba Add option to hide form error message 2021-03-15 20:30:18 +11:00
Andreas Kaiser
3897166185 fix typo 2021-03-10 09:48:54 +01:00
Andreas Kaiser
48cd227f06 german translation, HTML tags refactored 2021-03-06 21:52:57 +01:00
Andreas Kaiser
ade1d36397 updated german translation, change tags bold italics 2021-03-05 01:03:08 +01:00
Oliver Walters
979f543c3f Add build orders to search results list 2021-03-03 08:44:13 +11:00
Oliver Walters
6f2ba71339 Refactor side navigation tree 2021-02-28 11:48:20 +11:00
Oliver Walters
5c61c18dc4 Add API endpoint which provides list of role permissions available to current user 2021-02-26 17:52:06 +11:00
Oliver Walters
1dfda5b0ed Fix display for top-level category 2021-02-26 13:03:03 +11:00
Oliver Walters
12c2ea3b37 Refactor multi-bom deletion 2021-02-26 10:54:54 +11:00
Oliver Walters
f2da1c990b Simplify process for marking a part as "starred" 2021-02-25 23:27:27 +11:00
Oliver Walters
26e80fa0ab Fancify all the menubars 2021-02-25 09:10:20 +11:00
Oliver Walters
fe42d5c54d Cleanup display for part 2021-02-24 21:58:40 +11:00
Oliver Walters
48d2a395de Part Category now uses menubar display 2021-02-24 21:39:45 +11:00
Oliver Walters
a0eec930bb Cleanup 2021-02-24 21:30:55 +11:00
Oliver Walters
213851e8aa Purchase Order now uses menu bar 2021-02-24 20:01:05 +11:00
Oliver Walters
bedfaa582c Update "part" display to use new menubar 2021-02-24 17:58:43 +11:00
Oliver Walters
2a7b32d4f4 Part display tweaks 2021-02-24 16:37:32 +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
39d4ddd845 Enable filtering for "used in" table 2021-02-23 13:23:23 +11:00
Oliver Walters
041f056116 Display stock tab for virtual parts 2021-02-23 10:40:52 +11:00
Oliver Walters
58863b1924 Show child builds 2021-02-22 22:35:54 +11:00
Oliver Walters
9fe9cbc795 Fixes weird variant display 
- Seems like the double import was at fault (somehow??)
 2021-02-22 16:57:33 +11:00
Oliver Walters
bfbcbe252b Adds "required parts" tab to build view 2021-02-18 17:14:57 +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
1eb2456e3d Display inherited rows a bit differenter 2021-02-17 22:25:43 +11:00
Oliver Walters
fcc35f2260 Fix display of parts currently being built 2021-02-17 13:14:27 +11:00
Oliver Walters
34df19242c Adds more context data 2021-02-17 11:08:11 +11:00
Oliver Walters
28c9c80f54 Calculate quantity required for sales orders 
- Cache data going to part detail view
 2021-02-17 10:57:17 +11:00
Oliver Walters
cda97829ab Add function for required build order quantity 2021-02-17 10:27:36 +11:00
Oliver
a444f21e64
Merge pull request #1292 from SchrodingersGat/bom-report 
BOM report
 2021-02-16 21:32:28 +11:00
Oliver Walters
11099676ef Dialog for printing BOM reports 2021-02-12 21:23:56 +11:00
Oliver Walters
b22b82877d Hide units when empty 2021-02-12 20:01:09 +11:00
Oliver Walters
a0e7d37a19 Add setting for enabling / disabling test reports 2021-02-04 21:15:19 +11:00
Oliver Walters
7e8def15ed Hide barcode actions if barcode support is disabled 2021-01-28 20:45:42 +11:00
Oliver Walters
833ba8c472 Template fixes 2021-01-18 22:45:07 +11:00
Oliver Walters
526d81481b Cleanup 2021-01-18 22:25:53 +11:00
Oliver Walters
1cb951bd0b Fix for font-awesome icon 2021-01-14 12:08:54 +11:00
eeintech
59c0a50289 Separated category from part permissions and location from stock item permissions 2021-01-13 13:35:49 -05:00
eeintech
a1b2347784 Also allow part attachements and parameters to be deleted 2021-01-12 17:43:12 -05:00
Oliver Walters
37dcf1c1cf Add "default_expiry" field to Part model 2021-01-04 23:36:11 +11:00
Oliver Walters
298e9cae65 Fix variable scope issue 2021-01-03 10:07:38 +11:00