inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-18 20:46:08 +00:00
Code Activity
2,429 Commits 9 Branches 164 Tags
2a4e8cd062a366e217391787885cfcf2981c54bb
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters 2a4e8cd062 Improve company search results page 
(cherry picked from commit 34abf34c0f)
 2020-04-13 20:19:53 +10:00
Oliver Walters d05ba9ee1a Customize "CompanyCreate" form based on calling url 
(cherry picked from commit 8adc83b650)
 2020-04-13 20:19:48 +10:00
Oliver Walters 67d9d2bb04 Separate views for customer / supplier / manufacturer 
(cherry picked from commit 9e9e29679d)
 2020-04-13 20:19:21 +10:00
Oliver Walters edfb19db13 Company table now in separate javascript file 
(cherry picked from commit 95354f09da)
 2020-04-13 20:19:16 +10:00
Oliver Walters 094a0fe709 Improvements to company API 
- Filter by is_manufacturer
- Better table display

(cherry picked from commit f427ee4754)
 2020-04-13 20:19:10 +10:00
Oliver Walters 906ed7f64d Add "is_manufacturer" field to company model 
(cherry picked from commit fd45db9e22)
 2020-04-13 20:19:03 +10:00
OliverandGitHub a921b3fcee Merge pull request #711 from SchrodingersGat/tweakers 
Table Filtering
 2020-04-12 01:05:03 +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 04cee99791 Update for supplier part list table rendering 2020-04-12 00:46:29 +10:00
Oliver Walters f1f27f08cb Add icons to part base 2020-04-12 00:40:48 +10:00
Oliver Walters f248b20ba4 Fix 2020-04-12 00:33:43 +10:00
Oliver Walters 6ed482d9eb Update translations 2020-04-12 00:33:10 +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 59778130cd Revert display of "INACTIVE" parts 2020-04-11 23:09:21 +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 0f90e8f522 Filter parts by 'is_assembly' 
Also greatly improve rendering of the Part table
 2020-04-11 22:57:40 +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 f06078f4ac CSS tweaks 
- Still doesn't look exactly right
 2020-04-11 22:25:34 +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 d606df16f7 Bug fixes: 
- prevent addition of empty filter tags
 2020-04-11 22:09:09 +10:00
Oliver Walters 57d7d729c1 More table rendering fixes 2020-04-11 21:23:26 +10:00
Oliver Walters e69f6c5b9d table fixes 2020-04-11 21:08:27 +10:00
Oliver Walters 0fc353ebac Filter purchase-order table for 2020-04-11 20:59:57 +10:00
Oliver Walters 6a0c5b78ae Refactor the purchase-order table 
- Filter by order status
 2020-04-11 20:56:31 +10:00
Oliver Walters ba7c0bdea0 Improvements for status code generation 
- Now includes labels
- Python template generates javascript which is then rendered? I don't even follow it any more
 2020-04-11 20:48:02 +10:00
Oliver Walters 5d70f496a5 Ability to filter build list by status 2020-04-11 20:03:31 +10:00
Oliver Walters f0ffb0f8c0 Ability to include part_detail in build API 
- Build list now uses bootstrapTable
 2020-04-11 19:59:16 +10:00
Oliver Walters a4e45eab13 Skeleton for AJAXified build table 2020-04-11 19:36:01 +10:00
Oliver Walters 2f71233d62 More refactoring 2020-04-11 14:47:41 +10:00
Oliver Walters e3102900b6 Allow stock API to filter by parts which are not active 2020-04-11 14:41:07 +10:00
Oliver Walters 393597612e More styling improvements 2020-04-11 14:36:48 +10:00
Oliver Walters dddaa102b3 Layout improvements 2020-04-11 14:19:21 +10:00
Oliver Walters 64f8034a4c Many more refactoring 2020-04-11 14:14:45 +10:00
Oliver Walters 5d2441776e Further work on templated filter options 2020-04-11 13:38:51 +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 57c5d6c97a Moar refactoring 2020-04-11 12:30:24 +10:00
Oliver Walters 33ac34cc40 Add blank option to filter selection 2020-04-11 11:02:14 +10:00
Oliver Walters 41b208992c cleanup existing code 2020-04-11 11:01:11 +10:00
Oliver Walters db8d95dba7 Refactoring - delete some unused functions 2020-04-11 10:59:15 +10:00
Oliver Walters 0c5f23ef98 More filter functionality 2020-04-11 10:57:02 +10:00
Oliver Walters 58636139af Refactoring filtering code 2020-04-11 10:14:31 +10:00
Oliver Walters 613dd9d471 Add (very rough) function to add new custom table filters 
- The javascript needs a LOT of work!
 2020-04-11 00:45:18 +10:00
Oliver Walters b2565270a5 Cleanup logic for refreshing table with original filters 2020-04-11 00:20:46 +10:00
Oliver Walters 4256d09e80 Bugfix for bootstrap-table.j 
"Refreshing" the table options did not work proper good
 2020-04-10 23:54:10 +10:00
Oliver Walters 5d141a0b98 Display a list of filters for Stock table 
- Delete a filter by pressing "X" button
 2020-04-10 16:46:34 +10:00
