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
3,155 Commits 6 Branches 99 Tags 484 MiB
cd8214ff4a
Commit Graph

1054 Commits

Author SHA1 Message Date
Oliver Walters
2369b40bbf Ensure user gets saved when uploading attachment via API 2020-05-12 21:11:38 +10:00
Oliver Walters
5d716d0cdd Add "upload date" field to fileattachment base class 2020-05-12 20:57:41 +10:00
Oliver Walters
d4fa7d936e Add 'user' field to attachment 2020-05-12 20:50:03 +10:00
Oliver Walters
cfc0145180 Add some unit tests 2020-05-11 23:44:22 +10:00
Oliver Walters
a7e5a79f4c Expose salesorder and purchaseorder attachments to the API 2020-05-11 23:41:57 +10:00
Oliver Walters
17d0a015f2 Add API endpoint for StockItem attachment items 2020-05-11 23:32:40 +10:00
Oliver Walters
f36c5137dd Add ability to add part file attachments via the API 2020-05-11 23:25:55 +10:00
Oliver Walters
14132a6efa Add views / models / etc etc to support StockItem attachment 2020-05-07 09:57:54 +10:00
Oliver Walters
6318b0bddf Hide a silly button which does nothing 2020-05-04 19:51:06 +10:00
Oliver Walters
0933cf859c Add "new manufacturer" button 2020-05-04 19:48:09 +10:00
Oliver Walters
7430abc237 Add ability to set stock status when receiving goods 2020-05-03 09:50:00 +10:00
Oliver Walters
b39283a18f Separate allocation counters 2020-05-02 20:29:20 +10:00
Oliver Walters
0199760e1c Bug fix 2020-05-02 20:10:12 +10:00
Oliver Walters
cc11df917e Part list API adjustments 2020-05-02 14:03:17 +10:00
Oliver Walters
7fca496de8 Bug fix for StockItem list API 
- The wrong detail data was being set
 2020-05-02 13:51:29 +10:00
Oliver Walters
4197e29fce Major major major (improvements for StockItem list API) 
OK LISTEN UP - Lots of work went into making this speedier:

- For related detail fields (e.g. part_detail), we pre-fetch and cache the model data
- This eliminates duplicate database hits for the same model instances
- Perform all field filtering manually, rather than using the DRF 'filter_fields' concept (this seems to add a lot of overhead)
- Use query annotations to getch calculated fields rather than fetching one-at-a-time
- And finally, if the request is AJAX then return a JsonResponse which is SO FREAKING MUCH FASTER
 2020-05-02 13:46:19 +10:00
Oliver Walters
44319d24e4 Custom list serializer for 'location_detail' 2020-05-02 10:05:35 +10:00
Oliver Walters
a537b6df6e PEP fixes 2020-05-02 09:50:18 +10:00
Oliver Walters
4a60da67fd Significant increase in query speed for Part list 
- Custom list method
- Cache PartCategory objects in memory
 2020-05-02 09:49:05 +10:00
Oliver Walters
a345e0e8da Removed unused serializer field 2020-04-28 23:26:27 +10:00
Oliver Walters
3b42b5e27e Typo fix for part api 2020-04-28 23:17:59 +10:00
Oliver Walters
087001f29d Fix BOM table rendering 
- Price was not being sent in the PartBriefSerializer!
 2020-04-28 23:17:15 +10:00
Oliver Walters
df218a5193 Fix rendering of "used in" page 2020-04-28 22:57:18 +10:00
Oliver Walters
9add3d4409 Much better rendering and calculation of part allocations 2020-04-28 10:43:46 +10:00
Oliver Walters
fb70da0331 Cleanup part allocation calculation functions 2020-04-28 10:35:19 +10:00
Oliver Walters
6bdf371490 Moar UI and translation string fixes 2020-04-28 09:41:47 +10:00
Oliver Walters
440fe155ff Change glyphicons for fontawesome 
I think I gottem all
 2020-04-28 09:31:51 +10:00
Oliver Walters
4fd7b24e3c Update buttons for part BOM view 2020-04-28 08:36:13 +10:00
Oliver Walters
394a9208a1 Merge remote-tracking branch 'inventree/master' into sales-order 
# Conflicts:
#	InvenTree/InvenTree/version.py
 2020-04-27 22:04:05 +10:00
