2
0
mirror of https://github.com/inventree/InvenTree.git synced 2026-05-13 21:17:33 +00:00

Commit Graph

  • 89758f28b2 Merge branch 'inventree:master' into matmair/issue2201 Matthias Mair 2021-12-11 00:08:29 +01:00
  • dfd7a439a6 Merge pull request #2445 from SchrodingersGat/issue2250 Oliver 2021-12-11 09:15:37 +11:00
  • c35971c524 Merge pull request #2448 from SchrodingersGat/build-allocation-fixes Oliver 2021-12-11 08:10:26 +11:00
  • 438bbb5c03 Translation merge (#2447) Oliver 2021-12-11 01:11:27 +11:00
  • 05abe40978 Merge pull request #2446 from SchrodingersGat/so-allocation-quantity Oliver 2021-12-11 01:08:21 +11:00
  • 1dafa040f9 Move 'quantity' field Oliver 2021-12-11 01:08:18 +11:00
  • d573668f81 Correctly allow "inherited" BOM items to be allocated to a build order Oliver 2021-12-11 01:05:19 +11:00
  • e1a5192604 Calculate how many items to assign to sales order Oliver 2021-12-11 00:45:53 +11:00
  • b908aa2467 fix js linting issues Oliver 2021-12-11 00:33:16 +11:00
  • 9e16989c91 Add same breadcrumb tree for StockLocation and StockItem Oliver 2021-12-11 00:25:59 +11:00
  • e9ae3eb01d Revert to bootstrap-treeview Oliver 2021-12-11 00:08:17 +11:00
  • 3bc3ff493a CSS tweaks Oliver 2021-12-10 22:53:24 +11:00
  • 7dcd166d50 Change "sidetree" to "breadcrumb-tree" Oliver 2021-12-10 22:53:19 +11:00
  • 8c018cf987 Add href to nav toggle (so mouse cursor changes) Oliver 2021-12-10 22:31:50 +11:00
  • ffe970d139 Move "sidetree" to underneath breadcrumbs Oliver 2021-12-10 22:31:11 +11:00
  • e6ad22ec15 fix plugin urlpattern patching Matthias 2021-12-10 01:34:47 +01:00
  • c6b88c2f24 Merge branch 'matmair/issue2279' of https://github.com/matmair/InvenTree into matmair/issue2279 Matthias 2021-12-10 00:22:49 +01:00
  • 023cd53b1a fix test that failing deliveries do not block Matthias 2021-12-10 00:22:25 +01:00
  • 25e0324eb1 Merge branch 'inventree:master' into matmair/issue2279 Matthias Mair 2021-12-09 23:56:27 +01:00
  • ac0a5d4efc Merge branch 'inventree:master' into webhooks Matthias Mair 2021-12-09 23:56:18 +01:00
  • 75aeab48b8 Merge branch 'inventree:master' into matmair/issue2250 Matthias Mair 2021-12-09 23:56:08 +01:00
  • 869324249e Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2201 Matthias 2021-12-09 23:54:55 +01:00
  • 18244f0adf docstring Matthias 2021-12-09 23:54:23 +01:00
  • ceb06c6e62 require MFA for admin if set Matthias 2021-12-09 23:54:02 +01:00
  • 2b27fab771 Merge pull request #2436 from SchrodingersGat/assign-to-customer Oliver 2021-12-09 10:41:57 +11:00
  • fefe39b88d Fixes for unit tests Oliver 2021-12-09 10:04:33 +11:00
  • c1163b9f6b Adds missing semicolon Oliver 2021-12-09 09:07:36 +11:00
  • ba921b45ff remove state from api interface Matthias 2021-12-08 22:44:01 +01:00
  • 3a3f8ba4ef Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2201 Matthias 2021-12-08 18:31:33 +01:00
  • b8404c44b4 Merge branch 'inventree:master' into webhooks Matthias Mair 2021-12-08 18:28:11 +01:00
  • cdcac90319 Merge branch 'inventree:master' into matmair/issue2279 Matthias Mair 2021-12-08 18:27:57 +01:00
  • cfa576d03d Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2250 Matthias 2021-12-08 18:26:49 +01:00
  • 4a453b0a35 Assign multiple stock items to a customer at one Oliver 2021-12-09 00:32:50 +11:00
  • 96a885e4e1 client side form for assigning stock items to customers Oliver 2021-12-09 00:20:45 +11:00
  • c36687af22 Add unit test for new API serializer Oliver 2021-12-08 23:45:47 +11:00
  • e0d52843a4 Basic stock assignment serializer implementation Oliver 2021-12-08 23:01:26 +11:00
  • 88840e6adb Merge pull request #2435 from SchrodingersGat/old-session-fix Oliver 2021-12-08 22:49:51 +11:00
  • b19a7cc4fb Run at app startup, not as a migration Oliver 2021-12-08 22:26:59 +11:00
  • 1cc1fca5fe set background color Matthias 2021-12-08 02:06:55 +01:00
  • 2725a2eb87 disable icons Matthias 2021-12-08 02:01:26 +01:00
  • 79a60ff895 Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2250 Matthias 2021-12-08 01:11:35 +01:00
  • 12afb19dfa move toggle Matthias 2021-12-08 01:11:21 +01:00
  • 45181904af fix icon Matthias 2021-12-08 00:26:56 +01:00
  • 5ed163dd71 add new toggler Matthias 2021-12-08 00:22:00 +01:00
  • e4b6306ddb Merge pull request #2434 from wengtad/issue2428 Oliver 2021-12-08 10:21:31 +11:00
  • 821f9389d5 remove old links Matthias 2021-12-08 00:19:17 +01:00
  • ff5095a270 remove children -> used for reloading Matthias 2021-12-08 00:07:05 +01:00
  • 596532f312 only one api call Matthias 2021-12-08 00:05:34 +01:00
  • c8c35e2f04 Remove old task to delete expired sessions Oliver 2021-12-08 09:55:41 +11:00
  • 948270bbcb add stuff to mark starting endpoint Matthias 2021-12-07 23:54:45 +01:00
  • c143826e9b fix: stock tracking table aligment Weng Tad 2021-12-07 13:59:51 +08:00
  • f2b966fac5 Merge pull request #2433 from SchrodingersGat/string-fix Oliver 2021-12-07 11:29:44 +11:00
  • af1fe021f5 Merge pull request #2432 from SchrodingersGat/po-part-filter Oliver 2021-12-07 11:29:38 +11:00
  • 2cf4e20d9a Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2250 Matthias 2021-12-07 01:16:32 +01:00
  • fbc4cfe166 remove always show Matthias 2021-12-07 00:52:14 +01:00
  • 46279c8172 fix design refs Matthias 2021-12-07 00:51:44 +01:00
  • 1a85e4f21d Translateable string fixeas Oliver 2021-12-07 10:51:40 +11:00
  • 2fa67707bd Add text Matthias 2021-12-07 00:51:27 +01:00
  • 99a62b2934 move border on right side to items Matthias 2021-12-07 00:41:37 +01:00
  • 463192e0b9 Improved table filtering for "purchase order" table (as seen from "part" view) Oliver 2021-12-07 10:33:09 +11:00
  • 61bdf8937c style fix Matthias 2021-12-07 00:30:50 +01:00
  • 388b42a407 use sidebar-wrapper for styleing Matthias 2021-12-07 00:26:36 +01:00
  • f375ba96ae add sidetree toggler function Matthias 2021-12-07 00:21:33 +01:00
  • b5ae9edc2e style fixes Matthias 2021-12-06 23:48:21 +01:00
  • 1ad91811a5 Merge pull request #2426 from nwns/feature/qcluster_redis Oliver 2021-12-07 09:24:29 +11:00
  • c703f9993f make url simpler Matthias 2021-12-06 22:37:42 +01:00
  • 8e425e67a1 reduce Matthias 2021-12-06 22:37:17 +01:00
  • 70939a0cf9 first working example Matthias 2021-12-06 22:35:14 +01:00
  • de4d057b93 Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2250 Matthias 2021-12-06 01:37:48 +01:00
  • 9ebbf8190c add tree to replication Matthias 2021-12-06 01:35:14 +01:00
  • 416bcb822b remove unneeded sidebar block Matthias 2021-12-06 01:34:16 +01:00
  • 49f9cc7edc modifiy sidebar code Matthias 2021-12-06 01:33:41 +01:00
  • b7f3a044d9 Merge pull request #2427 from nwns/fix/overlapping_currency Oliver 2021-12-06 09:49:54 +11:00
  • 07c88328ae Merge pull request #2423 from SchrodingersGat/maintenance-mode-state-file Oliver 2021-12-06 09:48:43 +11:00
  • 44d35d06f4 Merge remote-tracking branch 'inventree/master' into maintenance-mode-state-file Oliver 2021-12-06 09:16:44 +11:00
  • da020f6fd6 Remove extra options Oliver 2021-12-06 09:05:13 +11:00
  • a9f584cb65 fix: swallow Serialization failure Nigel 2021-12-05 09:18:55 -07:00
  • 561fd6afc1 fix: Q_CLUSTER is using the database for its broker Nigel 2021-12-05 08:57:08 -07:00
  • 8814868fc7 Merge pull request #2424 from SchrodingersGat/remove-schedule-delete Oliver 2021-12-05 19:11:00 +11:00
  • 93a240d9c3 Remove the "scheduled_for_deletion" field from the StockItem model Oliver 2021-12-05 18:14:14 +11:00
  • a821717103 Add a data migration which deletes any stock items which have been scheduled for deletion. Oliver 2021-12-05 17:56:39 +11:00
  • ae8166984f Adjustments for maintenance-mode options: Oliver 2021-12-05 17:28:46 +11:00
  • 7ba01612d8 Merge pull request #2074 from matmair/plugin-2037 Oliver 2021-12-05 08:46:47 +11:00
  • 0c9590ba37 Merge pull request #2417 from matmair/pipeline Oliver 2021-12-05 08:00:02 +11:00
  • 529987bb17 remove unneeded Todo Matthias 2021-12-04 19:52:56 +01:00
  • ed5bb3d264 turn around template loader order Matthias 2021-12-04 19:49:43 +01:00
  • 5567ee432a more coverage Matthias 2021-12-04 18:50:49 +01:00
  • d156e4c431 make simpler Matthias 2021-12-04 18:44:31 +01:00
  • 2413119cc1 seperate wrong implementations into own cases Matthias 2021-12-04 18:42:08 +01:00
  • bb2ad7c2cb Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 Matthias 2021-12-04 18:04:47 +01:00
  • 1060f60117 Merge branch 'inventree:master' into webhooks Matthias Mair 2021-12-04 17:53:21 +01:00
  • 2a0e07abe0 Merge branch 'inventree:master' into matmair/issue2201 Matthias Mair 2021-12-04 17:53:13 +01:00
  • 502d701a70 Merge branch 'inventree:master' into pipeline Matthias Mair 2021-12-04 17:53:02 +01:00
  • 0d9f76a019 Merge branch 'inventree:master' into matmair/issue2279 Matthias Mair 2021-12-04 17:52:58 +01:00
  • 2ef8c25c05 directer import Matthias 2021-12-04 17:46:04 +01:00
  • 8724471fc0 rename Matthias 2021-12-04 17:45:52 +01:00
  • ce726f89a1 refactor wrong implementations into own testcase Matthias 2021-12-04 17:45:40 +01:00
  • 13b390d69b test that single errors do not kill the whole Matthias 2021-12-04 17:44:10 +01:00
  • cfd509adb4 PEP fix Matthias 2021-12-04 17:43:11 +01:00
  • 58f0838d3d improve coverage Matthias 2021-12-04 17:24:41 +01:00