2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-11-18 21:57:44 +00:00

Commit Graph

  • 80fa324e07 Merge remote-tracking branch 'inventree/master' Oliver Walters 2020-12-15 13:52:51 +11:00
  • a7d825158c Merge pull request #1164 from SchrodingersGat/stock-report-filter Oliver 2020-12-15 13:32:13 +11:00
  • 297bfd776c Pre-select a template if only one matching one exists #1164 Oliver Walters 2020-12-15 12:31:02 +11:00
  • ef032d406f Bugfix for stock report filter Oliver Walters 2020-12-15 11:57:52 +11:00
  • ea2309793e Merge remote-tracking branch 'inventree/master' Oliver Walters 2020-12-14 11:41:09 +11:00
  • 980cb9522b Merge pull request #1162 from SchrodingersGat/gunicorn-conf Oliver 2020-12-14 11:00:57 +11:00
  • 55b7cd3d6a PEP fix #1162 Oliver Walters 2020-12-14 10:44:38 +11:00
  • 70cac17138 Merge pull request #1163 from SchrodingersGat/hide-purchase-price Oliver 2020-12-14 10:43:21 +11:00
  • 648595cf18 Hide purchase price field for non-purchaseable parts #1163 Oliver Walters 2020-12-14 09:55:39 +11:00
  • d609e881c2 Update default gunicorn conf file Oliver Walters 2020-12-14 09:43:07 +11:00
  • 1c168452a4 Merge pull request #1159 from eeintech/roles_overview Oliver 2020-12-11 10:03:56 +11:00
  • 1ef5a2b481 Display permission levels for each ruleset in Group admin list view #1159 eeintech 2020-12-10 15:38:48 -05:00
  • 33dfecfdef Added create view test cases for stock ownership eeintech 2020-12-03 13:29:59 -05:00
  • 3aad5111b5 Stock ownership: test case for edit stock location and item eeintech 2020-12-03 11:56:45 -05:00
  • f99c83f69d Added test case for stock location ownership eeintech 2020-12-03 07:32:01 -05:00
  • 5c6939429a Improved handling of stock location owner eeintech 2020-12-02 17:19:41 -05:00
  • 1a7a460ba8 Hidden owner field when ownership control is disabled eeintech 2020-12-02 14:05:45 -05:00
  • de1dfdcc38 Improved naming of new setting and variables eeintech 2020-12-02 13:38:53 -05:00
  • 2bdd1305ed Fix style eeintech 2020-12-02 13:26:26 -05:00
  • c66ac2579e Updated StockItem create/edit view with ownership control eeintech 2020-12-02 13:25:33 -05:00
  • 2d7461f609 Updated StockLocation create/edit view with ownership control eeintech 2020-12-02 12:05:00 -05:00
  • c9b3c16c6f Added help text on owner fields eeintech 2020-12-01 17:46:11 -05:00
  • 8dac6bb982 Updated template stock item logic and added to stock locations eeintech 2020-12-01 17:41:03 -05:00
  • 4104e7df8e Fixed template logic eeintech 2020-12-01 16:08:27 -05:00
  • 2c38be2d13 Added global setting and updated stock item templates eeintech 2020-12-01 15:54:05 -05:00
  • e1fb7e5d98 Added owner field to both stock item and location tables and forms eeintech 2020-12-01 13:45:01 -05:00
  • 9dae7c1566 Merge pull request #1154 from SchrodingersGat/build-delete-fix Oliver 2020-12-01 12:36:24 +11:00
  • 47d38e1cca Change delete behaviour for parent build item #1154 Oliver Walters 2020-12-01 10:24:51 +11:00
  • 28a5ee32c4 Merge pull request #1152 from elmo2k3/fix-stocklist-sidebar Oliver 2020-12-01 08:56:41 +11:00
  • 95f62d529f Fix sidenav in stocklist #1152 Bjoern Biesenbach 2020-11-30 18:30:51 +01:00
  • 8fd4137981 Merge remote-tracking branch 'inventree/master' Oliver Walters 2020-11-27 15:33:46 +11:00
  • a8f605c2e6 Merge pull request #1149 from SchrodingersGat/bom-upload-speed Oliver 2020-11-27 15:25:46 +11:00
  • ea2f5009c8 Vastly improved speed of BOM upload #1149 Oliver Walters 2020-11-27 14:40:30 +11:00
  • a5e6ac2300 Merge pull request #1148 from SchrodingersGat/order-parts Oliver 2020-11-27 12:28:04 +11:00
  • b150c9c6bc Merge pull request #1147 from SchrodingersGat/form-fixes Oliver 2020-11-27 12:27:53 +11:00
  • 50a88e4826 Revert "Add extra context to SupplierPartCreate form" #1147 Oliver Walters 2020-11-27 11:19:16 +11:00
  • 6c68197e61 Allow part ordering from build view #1148 Oliver Walters 2020-11-27 11:18:58 +11:00
  • 7068f70811 Fixes for 'order parts' form Oliver Walters 2020-11-27 11:18:45 +11:00
  • 607cc90ce0 Add extra context to SupplierPartCreate form Oliver Walters 2020-11-27 11:17:55 +11:00
  • 5f8f0232a9 Add extra context to SupplierPartCreate form Oliver Walters 2020-11-27 11:17:55 +11:00
  • 56f05e2604 Fixes for 'non field' errors in forms Oliver Walters 2020-11-27 10:42:01 +11:00
  • aacc7119bd Merge pull request #1144 from SchrodingersGat/bom-fixes Oliver 2020-11-24 22:28:20 +11:00
  • 083d7671d0 Bug fix for BOM table #1144 Oliver Walters 2020-11-24 21:19:19 +11:00
  • 28333c1a21 Add a simple "shell" task Oliver Walters 2020-11-24 21:18:00 +11:00
  • e3231bbedb Hide "pricing" information in the BOM table Oliver Walters 2020-11-24 20:58:18 +11:00
  • 332a419ab9 Merge remote-tracking branch 'inventree/master' Oliver Walters 2020-11-24 20:43:02 +11:00
  • 3ff0759bb9 Merge pull request #1142 from SchrodingersGat/bom-form-fixes Oliver 2020-11-24 14:23:04 +11:00
  • b5d75d6e6a PEP fixes #1142 Oliver Walters 2020-11-24 11:56:51 +11:00
  • ce82579930 Cleanup getRequiredParts function Oliver Walters 2020-11-24 10:18:07 +11:00
  • 371ec582e1 Cleanup queryset for BomItemEdit view Oliver Walters 2020-11-24 09:43:49 +11:00
  • 3391db506a Cleanup queryset for BomItemCreate view Oliver Walters 2020-11-24 09:43:32 +11:00
  • af9b88de11 Fix for BomItem clean function Oliver Walters 2020-11-24 09:33:26 +11:00
  • c05499b723 Merge remote-tracking branch 'inventree/master' Oliver Walters 2020-11-23 12:52:27 +11:00
  • 73259c0bcb Merge pull request #1140 from SchrodingersGat/request-frequency Oliver 2020-11-20 11:40:10 +11:00
  • a0168515c3 Merge pull request #1139 from eeintech/fix_supplierpart_edit_form Oliver 2020-11-20 09:40:00 +11:00
  • 20e8161038 Reduce duplicate function calls in custom context parser #1140 Oliver Walters 2020-11-20 08:29:06 +11:00
  • 11745ebd6c Removed one too many indent #1139 eeintech 2020-11-19 15:32:42 -05:00
  • 4768c9cbb3 Fixed validation of SupplierPart edit form by forcing the value of single_pricing field eeintech 2020-11-19 15:31:39 -05:00
  • 9a2482e887 Merge remote-tracking branch 'inventree/master' Oliver Walters 2020-11-19 14:35:57 +11:00
  • 6b104fbb8b Merge pull request #1136 from SchrodingersGat/warning-icon Oliver 2020-11-19 13:30:17 +11:00
  • 4049c8e915 Adds framework for "server health" display #1136 Oliver Walters 2020-11-19 12:35:09 +11:00
  • 5b35915f33 Merge remote-tracking branch 'inventree/master' Oliver Walters 2020-11-19 11:29:14 +11:00
  • e55f4a2798 Merge pull request #1135 from SchrodingersGat/quoth-the-raven Oliver 2020-11-19 10:34:53 +11:00
  • 599220a931 Fixes for custom SQL queries #1135 Oliver Walters 2020-11-19 09:15:16 +11:00
  • 0594ebaef7 Merge pull request #1133 from SchrodingersGat/stock-table-fix Oliver 2020-11-18 15:24:06 +11:00
  • 24fd520ec3 Smallt tweaks for the Stock table #1133 Oliver Walters 2020-11-18 15:03:51 +11:00
  • 4daf291619 Merge pull request #1131 from SchrodingersGat/purchase-price-fix Oliver 2020-11-17 16:07:31 +11:00
  • 6144d7e209 Fix for StockItem creation form #1131 Oliver Walters 2020-11-17 15:29:44 +11:00
  • 9fa718e58d Merge pull request #1130 from eeintech/api_category_parameters Oliver 2020-11-17 09:36:34 +11:00
  • ac2797c7a1 Improved API endpoint for category parameter templates #1130 eeintech 2020-11-16 16:10:00 -05:00
  • af55af6b8f Merge remote-tracking branch 'inventree/master' Oliver Walters 2020-11-15 17:03:28 +11:00
  • d8e7c2a932 Update version.py Oliver 2020-11-15 16:53:27 +11:00
  • 20f6964b1f Update version.py 0.1.4 Oliver 2020-11-15 16:51:50 +11:00
  • 771efecaa2 Merge pull request #1127 from SchrodingersGat/settings-view-unit-test Oliver 2020-11-14 09:19:31 +11:00
  • 2e842503e6 Fix try statement #1127 Oliver Walters 2020-11-14 07:39:51 +11:00
  • b738f8b143 Try transaction.atomic Oliver Walters 2020-11-13 22:22:02 +11:00
  • aae1400929 Mayyyyyyyyyyyyybe? Oliver Walters 2020-11-13 21:37:39 +11:00
  • 5f9758e85f More fixes Oliver Walters 2020-11-13 21:01:30 +11:00
  • 03e852f957 Remove custom save method Oliver Walters 2020-11-13 20:22:28 +11:00
  • 0bb8c0a1e3 Merge pull request #1128 from SchrodingersGat/settings-improvements Oliver 2020-11-13 15:32:48 +11:00
  • f0777ead92 Removed eprint statements #1128 Oliver Walters 2020-11-13 14:39:28 +11:00
  • 0f42916521 Improve settings.py Oliver Walters 2020-11-13 13:38:01 +11:00
  • ee70e27f7d Change function name Oliver Walters 2020-11-13 13:21:43 +11:00
  • 01ff562dcd Extra unit testing for settings forms / views Oliver Walters 2020-11-13 11:50:58 +11:00
  • 1d4b826d03 Merge pull request #1124 from eeintech/fix_nocategory_templates_error Oliver 2020-11-13 10:41:51 +11:00
  • f289e9cf35 Merge remote-tracking branch 'inventree/master' Oliver Walters 2020-11-13 10:01:33 +11:00
  • d777549a1a Merge pull request #1123 from eeintech/fix_form_errors Oliver 2020-11-13 09:59:57 +11:00
  • ffdf03ddcf Merge branch 'currency-support' Oliver Walters 2020-11-13 09:23:13 +11:00
  • f0f6003324 Merge remote-tracking branch 'inventree/master' into currency-support Oliver Walters 2020-11-13 09:23:02 +11:00
  • 3130b672b4 Merge pull request #1117 from SchrodingersGat/currency-support Oliver 2020-11-13 09:13:55 +11:00
  • d4ac35b9aa Check that category was selected before fetching templates #1124 eeintech 2020-11-12 16:52:22 -05:00
  • 80b70fd2df Fixed disabling of form errors messing-up with global settings #1123 eeintech 2020-11-12 16:38:35 -05:00
  • 362437e75e PEP fixes #1117 Oliver Walters 2020-11-13 07:28:21 +11:00
  • f239c8f8c8 Add missing migration file Oliver Walters 2020-11-12 22:04:50 +11:00
  • ae7fbd6112 Add PEP8-naming extension for flake Oliver Walters 2020-11-12 21:53:04 +11:00
  • 47cbf3071d Add option to add a single-quantity price-break when creating a new SupplierPart object Oliver Walters 2020-11-12 21:36:32 +11:00
  • 534f43872f Bug fix for SupplierPart table Oliver Walters 2020-11-12 20:14:10 +11:00
  • fd79f1ea0e Fixes for 'single pricing' for SupplierPart Oliver Walters 2020-11-12 19:46:19 +11:00
  • 7879c7565e More fixes to .travis.yml Oliver Walters 2020-11-12 19:11:12 +11:00
  • 6e7224ee7c Add "purchase price" field to PurchaseOrderLineItem table Oliver Walters 2020-11-12 18:05:24 +11:00