Oliver Walters
35f48ed899 Delete BuildItem objects once a Build has been completed 
- Much more complicated template for build allocation page!
- This will require some refactoring at some point ...
 2020-04-27 20:46:34 +10:00
Oliver Walters
646dd65d27 Re-enable auto-allocation for build 2020-04-27 20:05:02 +10:00
Oliver Walters
5167117067 Calculate 'fulfilled' quantity once a sales order is marked as shipped 
- This allows us to delete the SalesOrderAllocation objects from the database
 2020-04-27 08:58:18 +10:00
Oliver Walters
e768ada83b More work 
- Consolidated "in_stock" filter to single code location
- Improve 'limit_choices_to' for BuildItem and SalesOrderAllocation
- Various template improvements etc
 2020-04-26 16:38:29 +10:00
Oliver Walters
4147163418 Improve status code label rendering 2020-04-26 15:29:21 +10:00
Oliver Walters
1f4bd95d75 Remove the problematic migration entirely 
- The thumbnail check code is run every time the server is started anyway!
 2020-04-26 08:50:37 +10:00
Oliver Walters
72c43d0c2d Bug fix for build completion form 2020-04-25 23:59:28 +10:00
Oliver Walters
b0891c921c Working towards better build allocation: 
- Improve data serialization in API
- Javascript bug fixes
- Load the build allocation table using jQuery
 2020-04-25 21:13:38 +10:00
Oliver Walters
2f0bbecc3d Refactored status code label generation 
- Larger style available
 2020-04-25 15:13:55 +10:00
Oliver Walters
429bb688d0 Template fixes 2020-04-24 13:03:38 +10:00
Oliver Walters
9d25ed335c Rebuild the "PurchaseOrder" detail 
- Use AJAX and bootstrap-table
- Display progress bar
 2020-04-24 12:52:08 +10:00
Oliver Walters
b45fec221c Expose more status code data to the templates 
- Status codes are now exposed globally to every page
- Much simplified so wow
- https://stackoverflow.com/questions/3221592/how-to-pass-common-dictionary-data-to-every-page-in-django
 2020-04-24 09:27:42 +10:00
Oliver Walters
2c9b112562 PEP fixes 2020-04-23 21:48:39 +10:00
Oliver Walters
e5fa94b4f8 Add functionality to cancel a sales order 2020-04-23 21:38:40 +10:00
Oliver Walters
435c13cf7c Separate concept of "OrderStatus" into "SalesOrderStatus" and "PurchaseOrderStatus" 2020-04-23 20:38:09 +10:00
Oliver Walters
7f020cbbf6 Enbiggen a whole lotta buttons 2020-04-23 19:41:14 +10:00
Oliver Walters
b75c343236 Add action buttons to the sales order page 2020-04-21 22:02:17 +10:00
Oliver Walters
4979c690d9 Prevent BOM price calculation from becoming too recursive 2020-04-21 21:38:22 +10:00
Oliver Walters
cb636e000d Display a sub-list of stock items which are allocated to a SalseOrderLineItem 2020-04-21 21:38:04 +10:00
Oliver Walters
7385099194 Add a model to map multiple StockItem objects to a single SalesOrderLineItem 2020-04-21 10:14:55 +10:00
Oliver Walters
3d2e907d5e Add a 'sales order' view for each part 2020-04-21 09:15:01 +10:00
Oliver Walters
9e4d09343c Add ability to filter parts list by "salable" status 2020-04-20 22:39:00 +10:00
Oliver Walters
fee6246a8f PEP fix 2020-04-20 08:25:24 +10:00
Oliver Walters
ef66a3b8f3 Make PartDetail view same as PartList view 2020-04-20 08:10:59 +10:00
Oliver Walters
f5c86bc457 "Fix" for unit tests 
- Not working in travis for some reason?
- But they are working locally...
 2020-04-20 01:23:05 +10:00
Oliver Walters
57fa69f6e6 Update version 
- Display django version in "about" dialog
 2020-04-20 01:20:09 +10:00
Oliver Walters
0334035e77 Simplify StockItem serializer 
- Some more work needed here to cut down on database hits
 2020-04-20 01:09:37 +10:00
