2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-11-19 06:07:45 +00:00

Commit Graph

  • 316dfe5e38 Merge pull request #909 from SchrodingersGat/bom-import-export Oliver 2020-08-18 14:37:48 +10:00
  • 92ac93aac5 More intelligent checking for circular BOM #909 Oliver Walters 2020-08-18 14:17:59 +10:00
  • ca4d3df287 Update translation files Oliver Walters 2020-08-18 14:01:40 +10:00
  • 68fb599c73 Major improvements to BOM upload Oliver Walters 2020-08-18 14:01:01 +10:00
  • 7349b396ca Merge remote-tracking branch 'upstream/master' into bom-import-export Oliver Walters 2020-08-18 11:50:40 +10:00
  • 561516e8d7 Merge pull request #908 from eeintech/bom_upload_part_match_auto_and_ipn Oliver 2020-08-18 11:50:10 +10:00
  • 476cc5f661 BOM upload: improve generation of "import" template Oliver Walters 2020-08-18 11:47:27 +10:00
  • badc306f33 Merge remote-tracking branch 'upstream/master' Oliver Walters 2020-08-18 10:39:24 +10:00
  • 783a94acce Corrected MakeBomTemplate method's queryset #908 eeintech 2020-08-17 16:42:28 -05:00
  • 84c0ec7937 BoM: added part matching based on IPN eeintech 2020-08-17 16:35:38 -05:00
  • 303157c586 Added part match auto-selection (if partial_ratio >= 100) to BoM part selection form eeintech 2020-08-17 14:10:24 -05:00
  • 685a58b807 Merge remote-tracking branch 'origin/master' into bom_dev eeintech 2020-08-17 12:05:54 -05:00
  • 89c7f72caf Merge pull request #907 from SchrodingersGat/bom-level-int Oliver 2020-08-17 10:43:31 +10:00
  • 25d90f643a Make BOM levels integers #907 Oliver Walters 2020-08-17 10:39:35 +10:00
  • e67327953d Merge remote-tracking branch 'inventree/master' Oliver Walters 2020-08-16 15:10:23 +10:00
  • 4dcd6ee136 Update version.py Oliver 2020-08-16 14:03:49 +10:00
  • ab62f8fc59 Update version.py 0.1.2 Oliver 2020-08-16 14:03:20 +10:00
  • b5b882d3b6 Merge pull request #906 from SchrodingersGat/blabel Oliver 2020-08-16 14:02:38 +10:00
  • d52278e423 Icon tweak #906 Oliver Walters 2020-08-16 13:45:58 +10:00
  • da079b23dc Fix duplicate label printing menu action Oliver Walters 2020-08-16 13:43:59 +10:00
  • ccda637e3c Fixes for barcode decoding Oliver Walters 2020-08-16 13:42:27 +10:00
  • a4267f76e8 Fixes for barcode data rendering Oliver Walters 2020-08-16 13:39:05 +10:00
  • 2bbc65cc59 Add "brief" version of QR codes Oliver Walters 2020-08-16 13:29:38 +10:00
  • 2f5e3efada Update translations Oliver Walters 2020-08-16 12:11:22 +10:00
  • 1807ba4e7b Add form for selecting label template for a StockItem Oliver Walters 2020-08-16 12:10:58 +10:00
  • 30e24f19d9 PEP fixes Oliver Walters 2020-08-16 11:13:17 +10:00
  • cdde0f8c43 Add URL endpoint for downloading PDF labels Oliver Walters 2020-08-16 11:12:21 +10:00
  • 2b1d6c268c Render to an in-memory PDF Oliver Walters 2020-08-16 10:29:03 +10:00
  • 18b3fd3256 Add context data to StockItemLabel model Oliver Walters 2020-08-16 10:24:15 +10:00
  • aefd70ce49 Add admin interface for StockItemLabel Oliver Walters 2020-08-16 09:29:45 +10:00
  • eb2422e6be Merge pull request #905 from SchrodingersGat/bom-depth Oliver 2020-08-16 09:29:09 +10:00
  • a45902bd4f Add "label" app Oliver Walters 2020-08-16 09:28:12 +10:00
  • dd77cc00b7 Add requirement for "blabel" plugin Oliver Walters 2020-08-16 09:07:27 +10:00
  • e5406cae24 More PEP fixes #905 Oliver Walters 2020-08-16 09:05:16 +10:00
  • 97103207b6 PEP fixes Oliver Walters 2020-08-16 08:34:54 +10:00
  • b27ecf54d7 Allow user to set "depth" of exported multi-level BOM Oliver Walters 2020-08-16 08:29:36 +10:00
  • 318c16f321 Merge pull request #904 from SchrodingersGat/query-speeds Oliver 2020-08-15 21:56:55 +10:00
  • f1373e3bea Improve speed of BomItem API queries #904 Oliver Walters 2020-08-15 21:52:32 +10:00
  • e1a8772af6 Update serializers for SupplierPart Oliver Walters 2020-08-15 21:24:01 +10:00
  • d34383e842 Specify serializer type for part category Oliver Walters 2020-08-15 21:20:31 +10:00
  • 2f77007dbe Significant query speed improvements to stock list API Oliver Walters 2020-08-15 21:15:11 +10:00
  • 411e7507a3 Merge pull request #903 from SchrodingersGat/debug-toolbar Oliver 2020-08-15 20:08:04 +10:00
  • 3c4cfc9a1b Flake fix #903 Oliver Walters 2020-08-15 19:56:02 +10:00
  • 2bb669d7de Remove defunct "log_queries" option Oliver Walters 2020-08-15 19:52:04 +10:00
  • b8b3a933ab Add django-debug-toolbar plugin Oliver Walters 2020-08-15 19:48:42 +10:00
  • 2280558303 Add a method of return raw LaTeX for debugging Oliver Walters 2020-08-15 19:27:31 +10:00
  • 3b01614a38 Merge remote-tracking branch 'inventree/master' Oliver Walters 2020-08-09 21:37:06 +10:00
  • 1f5d81ef93 Merge pull request #900 from SchrodingersGat/stock-display-improvements Oliver 2020-08-09 21:26:26 +10:00
  • cebba6909c Revert thing #900 Oliver Walters 2020-08-09 21:21:12 +10:00
  • 3336eb9f45 Default stock list behaviour is to only show in_stock items Oliver Walters 2020-08-09 21:12:49 +10:00
  • 0da9e0f834 Add "sent_to_customer" filter Oliver Walters 2020-08-09 21:10:21 +10:00
  • 502702b3bc Add some more visual tags to the stock list Oliver Walters 2020-08-09 21:04:41 +10:00
  • bb6b3b965d Merge pull request #896 from SchrodingersGat/company-ordering Oliver 2020-08-08 17:21:21 +10:00
  • fcfd1f82d6 Merge pull request #898 from SchrodingersGat/filter-depleted Oliver 2020-08-08 17:19:28 +10:00
  • 19c036f50a Add migration files #896 Oliver Walters 2020-08-08 17:16:04 +10:00
  • ad11681369 Custom filter tag for company stock listing #898 Oliver Walters 2020-08-08 17:15:08 +10:00
  • bc3fda71a4 Display "depleted" label next to depleted stock Oliver Walters 2020-08-08 17:11:50 +10:00
  • 96a3f2920d Stock table filters now arranged in alphabetical order Oliver Walters 2020-08-08 17:09:22 +10:00
  • 099f56e779 Add "depleted" table filter Oliver Walters 2020-08-08 17:08:18 +10:00
  • 402301e165 Add ability to filter stock items by "depleted" status Oliver Walters 2020-08-08 17:06:22 +10:00
  • 190610c6c9 Merge pull request #897 from SchrodingersGat/serialized-stock-adjust-fix Oliver 2020-08-08 17:05:29 +10:00
  • 732405f738 Cannot edit quantity for serialized stock when adjusting #897 Oliver Walters 2020-08-08 17:01:29 +10:00
  • a7ee323035 PEP fix Oliver Walters 2020-08-08 16:59:48 +10:00
  • ad977d4d26 Add default ordering for Company model Oliver Walters 2020-08-08 16:54:09 +10:00
  • 3831a04ce0 Merge remote-tracking branch 'inventree/master' Oliver Walters 2020-08-08 09:52:48 +10:00
  • eac53c836c Update README.md Oliver 2020-08-08 09:52:14 +10:00
  • 2cd6c0b9fc Merge pull request #895 from SchrodingersGat/return-to-stock Oliver 2020-08-08 09:48:44 +10:00
  • 8d9cfd3678 Migration file for StockStatus codes #895 Oliver Walters 2020-08-08 09:44:21 +10:00
  • a2c3c1086c Catch unhandled javascript errors Oliver Walters 2020-08-08 09:31:57 +10:00
  • ff71fe6e93 Fix "in_stock" logic for StockItem Oliver Walters 2020-08-08 09:20:42 +10:00
  • 861a2982db Removed "SHIPPED" stock status code Oliver Walters 2020-08-08 09:16:53 +10:00
  • 54c1f2d9a2 Upgrade to latest flake8 Oliver Walters 2020-08-08 09:15:45 +10:00
  • 459cc03aae Remove "ASSIGNED_TO_BUILD" status code Oliver Walters 2020-08-08 09:08:15 +10:00
  • 80173a9d43 Remove ASSIGNED_TO_OTHER_ITEM status code Oliver Walters 2020-08-08 09:07:25 +10:00
  • bdea29df04 Add functionality to return stock item from customer Oliver Walters 2020-08-08 09:05:33 +10:00
  • 7b332d93ee Rearrange button layouts Oliver Walters 2020-08-08 08:48:27 +10:00
  • 518ad3eb60 Merge pull request #892 from SchrodingersGat/import-fix Oliver 2020-08-04 11:35:25 +10:00
  • 0f199556df Add migration file #892 Oliver Walters 2020-08-04 11:21:27 +10:00
  • 3a266cf322 Allow default_keywords to be null Oliver Walters 2020-08-04 11:10:24 +10:00
  • d65d76653c Merge remote-tracking branch 'inventree/master' Oliver Walters 2020-08-03 20:49:33 +10:00
  • 08bab0a1b9 Merge pull request #891 from SchrodingersGat/security-fix Oliver 2020-08-03 19:53:34 +10:00
  • 481eeb8338 Update requirements.txt #891 Oliver Walters 2020-08-03 19:36:41 +10:00
  • e0e82dabf3 Merge pull request #889 from SchrodingersGat/allow-empty-stock Oliver 2020-07-30 21:09:57 +10:00
  • 10691b3d03 Allow creation of a stock item with zero quantity #889 Oliver Walters 2020-07-30 21:05:37 +10:00
  • 8a1f358505 Merge pull request #888 from SchrodingersGat/allow-staff-delete Oliver 2020-07-30 20:29:57 +10:00
  • b7f30ee136 Update translations #888 Oliver Walters 2020-07-30 20:26:14 +10:00
  • d90edab59f Staff users are allowed to delete stock items that otherwise are not able to be deleted Oliver Walters 2020-07-30 20:23:46 +10:00
  • d1d5b45073 Merge remote-tracking branch 'inventree/master' Oliver Walters 2020-07-22 14:52:57 +10:00
  • daab81fa2c Merge pull request #887 from eeintech/allow_api_thumbnail_update Oliver 2020-07-22 09:19:43 +10:00
  • f386039d5a Added validation method for uploaded file using imghdr library #887 eeintech 2020-07-21 16:01:17 -05:00
  • af70dd5dfe Allowing Part thumbnail (image) update via API eeintech 2020-07-20 16:16:26 -05:00
  • 51c194fb8f Merge branch 'master' of github.com:eeintech/InvenTree into bom_dev eeintech 2020-07-19 15:05:07 -05:00
  • 6994af411d Merge remote-tracking branch 'inventree/master' Oliver Walters 2020-07-18 13:31:07 +10:00
  • 5209a7a1b0 Merge pull request #884 from SchrodingersGat/fix-filters Oliver 2020-07-14 16:05:44 +10:00
  • 0152ae79ef Adds table filters for stock assigned to a particular customer #884 Oliver Walters 2020-07-14 15:54:03 +10:00
  • 3b98d85143 Merge branch 'master' of github:eeintech/InvenTree into bom_dev eeintech 2020-07-09 08:48:41 -05:00
  • 46586ba960 Corrected typo in part.models, simplified MakeBomTemplate function eeintech 2020-07-05 16:25:05 -05:00
  • cfd1194a6e Merge pull request #883 from eeintech/api_delete_inactive_part Oliver 2020-07-09 19:42:51 +10:00
  • 9b7977a217 API: Allow part deletion if inactive #883 eeintech 2020-07-08 09:43:09 -05:00
  • 5f2ca784c9 Merge branch 'negative-stock-fix' Oliver Walters 2020-06-28 19:26:56 +10:00