inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-18 04:33:48 +00:00
Code Activity
1,834 Commits 9 Branches 164 Tags
13270617b9b656dab07e3dfb57c3ce0ae781be72
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters 13270617b9 Ensure PartParameterTemplate name is unique 2019-09-07 19:43:41 +10:00
Oliver Walters 6752bdc1c6 Sort currency API 2019-09-07 19:28:20 +10:00
Oliver Walters 873faee040 Display currency list under currency settings page 2019-09-07 19:23:58 +10:00
Oliver Walters 9726ea4f99 Add serializer / API for currency objects 2019-09-07 19:18:18 +10:00
Oliver Walters 89c3ab5e99 Formatting 2019-09-07 18:58:37 +10:00
Oliver Walters 27878d2d8d Split settings into multiple pages 
- Tab style navigation
 2019-09-07 18:02:03 +10:00
Oliver Walters 1b8fb4db44 Start skeleton for better settings page 2019-09-07 15:04:18 +10:00
OliverandGitHub 9a61ba4e1e Merge pull request #479 from SchrodingersGat/hide-sellable 
Hide the 'sellable' tag for now
 2019-09-07 14:25:33 +10:00
Oliver Walters 9c864aa619 Hide the 'sellable' tag for now 
- Keep hidden until parts can actually be sold
 2019-09-07 10:51:39 +10:00
OliverandGitHub e9ba51da52 Merge pull request #478 from SchrodingersGat/show-batch 
Display batch information in stock table
 2019-09-07 10:44:15 +10:00
Oliver Walters 8703ee90c6 Improve grouping 2019-09-07 10:41:22 +10:00
Oliver Walters 910d9a15f6 Display batch information in stock table 2019-09-07 10:39:48 +10:00
OliverandGitHub b3be5ca5a0 Merge pull request #474 from SchrodingersGat/qr-png 
Fixes
 2019-09-06 13:19:19 +10:00
Oliver Walters dac1264878 Fixed unit tests 2019-09-06 12:48:31 +10:00
Oliver Walters 9bde8bde66 Tree items dispaly description in __str__ representation 2019-09-06 12:40:04 +10:00
Oliver Walters eb378e5e5d Specify PNG image for QR code generation 2019-09-06 12:38:09 +10:00
OliverandGitHub 4ff7920296 Merge pull request #473 from SchrodingersGat/attachment-buttons 
Bug fix
 2019-09-05 20:30:25 +10:00
Oliver Walters 38b88e44bd Bug fix 2019-09-05 20:22:47 +10:00
OliverandGitHub 7642a1bb7b Merge pull request #472 from SchrodingersGat/default-loc 
Add new option to move-stock form
 2019-09-05 20:09:47 +10:00
Oliver Walters 7fd4359007 Add new option to move-stock form 
- Set the destination as the default location for parts being moved
 2019-09-05 19:59:00 +10:00
OliverandGitHub 8fe7284173 Merge pull request #471 from SchrodingersGat/bom-checksum 
Bom checksum
 2019-09-05 19:42:11 +10:00
Oliver Walters 7659f2de7b Click button to validate BOM item 2019-09-05 19:34:58 +10:00
Oliver Walters 37d9c59a0e Add API endpoint for validating a BOM item 2019-09-05 19:29:51 +10:00
Oliver Walters 81f5714cb1 BOM table now displays which lines have been marked as valid 2019-09-05 14:15:58 +10:00
Oliver Walters 1ea7bdf843 Add a note 2019-09-05 13:12:49 +10:00
Oliver Walters 0508c2dcaf Use the hash for each line item to calculate the total BOM hash 2019-09-05 13:10:26 +10:00
Oliver Walters 7671eb2b22 Add a checksum field to the bom line item 2019-09-05 12:58:11 +10:00
OliverandGitHub c96c4d16a3 Merge pull request #469 from SchrodingersGat/update-docs 
Add documentation on perfoming system upgrades
 2019-09-04 10:56:57 +10:00
Oliver Walters 7ef2932f38 Add documentation on perfoming system upgrades 2019-09-04 10:54:15 +10:00
OliverandGitHub ecd1681585 Merge pull request #468 from SchrodingersGat/currency-quote 
Currency quote
 2019-09-03 23:16:12 +10:00