Oliver Walters
6a89e0089d Updates for stock serializer 2020-04-20 00:49:13 +10:00
Oliver Walters
092215918c PEP fixes 2020-04-19 23:56:16 +10:00
Oliver Walters
2621c51a7e Further API cleanup 
- Perform a single call to get starred parts for current user and record results
- This provides significant speed improvements
- Remove old manual serializer
- More data prefetching
 2020-04-19 23:50:41 +10:00
Oliver Walters
69b8eed028 Fixes for aggregation issues 
- Ensure that "distinct=True" is set!
- ARRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
 2020-04-19 22:54:46 +10:00
Oliver Walters
37fcb810e4 Add error checking for thumbnail file migration 2020-04-17 19:23:43 +10:00
Oliver
cf5af4dc77
Merge pull request #722 from SchrodingersGat/barcode 
Create simple endpoint for barcode decode
 2020-04-16 21:55:24 +10:00
Oliver Walters
7ab58f683f Fix search result tables 2020-04-16 21:33:35 +10:00
Oliver Walters
10ee8bc666 Use existing serializers to encode information for barcode response 2020-04-15 23:41:16 +10:00
Oliver Walters
4a615e05ae Further barcode work 
- Simplify InvenTree barcode format
- Create base-clas for plugin
 2020-04-14 21:30:43 +10:00
Oliver Walters
7c9eb90bea URL fix 2020-04-14 08:25:10 +10:00
Oliver Walters
0e55911a6b Index page rendering is now a lot faster 
- Hide some elements which are currently very expensive to compute
-
 2020-04-13 22:07:14 +10:00
Oliver Walters
124fab3eee Display a part as 'starred' in the part table 2020-04-13 21:30:17 +10:00
Oliver Walters
b850beb687 Add ability to filter by 'starred' status 2020-04-13 21:24:36 +10:00
Oliver Walters
c17c014b33 More cleanup 
- Allow user filtering for purchase-order table in part view
- Remove some debug strings

(cherry picked from commit ea466c3588)
 2020-04-13 20:21:13 +10:00
Oliver Walters
307dd25f87 Fixes for unit testing 
(cherry picked from commit eb3b5308ab)
 2020-04-13 20:21:08 +10:00
Oliver Walters
8c55831321 Fix supplier-part-table for Part view 
(cherry picked from commit 2839f94773)
 2020-04-13 20:21:00 +10:00
Oliver Walters
5e2ed06c2d Add some more translations 2020-04-12 01:00:49 +10:00
Oliver Walters
3c46e12839 Further work on decimal rounding 
- Prevent numbers from being represented in scientific notation
 2020-04-12 00:56:15 +10:00
Oliver Walters
f1f27f08cb Add icons to part base 2020-04-12 00:40:48 +10:00
Oliver Walters
fd8273e3e2 Improve build base rendering 
- Consolidate style
- Fix rendering of part pricing
 2020-04-12 00:31:59 +10:00
Oliver Walters
a65c80dbf3 Small fixes here and there 2020-04-12 00:20:29 +10:00
Oliver Walters
7503596ea4 More fixes 
- Add a set of template tags for rendering status codes
- Improve build API filtering
- Remove some outdated files
- Fix unit testing
 2020-04-12 00:10:33 +10:00
Oliver Walters
de6f2d37e5 Coalesce baby, yeah! 2020-04-11 23:05:07 +10:00
Oliver Walters
2560613e36 Update API docstring 2020-04-11 23:03:03 +10:00
Oliver Walters
f5a8b110b5 Filter part table by 'is_component' status 2020-04-11 23:02:18 +10:00
Oliver Walters
e1c6ad7761 Logic fix for part filtering 2020-04-11 22:57:16 +10:00
Oliver Walters
e86bc4fa6d Add ability to filter parts by "low_stock" 
- Huzzah for the "Coalesce" function, eh?
 2020-04-11 22:43:51 +10:00
Oliver Walters
5e706554b1 Part table filtering 
- Filter by active status
- Filter by 'is_template' status
- Filter by 'has_stock'
- Allow cascading sublocations
- API improvements to allow new features
 2020-04-11 22:10:15 +10:00