Oliver Walters 5aa43a5a18 Load / save stock table filters in session storage 2020-04-10 12:54:54 +10:00
Oliver Walters eeeb04c9f4 Unit testing for Order app API 2020-04-10 08:02:51 +10:00
OliverandGitHub 57da521833 Merge pull request #706 from SchrodingersGat/stocktake-api 
Stocktake api
 2020-04-10 01:11:42 +10:00
Oliver Walters 8da71037ae Update translations 2020-04-10 01:04:55 +10:00
OliverandGitHub 47764ca179 Update version.py 
Add a _pre suffix
 2020-04-10 01:03:54 +10:00
Oliver Walters bc91975f2c Fixes for Stocktransfer API endpoint 2020-04-10 01:01:39 +10:00
Oliver Walters 5b2665edb1 Better API validation 2020-04-10 00:53:04 +10:00
Oliver Walters 41b3f1d39c API cleanup 
Add / Remove / Count endpoints now work
 2020-04-10 00:03:43 +10:00
Oliver Walters 3e5dc65c49 Bugfix for notes field 2020-04-10 00:03:21 +10:00
Oliver Walters 58a0f40889 Simplifiy stock adjustment APIs 
- Separate API endpoints for count / add / remove / transfer
- Unit testing
 2020-04-09 22:24:05 +10:00
Oliver Walters 1b3f8a9309 Unit testing for the stocktake API 2020-04-09 21:19:13 +10:00
Oliver Walters f6a1ddf8e7 Re-enable stocktake API 2020-04-09 21:18:55 +10:00
OliverandGitHub 5447bc4356 Merge pull request #703 from SchrodingersGat/fixes 
Check for missing part thumbnails
 2020-04-07 14:38:44 +10:00
Oliver Walters 5aec63d9e4 Remove unused includes 2020-04-07 14:20:43 +10:00
Oliver Walters 1a0a4622a2 Revert makefile change 2020-04-07 13:16:23 +10:00
Oliver Walters 8786776fd6 Remove some tests 
- CI complications
 2020-04-07 13:08:30 +10:00
Oliver Walters e94592e42d Moar unit testing plz 2020-04-07 12:09:25 +10:00
Oliver Walters 623a0844d3 Coverage tests for new functions 2020-04-07 11:50:46 +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 ae9ef04013 Use the company thumbnail in the Company API 2020-04-07 11:27:56 +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 1a233e7949 Create thumbnails for Company model 2020-04-07 11:17:00 +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 97f605ef55 Remove some weird trailing zeros 2020-04-07 00:19:51 +10:00
Oliver Walters 1356718bb7 Improver company website icon 2020-04-07 00:19:43 +10:00
OliverandGitHub b319041dfa Merge pull request #701 from SchrodingersGat/and-yet-more-improvements 
And yet more improvements
 2020-04-06 22:50:33 +10:00
Oliver Walters b8bbd15c88 Icon cleanup 2020-04-06 22:02:27 +10:00
Oliver Walters 96547b885e Include supplier-part information in Stock API 2020-04-06 22:02:23 +10:00
OliverandGitHub 5956b8cdee Merge pull request #700 from SchrodingersGat/instance-name 
Instance name
 2020-04-06 21:09:08 +10:00
Oliver Walters 3eb585df27 fixes for unit testing 2020-04-06 21:01:24 +10:00
Oliver Walters 0840cebd57 Rearrange purchase order table 2020-04-06 20:56:07 +10:00
Oliver Walters 44c10c45cd visual consolidation 2020-04-06 20:50:33 +10:00
Oliver Walters e6f6a936e0 Can haz moar icons? 2020-04-06 20:24:45 +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 071c317bae Add 'InstanceName' setting 
- Will be auto-generated if it does not already exist
 2020-04-06 19:28:08 +10:00
OliverandGitHub 7c2af32b38 Merge pull request #698 from SchrodingersGat/stock-api 
Further API work
 2020-04-06 16:25:04 +10:00
Oliver Walters 92cb7211ce Rename 'image_url' to 'thumbnail' in PartBrief API 2020-04-06 12:57:04 +10:00
Oliver Walters 535f1994b1 Fix order API reference 2020-04-06 12:02:23 +10:00
Oliver Walters 87a09a7220 Rename Order.URL to Order.link 2020-04-06 11:56:52 +10:00
Oliver Walters a306ad0bc3 Alter "URL" to "link" for Company models 2020-04-06 11:36:25 +10:00
Oliver Walters 789712acbe Rename Build.URL -> Build.link 2020-04-06 11:28:35 +10:00
Oliver Walters bbe714c8f7 Bugs! 
Thanks, unit testing
 2020-04-06 11:21:34 +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 bd407cd226 Rename "URL" to "link" for StockItem and StockItemTracking models 2020-04-06 10:43:06 +10:00
Oliver Walters 2530313e68 Add part_detail and location_detail to the StockItem detail class 2020-04-06 08:38:10 +10:00
OliverandGitHub fce26c80b7 Merge pull request #697 from SchrodingersGat/stock-api-fix 
Stock api fix
 2020-04-05 23:09:03 +10:00
Oliver Walters 791eb63f35 Same fix for Part API 2020-04-05 22:59:45 +10:00