Commit Graph
100 Commits
Author SHA1 Message Date
OliverandGitHub 1f5d81ef93 Merge pull request #900 from SchrodingersGat/stock-display-improvements
Stock display improvements
2020-08-09 21:26:26 +10:00
Oliver Walters cebba6909c Revert thing 2020-08-09 21:21:12 +10:00
Oliver Walters 3336eb9f45 Default stock list behaviour is to only show in_stock items 2020-08-09 21:12:49 +10:00
Oliver Walters 0da9e0f834 Add "sent_to_customer" filter 2020-08-09 21:10:21 +10:00
Oliver Walters 502702b3bc Add some more visual tags to the stock list 2020-08-09 21:04:41 +10:00
OliverandGitHub bb6b3b965d Merge pull request #896 from SchrodingersGat/company-ordering
Add default ordering for Company model
2020-08-08 17:21:21 +10:00
OliverandGitHub fcfd1f82d6 Merge pull request #898 from SchrodingersGat/filter-depleted
Filter depleted
2020-08-08 17:19:28 +10:00
Oliver Walters 19c036f50a Add migration files 2020-08-08 17:16:04 +10:00
Oliver Walters ad11681369 Custom filter tag for company stock listing 2020-08-08 17:15:08 +10:00
Oliver Walters bc3fda71a4 Display "depleted" label next to depleted stock 2020-08-08 17:11:50 +10:00
Oliver Walters 96a3f2920d Stock table filters now arranged in alphabetical order 2020-08-08 17:09:22 +10:00
Oliver Walters 099f56e779 Add "depleted" table filter 2020-08-08 17:08:18 +10:00
Oliver Walters 402301e165 Add ability to filter stock items by "depleted" status 2020-08-08 17:06:22 +10:00
OliverandGitHub 190610c6c9 Merge pull request #897 from SchrodingersGat/serialized-stock-adjust-fix
Cannot edit quantity for serialized stock when adjusting
2020-08-08 17:05:29 +10:00
Oliver Walters 732405f738 Cannot edit quantity for serialized stock when adjusting 2020-08-08 17:01:29 +10:00
Oliver Walters a7ee323035 PEP fix 2020-08-08 16:59:48 +10:00
Oliver Walters ad977d4d26 Add default ordering for Company model
- Now will sort by "name" in choice fields, etc
2020-08-08 16:54:09 +10:00
OliverandGitHub eac53c836c Update README.md 2020-08-08 09:52:14 +10:00
OliverandGitHub 2cd6c0b9fc Merge pull request #895 from SchrodingersGat/return-to-stock
Return to stock
2020-08-08 09:48:44 +10:00
Oliver Walters 8d9cfd3678 Migration file for StockStatus codes 2020-08-08 09:44:21 +10:00
Oliver Walters a2c3c1086c Catch unhandled javascript errors 2020-08-08 09:31:57 +10:00
Oliver Walters ff71fe6e93 Fix "in_stock" logic for StockItem
- Not in stock if it is at a customer!
2020-08-08 09:20:42 +10:00
Oliver Walters 861a2982db Removed "SHIPPED" stock status code 2020-08-08 09:16:53 +10:00
Oliver Walters 54c1f2d9a2 Upgrade to latest flake8 2020-08-08 09:15:45 +10:00
Oliver Walters 459cc03aae Remove "ASSIGNED_TO_BUILD" status code 2020-08-08 09:08:15 +10:00
Oliver Walters 80173a9d43 Remove ASSIGNED_TO_OTHER_ITEM status code 2020-08-08 09:07:25 +10:00
Oliver Walters bdea29df04 Add functionality to return stock item from customer 2020-08-08 09:05:33 +10:00
Oliver Walters 7b332d93ee Rearrange button layouts 2020-08-08 08:48:27 +10:00
OliverandGitHub 518ad3eb60 Merge pull request #892 from SchrodingersGat/import-fix
Allow default_keywords to be  null
2020-08-04 11:35:25 +10:00
Oliver Walters 0f199556df Add migration file 2020-08-04 11:21:27 +10:00
Oliver Walters 3a266cf322 Allow default_keywords to be null 2020-08-04 11:10:24 +10:00
OliverandGitHub 08bab0a1b9 Merge pull request #891 from SchrodingersGat/security-fix
Update requirements.txt
2020-08-03 19:53:34 +10:00
Oliver Walters 481eeb8338 Update requirements.txt 2020-08-03 19:36:41 +10:00
OliverandGitHub e0e82dabf3 Merge pull request #889 from SchrodingersGat/allow-empty-stock
Allow creation of a stock item with zero quantity
2020-07-30 21:09:57 +10:00
Oliver Walters 10691b3d03 Allow creation of a stock item with zero quantity 2020-07-30 21:05:37 +10:00
OliverandGitHub 8a1f358505 Merge pull request #888 from SchrodingersGat/allow-staff-delete
Allow staff delete
2020-07-30 20:29:57 +10:00
Oliver Walters b7f30ee136 Update translations 2020-07-30 20:26:14 +10:00
Oliver Walters d90edab59f Staff users are allowed to delete stock items that otherwise are not able to be deleted 2020-07-30 20:23:46 +10:00
OliverandGitHub daab81fa2c Merge pull request #887 from eeintech/allow_api_thumbnail_update
Allowing Part thumbnail (image) update via API
2020-07-22 09:19:43 +10:00
OliverandGitHub 5209a7a1b0 Merge pull request #884 from SchrodingersGat/fix-filters
Adds table filters for stock assigned to a particular customer
2020-07-14 16:05:44 +10:00
Oliver Walters 0152ae79ef Adds table filters for stock assigned to a particular customer 2020-07-14 15:54:03 +10:00
OliverandGitHub cfd1194a6e Merge pull request #883 from eeintech/api_delete_inactive_part
API: Allow part deletion if inactive
2020-07-09 19:42:51 +10:00
OliverandGitHub 3d7676e292 Merge pull request #880 from SchrodingersGat/negative-stock-fix
Improve logic of "quantity_to_order" function
2020-06-28 19:23:37 +10:00
OliverandGitHub 25b7f0b7ee Merge pull request #879 from SchrodingersGat/star-filter-fix
Fix filter logic for 'starred' parts
2020-06-28 19:14:55 +10:00
Oliver Walters 3d245c7ce3 Improve logic of "quantity_to_order" function 2020-06-28 19:14:51 +10:00
Oliver Walters 134a688e4a Fix filter logic for 'starred' parts 2020-06-28 19:08:13 +10:00
OliverandGitHub 8ac23c080f Merge pull request #875 from SchrodingersGat/tweaks
"Active" part toggle is always enabled
2020-06-22 11:33:39 +10:00
Oliver Walters fa3d2d005a "Active" part toggle is always enabled 2020-06-22 11:27:59 +10:00
OliverandGitHub da70af7ba0 Merge pull request #874 from SchrodingersGat/show_non_stock
Add ability to display "out of stock" items against a part
2020-06-22 10:55:12 +10:00
Oliver Walters 930f903f5d Add ability to display "out of stock" items against a part 2020-06-22 10:48:41 +10:00
OliverandGitHub 16bea33695 Merge pull request #867 from SchrodingersGat/name-conventions
Update verbose names for some fields
2020-06-13 20:52:15 +10:00
Oliver Walters dedc25d681 Update verbose names for some fields 2020-06-13 20:46:19 +10:00
OliverandGitHub 2047b2d7d7 Merge pull request #866 from SchrodingersGat/moar-buttons
Reorganize buttons for "Part" view
2020-06-12 18:16:06 +10:00
Oliver Walters 2e91f64a96 Add (disabled) print-label button for Part display 2020-06-12 18:13:14 +10:00
Oliver Walters 1ad4b8b131 Reorganize buttons for "Part" view 2020-06-12 18:11:57 +10:00
OliverandGitHub a63219466f Merge pull request #865 from SchrodingersGat/barcode-suppor
Barcode support
2020-06-12 17:57:36 +10:00
Oliver Walters 9757fb06db Fix a weird button issue
- reloadTable() was causing the button 'click' handler to fire...
- NFI why this is happening
2020-06-12 16:47:57 +10:00
Oliver Walters ab4e6548dc Transfer stock items into a stock location using barcode scanning 2020-06-12 16:29:08 +10:00
Oliver Walters 351a55c9ea Add the concept of "action groups" to the buttons for the Stock Location view 2020-06-12 11:14:33 +10:00
Oliver Walters e1c503836d Improve barcode icon in navbar 2020-06-12 10:56:52 +10:00
Oliver Walters 8cafaa0e62 Make barcode javascript translatable 2020-06-12 10:43:27 +10:00
Oliver Walters 6064c6ceb5 Add dialog for linking a barcode with a stock item 2020-06-12 10:26:23 +10:00
Oliver Walters b559816dca Update translations 2020-06-12 10:25:07 +10:00
Oliver Walters ba94b340dd Add function to un-link barcode from a stock item 2020-06-12 10:12:31 +10:00
Oliver Walters beccbe8583 Flake fixes 2020-06-11 19:46:36 +10:00
Oliver Walters 07be08d0f3 "Simplify" qr code display 2020-06-11 19:40:44 +10:00
Oliver Walters 4bb9c4c559 Prevent barcode data being entered multiple times 2020-06-11 19:27:32 +10:00
Oliver Walters 2d9b75c6ae Include URL data in barcode scan endpoint 2020-06-11 19:21:38 +10:00
Oliver Walters 3aecb110a5 Add qrcode icon as prefix to barcode input 2020-06-11 19:05:55 +10:00
Oliver Walters 503d5a41b1 Add global 'barcode-scan' button 2020-06-11 18:09:43 +10:00
Oliver Walters e943681baa Add translations for error messages 2020-06-11 18:09:06 +10:00
Oliver Walters 0559946791 Add unit testing framework for barcodes 2020-06-11 14:44:56 +10:00
Oliver Walters 22a8e82108 Add endpoint for assigning a particular barcode to a StockItem 2020-06-11 12:21:33 +10:00
Oliver Walters a72ed11cb0 Skeleton for DigiKey barcode 2020-06-11 11:16:55 +10:00
Oliver Walters 1a15b46d65 Remove some debug statements 2020-06-11 11:14:02 +10:00
Oliver Walters 0068cd9825 Refactor barcode endoint
- Moved code into 'barcode' directory
2020-06-11 11:09:07 +10:00
Oliver Walters 290c0eb225 Add barcode javascript file 2020-06-11 09:56:59 +10:00
Oliver Walters bc31cc550e Consolidate buttons for stock item 2020-06-10 15:27:30 +10:00
OliverandGitHub 218971e6f1 Merge pull request #864 from SchrodingersGat/translation-fixes
Update translation hooks
2020-06-09 16:28:34 +10:00
Oliver Walters 38dcdcad54 Update translation hooks 2020-06-09 16:18:38 +10:00
OliverandGitHub aeba189c1a Merge pull request #863 from SchrodingersGat/decimalfix
Decimalize display of variant stock
2020-06-09 13:44:47 +10:00
Oliver Walters 09400fd66b Decimalize display of variant stock
(cherry picked from commit 6e45360c4b7a6bc91f584f498fb6e1988593db95)
2020-06-09 13:31:16 +10:00
OliverandGitHub f3e3838782 Merge pull request #862 from SchrodingersGat/stock-buttons-fix
Fix display of buttons for stock item
2020-06-09 13:19:15 +10:00
Oliver Walters c7586b83e9 Fix display of buttons for stock item
(cherry picked from commit b23017b6bf)
2020-06-09 13:15:12 +10:00
OliverandGitHub b2c302cb2c Merge pull request #858 from SchrodingersGat/stock-table-ipn
Add "IPN" column to stock list table
2020-06-06 08:58:59 +10:00
Oliver Walters 126e42a022 Add "IPN" column to stock list table 2020-06-06 08:47:06 +10:00
OliverandGitHub 22b30a0626 Merge pull request #857 from SchrodingersGat/security-fix
Update django version
2020-06-06 08:38:15 +10:00
Oliver Walters 84362ea790 Update django version 2020-06-06 08:27:13 +10:00
OliverandGitHub f563ac0dcb Merge pull request #855 from SchrodingersGat/part-table
Add "IPN" column to part table
2020-06-05 19:38:16 +10:00
Oliver Walters 16d261d956 Make description fields optional 2020-06-05 19:33:32 +10:00
Oliver Walters 15817ce61a Add "IPN" column to part table 2020-06-05 19:26:41 +10:00
OliverandGitHub dedd87f20a Merge pull request #854 from SchrodingersGat/customer-stock-display
Customer stock display
2020-06-05 12:20:25 +10:00
Oliver Walters fcd588cb01 Filter SalesOrder by status 2020-06-05 12:08:47 +10:00
Oliver Walters 6ebce2b2fd Add ability to filter purchase orders by "outstanding" status 2020-06-05 12:06:28 +10:00
Oliver Walters 544e217347 Add page to show stock which is assigned to a customer 2020-06-05 11:52:07 +10:00
Oliver Walters 9f599546de Use stock status for determining "in stock" 2020-06-05 09:08:46 +10:00
Oliver Walters 408c6a4040 Filter stock list by "customer" 2020-06-05 09:05:57 +10:00
OliverandGitHub 96b79397c2 Merge pull request #852 from SchrodingersGat/send-to-customer
Send to customer
2020-06-04 19:55:57 +10:00
Oliver Walters ca1526405b PEP fixes 2020-06-04 19:51:43 +10:00
Oliver Walters 80019a3ed8 Add forms/views for manually assigning a stock item to a customer 2020-06-04 19:45:41 +10:00