Oliver Walters
64f8034a4c Many more refactoring 2020-04-11 14:14:45 +10:00
Oliver Walters
c1b59eeaab Render filter options as a template 
- This allows the values to be seen by the translation layer
- Also means that whenever a new option is added, it will be automatically available to the front-end!
 2020-04-11 13:24:23 +10:00
Oliver Walters
d06018cbbe PEP fixes 2020-04-07 11:40:10 +10:00
Oliver Walters
95032141ce Toot toot! It's the refactor tractor. 
- Create helper functions to qualify media and static files
 2020-04-07 11:38:57 +10:00
Oliver Walters
e0655f61d8 Check if Company thumbnails are created on Company app start 2020-04-07 11:23:30 +10:00
Oliver Walters
16d3a87e78 Delete old code 2020-04-07 08:12:10 +10:00
Oliver Walters
7fb89e4dbe Check for missing part thumbnails when the server first runs 2020-04-07 08:08:54 +10:00
Oliver Walters
3eb585df27 fixes for unit testing 2020-04-06 21:01:24 +10:00
Oliver Walters
44c10c45cd visual consolidation 2020-04-06 20:50:33 +10:00
Oliver Walters
751937e0c2 Use InstanceName around the place 
- Report in /api/ endpoint
- Display in About window
- Include in any generated barcode
 2020-04-06 20:11:36 +10:00
Oliver Walters
92cb7211ce Rename 'image_url' to 'thumbnail' in PartBrief API 2020-04-06 12:57:04 +10:00
Oliver Walters
789712acbe Rename Build.URL -> Build.link 2020-04-06 11:28:35 +10:00
Oliver Walters
b28487760a Rename Part.URL -> part.link 
- Previous migration needed some tweaking to get it to run... because.. why?
- It seems to pass when running manage.py migrate but fails when running manage.py test
- Stumped on this one
 2020-04-06 11:16:39 +10:00
Oliver Walters
791eb63f35 Same fix for Part API 2020-04-05 22:59:45 +10:00
Oliver Walters
84b1960c7b Moar icons plz 2020-04-05 20:49:05 +10:00
Oliver Walters
7b494c08ec Translations 2020-04-05 20:40:46 +10:00
Oliver Walters
c170d3f87a More icons 2020-04-05 20:40:41 +10:00
Oliver Walters
c427f173ed Nav link icon improvements 2020-04-05 20:04:12 +10:00
Oliver Walters
d739c2dea8 "URL" is renamed to "link" in the URL 2020-04-05 19:18:32 +10:00
Oliver Walters
511cdef323 Peppy fix 2020-04-05 15:59:48 +10:00
Oliver Walters
91b5911ff2 Add 'notes' field to Part detail API 2020-04-05 15:46:18 +10:00
Oliver Walters
1f172b3a57 Add 'bom_items' and 'used_in' to Part detail API 2020-04-05 15:39:55 +10:00
Oliver Walters
b4d66c6797 Add 'building' count to Part detail API 2020-04-05 15:29:31 +10:00
Oliver Walters
8b61acb048 PEP fixes 2020-04-05 00:38:25 +11:00
Oliver Walters
0cfb293ca9 List API now uses the thumbnail image 2020-04-05 00:19:37 +11:00
Oliver Walters
afa31b3415 Generate thumbnails for any part images existing in the database 2020-04-05 00:19:05 +11:00
Oliver Walters
aee0970e49 Part image field now uses django-stdimage 2020-04-04 15:47:05 +11:00
Oliver Walters
b25df586cd Fix API tets 2020-04-03 12:30:58 +11:00
Oliver Walters
f5150f549a Part API changes 
- Allow filtering parts with null parent (top-level category parts)
- Option to include sub-category parts or not
 2020-04-03 09:37:03 +11:00
Oliver Walters
6e65a736e7 Add isNull function to query against null keys 2020-04-03 09:31:26 +11:00
Oliver Walters
d17056820b Allow PartCategory filtering by null parent 2020-04-03 09:25:58 +11:00
Oliver Walters
7e8664a4dd Include "parts" count in Category API 2020-04-03 09:15:09 +11:00
Oliver Walters
34c097c46a Display proper build status label 2020-03-30 16:48:14 +11:00
Oliver Walters
5aec3df7c9 Add stock-info labels to Part info page 2020-03-30 13:37:34 +11:00
Oliver Walters
e8e0ab8416 Include 'minimum_stock' information in part list api 2020-03-30 13:21:33 +11:00
Oliver Walters
713d7960a8 Fix on_order calculation 
- Take into account the number "received"
- Also fix unit tests
 2020-03-26 17:56:44 +11:00