Oliver Walters e903c1858f PEP 2019-09-03 22:45:45 +10:00
Oliver Walters 20b37a2d11 Test fixes 2019-09-03 22:45:11 +10:00
Oliver Walters 41806089e3 Select the default currency if one is not specifically selected 2019-09-03 22:33:50 +10:00
Oliver Walters 3682e9b5fb Display currency selection in part pricing dialog 2019-09-03 22:28:53 +10:00
Oliver Walters 7314f33d6d Add currency selection field for price calculation form 2019-09-03 22:00:43 +10:00
OliverandGitHub 8ae19cb095 Merge pull request #467 from SchrodingersGat/version 
Bump version number
 2019-09-03 10:41:49 +10:00
Oliver Walters 0325f042b5 Bump version number 2019-09-03 09:59:14 +10:00
OliverandGitHub a6ee3a59a0 Merge pull request #466 from SchrodingersGat/currency 
Currency
 2019-09-03 09:58:22 +10:00
Oliver Walters af8a96e080 Add option to edit currency 2019-09-03 09:55:15 +10:00
Oliver Walters 09cb82cdc0 Fix converted_cost 
- Incompatibility between float and decimal
 2019-09-03 09:46:32 +10:00
Oliver Walters c6a435eba0 Add currency field to SupplierPriceBreak 2019-09-03 09:34:32 +10:00
Oliver Walters 9f91797f42 Simple test case for currency 2019-09-03 09:19:37 +10:00
Oliver Walters 32d09d2d37 Add default value for currency 2019-09-03 09:10:36 +10:00
Oliver Walters 7824b8561d Create a currency model 2019-09-03 09:07:03 +10:00
Oliver Walters aeb25e4c34 startapp common 2019-09-03 08:30:14 +10:00
OliverandGitHub 9f87963fa9 Merge pull request #465 from SchrodingersGat/bug-squashin 
Squashin' some bugs
 2019-09-02 22:21:44 +10:00
Oliver Walters 273412b63d Add 'bug report' button 2019-09-02 22:14:50 +10:00
Oliver Walters f3e161564d Fix for serialization of company images 2019-09-02 22:06:42 +10:00
OliverandGitHub 64278523f0 Merge pull request #463 from SchrodingersGat/install-reqs 
Install reqs
 2019-09-02 18:03:47 +10:00
Oliver Walters c988f9486e Re-order docs index 2019-09-02 17:59:10 +10:00
Oliver Walters 90254d1572 add a note about file encoding 2019-09-02 17:46:42 +10:00
Oliver Walters 37507f2b43 More cleanup of docs 2019-09-02 17:43:20 +10:00
Oliver Walters 47e9c44c43 Prefix correct directory in docs 2019-09-02 17:04:44 +10:00
Oliver Walters b0c420858b Comments for settings.py 2019-09-02 16:44:01 +10:00
Oliver Walters 92940f1333 Update makefile docs 2019-09-02 16:05:26 +10:00
Oliver Walters d30cad2341 Emphasis on config.yaml 2019-09-02 16:05:19 +10:00
Oliver Walters 31f3ead5dc Andrew's eagle eyes 2019-09-02 15:52:19 +10:00
Oliver Walters 4de12033bb Change pip3 to python3-pip 2019-09-02 15:51:58 +10:00
OliverandGitHub 0be54a762f Merge pull request #459 from SchrodingersGat/build-tracking 
Add a reference to a build for a stock item
 2019-09-01 23:31:08 +10:00
Oliver Walters 906766cc0e Bug fix - ensure pk is set to None 2019-09-01 23:28:28 +10:00
Oliver Walters 7db938eda0 Show the build item on the stock-item page (if applicable) 2019-09-01 23:24:27 +10:00
Oliver Walters c45c4e236e Point new stockitem to the correct build 2019-09-01 23:18:28 +10:00
Oliver Walters 3cef5c93ce Improve stock item splitting 2019-09-01 23:18:08 +10:00
Oliver Walters 90a342fad8 Add a reference to a build for a stock item 2019-09-01 23:09:40 +10:00
OliverandGitHub c63d40bd88 Merge pull request #456 from SchrodingersGat/install-docs 
Improve installation documentation
 2019-09-01 22:59:24 +10:00
Oliver Walters e9efac403c Tweak install docs 2019-09-01 22:55:18 +10:00
Oliver Walters e32048d3c6 Add documentation for data migration 2019-09-01 22:55:02 +10:00
Oliver Walters 0480925186 Simplify makefile again 
- Remove setup target
- Fix travis
 2019-09-01 22:54:48 +10:00