Oliver Walters
6a78f6d451 Include quantity currently being build in Part API 2020-03-26 17:43:02 +11:00
Oliver Walters
41bbbdcd43 Improve query speed when calculating how many parts are on order 2020-03-26 17:31:59 +11:00
Oliver Walters
57123283f4 Better filtering of annotations for Part-list API 2020-03-26 17:08:01 +11:00
Oliver Walters
dae45875fb Add 'on_order' quantity to the part list API 2020-03-26 14:46:23 +11:00
maxbachmann
b162c97226
use rapidfuzz instead of fuzzywuzzy 2020-03-22 22:31:15 +01:00
Oliver Walters
4a259dc146 Can now successfully edit or delete a purchase-order attachment 2020-03-22 19:55:46 +11:00
Oliver Walters
834f80698b Create a new attachment against a PurchaseOrder 2020-03-22 18:41:41 +11:00
Oliver Walters
56a6943438 Add an 'attachment' page for the PurchaseOrder view 2020-03-22 18:13:34 +11:00
Oliver Walters
a661d7e1a6 Abstract the PartAttachment class 
Now "Attachments" are much easier to implement for different models
 2020-03-22 17:59:23 +11:00
Oliver Walters
5207b2ba21 Add build status label to part detail 2020-03-19 10:20:09 +11:00
Oliver Walters
15bc457714 Improve calculation of BOM item overage 2020-03-19 10:15:43 +11:00
Oliver Walters
d51ac2f5c2 Save creation user when making a new part via the API 2020-03-18 22:00:32 +11:00
Oliver Walters
a147ce4284 Save the current user when creating a new part 2020-03-18 21:53:02 +11:00
Oliver Walters
8186e4bab0 Display creation information in part detail page 2020-03-18 21:50:38 +11:00
Oliver Walters
2b08b0f2b9 Add new fields for Part object 
- Creation date
- Creation user
- Responsible user
 2020-03-18 21:50:18 +11:00
Oliver Walters
8eaaf62eda Limit choices for Part selection 
Based on is_template / virtual / active status
 2020-03-18 21:28:11 +11:00
Oliver Walters
c04aa1bff7 Increase unit testing for BOM item model 2020-03-18 21:04:37 +11:00
Oliver Walters
3b9f57fc80 Bug fix - Multiplying float by decimal 
- Overage percentage now uses explicit decimal multiplication
 2020-03-18 20:44:45 +11:00
Oliver Walters
4a2fa36e30 Allow 'notes' field in Part object to be blank 2020-02-23 20:02:33 +11:00
Oliver Walters
33d21594da Create new stock item from supplierpart stock page 
- Allow stock-item-create form to have supplierpart passed as initial data
- Add some translations too
 2020-02-12 11:32:01 +11:00
Oliver Walters
50fee1bfe5 More work on translations 2020-02-12 10:25:46 +11:00
Oliver Walters
28e9d842bf Small tweaks for BOM export 
- Steps towards preventing circular BOMs
- Improve formatting of exported BOM
 2020-02-12 10:18:20 +11:00
Oliver Walters
d04fb0d826 Use decimal2string instead of normalize 2020-02-12 10:08:35 +11:00
Oliver Walters
520b8d7b2b Fix for BOM pricing weirdness 2020-02-12 10:06:17 +11:00
Oliver Walters
c287a0a0b9 More rounding improvements 2020-02-12 08:22:55 +11:00
Oliver Walters
5ae7ca71d7 Improve number rendering of build allocation page 2020-02-12 08:12:26 +11:00
Oliver Walters
882bda46b4 Fix tests 2020-02-11 22:38:50 +11:00
Oliver Walters
f865573e48 Implement cascading export of BOM 2020-02-11 22:32:36 +11:00
Oliver Walters
434d084371 Provide form for user to select export options 2020-02-11 21:43:17 +11:00
Oliver Walters
55aa63dab4 Override save() method for Part model 
- Delete old thumbnails if they are no longer being used
 2020-02-11 20:27:06 +11:00