Oliver Walters 10ca3b1b93 Remove defunct line 2019-09-01 22:35:21 +10:00
Oliver Walters 6212c2aeda Fix travis steps 2019-09-01 22:31:21 +10:00
Oliver Walters d9cc03c5ca Improve installation documentation 2019-09-01 22:16:58 +10:00
Oliver Walters fae9a92a82 Improvements for makefile 
- Comments
- Cleanup
 2019-09-01 21:57:17 +10:00
Oliver Walters 32538c8c3d Fixes for doc building 
- Separate doc build from doc requirements
- Fix command which doesn't work properly on *nix
 2019-09-01 21:46:08 +10:00
OliverandGitHub 8f340df41e Merge pull request #455 from SchrodingersGat/stock-tests 
Stock tests
 2019-08-30 12:58:25 +10:00
OliverandGitHub af3faa5369 Merge pull request #454 from SchrodingersGat/api-doc-fix 
Api doc fix
 2019-08-30 09:45:20 +10:00
Oliver Walters 094e8cdc23 PEP 2019-08-30 00:15:16 +10:00
Oliver Walters 891f4f9f17 Another test 2019-08-30 00:14:54 +10:00
Oliver Walters 6f8c3454f3 Tests for stock serialization form 2019-08-30 00:06:46 +10:00
Oliver Walters 34bfdea4b5 Test another invalid serialization 2019-08-29 23:50:33 +10:00
Oliver Walters ef94b41a77 Add test for api-doc view 2019-08-29 23:43:24 +10:00
Oliver Walters e68a9c223d Fix broken api-doc page 
https://www.django-rest-framework.org/community/3.10-announcement/#continuing-to-use-coreapi
 2019-08-29 22:00:15 +10:00
OliverandGitHub 42eafcb51f Merge pull request #453 from SchrodingersGat/collapsible-sections 
Collapsible sections
 2019-08-29 16:00:01 +10:00
Oliver Walters 0fba236eef Stock locations are now persistent 2019-08-29 15:52:32 +10:00
Oliver Walters ef674061de Part category collapse is persistent 2019-08-29 15:50:48 +10:00
OliverandGitHub 9d11307152 Merge pull request #446 from SchrodingersGat/serial-improvements 
Various fixes for implementation of serial numbers
 2019-08-29 08:20:18 +10:00
Oliver Walters 86b2b9cdb1 Allow unserialized build 2019-08-29 08:05:45 +10:00
Oliver Walters 937bcd41d6 Fix tests for stock serialization 2019-08-29 07:37:44 +10:00
Oliver Walters 4db345d0c2 Perfom serialization 2019-08-28 22:47:46 +10:00
Oliver Walters 76ec44d770 Form improvements 2019-08-28 22:04:04 +10:00
Oliver Walters 15b38000d5 Improved serial number extraction 
- Check data types
- Translation for error messages
 2019-08-28 22:03:40 +10:00
Oliver Walters 6c5b09efd4 Provide initial data 2019-08-28 21:50:44 +10:00
Oliver Walters 7575a39b7f Add form / view for serializing a stock item 
- Back end doesn't do anything yet
 2019-08-28 21:46:26 +10:00
Oliver Walters 3b8f5872ac Add button to serialize stock 2019-08-28 21:21:26 +10:00
Oliver Walters 43967e302b Add ablity to serialize an existing quantity of stock 
- Do not have to serialize all the stock
- Add tests
- Add function to copy entire stock transaction history
 2019-08-28 21:12:16 +10:00
Oliver Walters bc03ae53bd Changes for clean of StockItem 2019-08-28 20:01:38 +10:00
Oliver Walters 88b90281f5 Do not enforce serialization when creating a stock item 2019-08-28 19:56:35 +10:00
OliverandGitHub 614363fa03 Merge pull request #445 from SchrodingersGat/part-params 
Part params
 2019-08-28 19:47:49 +10:00
Oliver Walters d5ad53c788 Add docstring 2019-08-28 19:44:46 +10:00
Oliver Walters f94be40857 Style fixes 2019-08-28 19:44:02 +10:00
Oliver Walters 586a46175d Add modals for editing or deleting part parameters 2019-08-28 19:39:47 +10:00