inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-08-21 20:45:13 +00:00
Code Activity
9,790 Commits 9 Branches 168 Tags
eaa315e7263878a7e50d7b8afe4e963ddd3afb62
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver eaa315e726 Merge branch 'master' into partial-shipment 
# Conflicts:
#	InvenTree/build/templates/build/build_base.html
#	InvenTree/order/templates/order/order_base.html
#	InvenTree/order/templates/order/sales_order_base.html
#	InvenTree/order/templates/order/sales_order_detail.html
#	InvenTree/order/templates/order/so_navbar.html
 2021-10-30 23:44:06 +11:00
Oliver 2a58ad97dc Merge pull request #2206 from matmair/gitpod 
Add definition for Gitpod.io
 2021-10-30 23:06:40 +11:00
Oliver 2bbeab38ff Merge pull request #2205 from SchrodingersGat/bootstrap-5 
Bootstrap 5
 2021-10-30 23:03:12 +11:00
Oliver 75c8faa09f Tweaks 2021-10-30 22:30:04 +11:00
Oliver 638c9d4007 Enable bootstrap-5 theme for select2 2021-10-30 22:16:40 +11:00
Oliver 2830fc3c7f Fixes 2021-10-30 14:11:03 +11:00
Oliver 29c913b553 Improvements for stock item test result table 2021-10-30 13:31:13 +11:00
Oliver 79434bb4e0 Handle missing report template 2021-10-30 13:28:08 +11:00
Oliver a689b77cfb More tweaks 2021-10-30 13:18:11 +11:00
Oliver eb18ad6c4c Merge pull request #2164 from nwns/feature/postgrestimeouts 
Set some sensible postgres timeouts
 2021-10-30 13:14:13 +11:00
Oliver c4c533bee0 JS linting 2021-10-30 13:03:52 +11:00
Oliver c2a8cfd183 PEP style fixes 2021-10-30 12:57:49 +11:00
Oliver 8e1d9c281a Adds tree view for stock locations 2021-10-30 12:53:25 +11:00
Oliver be23634c5d Refactor display toggle for part list and part category list 2021-10-30 12:45:07 +11:00
Oliver 3bd59728db CSS tweaks 2021-10-30 08:59:40 +11:00
Oliver fcc1e9fe8f Fixes 2021-10-30 01:00:37 +11:00
Oliver 4eea8c8193 Remove old tree classes 2021-10-30 00:18:41 +11:00
Oliver a792903a79 Catch sidebar error 2021-10-30 00:15:19 +11:00
Oliver a15cc1f3ba linting fixes 2021-10-30 00:07:51 +11:00
Oliver 57240865e8 More tweaking 2021-10-30 00:05:32 +11:00
Oliver 25a5d8de78 Improve visual style of breadcrumbs 2021-10-29 23:28:19 +11:00
Oliver 3849ea8057 Rearranging buttons 2021-10-29 23:20:09 +11:00
Oliver c04118ed8a Driving the refactor tractor around the farm 2021-10-29 22:20:06 +11:00
Oliver b41d1aed12 Refactor admin button for: 
- build order
- part detail
- stock item
- stock location
- company detail
- manufacturer-part
- purchase order
- sales order
 2021-10-29 17:07:35 +11:00
Oliver 8afa39cd91 Refactor "search" page 2021-10-29 13:54:46 +11:00
Oliver 0f10936e65 Refactored index page 
- Looks MUCH nicer now!
 2021-10-29 13:28:21 +11:00
Oliver 6a3c9ead17 Add option to disable "toggle" for sidebar 2021-10-29 11:48:46 +11:00
Oliver 890fd0f1a0 Remove nav tree 2021-10-29 10:54:15 +11:00
Oliver 80a41affc1 More sidebar action 2021-10-29 01:20:24 +11:00
Oliver 1b5428718e Refactored sidebar for "purchase order" 2021-10-29 01:11:00 +11:00
Oliver 00a0311c63 Refactor sidebar for "sales order" page 2021-10-29 01:08:18 +11:00
Oliver 5a2c20ea55 Refactor sidebar for "company" display 2021-10-29 01:05:39 +11:00
Oliver 613b135edf Refactor sidebar for "build order" display 2021-10-29 01:00:39 +11:00
Oliver ec2e06fa15 Refactor sidebar for "settings" window 2021-10-29 00:55:22 +11:00
Oliver 5f139b4aa4 Refactor sidebar for "location" display 2021-10-29 00:43:58 +11:00
Oliver e0d3facfac Refactor sidebar for "stock item" page 2021-10-29 00:40:16 +11:00
Oliver 59acf45ab9 Implement sidebar for "part category" display 2021-10-29 00:29:09 +11:00
Oliver f0fe7f2d5c Complete refactoring of part sidebar 2021-10-29 00:20:39 +11:00
Oliver f542bdc19f badge updates 2021-10-28 22:32:03 +11:00
Oliver 2778ff55da Remove btn-default 2021-10-28 19:57:17 +11:00
Oliver b1cdcdf0b8 More fixes 
- About modal
- Server-side modals
- icon badges
- checkboxes in API forms
 2021-10-28 19:41:46 +11:00
Oliver d0085efa28 Fix server-side modal 2021-10-28 19:10:21 +11:00
Oliver 3ce8ba85f4 Further badge tweaks 2021-10-28 17:57:03 +11:00
Oliver f8ac016d60 replace labels with badges 2021-10-28 17:41:40 +11:00
Oliver c4fd9b7177 Fixes for part "card" view 2021-10-28 17:16:32 +11:00
Oliver 0ef0c539a7 Update bootstrap-table 2021-10-28 13:03:47 +11:00
Oliver 05d350b6c8 Tweaks for settings pages 2021-10-28 12:38:33 +11:00
Oliver ae2c3e8293 remove "panel-inventree" references 2021-10-28 08:31:36 +11:00
Oliver 8535dd7572 part category and stock location views 2021-10-27 23:53:41 +11:00
Oliver a21959f54d Refactor stock location view 2021-10-27 23:46:09 +11:00
Oliver 840187f577 refactor stock item page 2021-10-27 23:35:59 +11:00
Oliver 9d2b4af83f Refactor part display 2021-10-27 23:29:10 +11:00
Oliver e235e5adec Replace "panel-body" with "panel-content" 2021-10-27 23:09:14 +11:00
Oliver 711b3ba923 remove "panel-default" 2021-10-27 23:08:15 +11:00
Oliver 53c579c992 Refactor PO and SO pages 2021-10-27 23:03:08 +11:00
Oliver 5959dccff0 Refactor "supplier_part" page 2021-10-27 22:56:17 +11:00
Oliver fe25ce8cd1 Refactor "manufacturer_part" view 2021-10-27 22:52:11 +11:00
Oliver 9536231cb0 Refactor company base page 2021-10-27 22:44:46 +11:00
Oliver 8fdaab233c Refactor build page 2021-10-27 22:44:33 +11:00
Oliver a004f293ff Replace all instances of data-toggle with data-bs-toggle 2021-10-27 22:06:30 +11:00
Oliver e178a2c370 Refactoring for "stock" pages 2021-10-27 21:50:18 +11:00
Oliver 707a03c416 Add breadcrumbs for build order page 
(cherry picked from commit f32dfb01a2)
 2021-10-27 20:18:16 +11:00
Oliver 82271cfcb7 Add breadcrumbs to purchase order and sales order pages 
(cherry picked from commit dd5eeb7c61)
 2021-10-27 20:18:09 +11:00
Oliver 9df9aaa18f breadcrumbs 2021-10-27 20:17:37 +11:00
Oliver 219191eb6a Updates for modal forms: 
- Fix css classes
 2021-10-27 16:48:45 +11:00
Oliver abf2093ab9 Adds user option to enable "sticky header" 2021-10-27 16:26:41 +11:00
Oliver 827ff0f58b Modal forms fixes 
- Update bootstrap classes and terminology
- Visual tweaks to modal form title block
 2021-10-27 16:26:28 +11:00
Oliver 1e31774ce7 Working on navbar 2021-10-27 15:48:42 +11:00
Oliver c6ceea4d45 Remove reliance on "bootstrap-toggle" library 
- Still needs fixing in modal forms
 2021-10-27 09:37:07 +11:00
Oliver 3a4022b259 Add files for bootstrap v5.1.3 2021-10-27 08:04:34 +11:00
Oliver f32dfb01a2 Add breadcrumbs for build order page 2021-10-27 01:15:39 +11:00
Oliver 75845ce1ca Merge branch 'master' into partial-shipment 2021-10-27 01:05:55 +11:00
Oliver 96be11edd4 Add 'status' field to shipment table 
- Is not yet implemented in the db model
 2021-10-27 01:05:10 +11:00
Oliver 2eb93b5a49 Add functionality to create a new sales order shipment 
- From the "New Shipment" button
- As a secondary modal from the stock allocation dialgo
 2021-10-27 00:57:47 +11:00
Oliver 4d0f905afc Auto-fill the "quantity" field for the salesorder allocation table 2021-10-27 00:47:15 +11:00
Oliver 7252b299f7 Add modal API form to allocate stock items against a SalesOrder 
- Added model renderer for SalesOrderShipment
- Some refactorin'
 2021-10-27 00:41:12 +11:00
Oliver bff9f0828a Adds API endpoint to allocate stock items against a SalesOrder 
- SalesOrderAllocations are no longer created manually
- API endpoint performs data validation
- Multiple line items can be allocated at once
- Adds unit testing for new API endpoint
 2021-10-26 23:51:36 +11:00
Oliver dd5eeb7c61 Add breadcrumbs to purchase order and sales order pages 2021-10-26 22:46:30 +11:00
Oliver 87154c0240 Bump API version 2021-10-26 22:17:31 +11:00
Oliver c90c224ed2 Update "reference" field for shipment model 
- Must be unique
- Auto-incrementing default value
- Updated migrations
 2021-10-26 22:13:55 +11:00
Oliver 5cd9be6845 Merge pull request #2202 from SchrodingersGat/decimal-validation-fix 
Fix for supplier price breaks
 2021-10-26 08:41:10 +11:00
Oliver b35ce79d6a js linting fix 2021-10-26 08:00:28 +11:00
Oliver cbbad98fea Improve client-side validation of numerical inputs 2021-10-26 07:52:29 +11:00
Oliver 2d910022ac Fix for supplier price breaks 
- Make "price" field an InvenTreeMoneySerializer instance
- Add client-side validation for number inputs
 2021-10-26 01:55:41 +11:00
Oliver e7c25126a4 Construct table of "shipments" 2021-10-26 00:17:17 +11:00
Oliver e9e4d13541 Add list and detail API endpoints for SalesOrderShipment 
- Filter by order
- Filter by "shipped" status
- SalesOrderShipment serializer includes information on items allocated to that shipment
 2021-10-25 23:34:58 +11:00
Oliver 9fcc55d71d Admin page for new model 2021-10-25 22:50:10 +11:00
Oliver d31f2be955 Make "shipment" field required for a SalesOrderAllocation 
- Deleting a "Shipment" will delete any "Allocation" objects which reference it
- Improve existing data migration for new shipment model
 2021-10-25 22:47:41 +11:00
Oliver ce5b47460a Added data migration for existing SalesOrder instances 
- If a SalesOrder is "PENDING" or there are allocations available, a shipment is created
 2021-10-25 22:35:27 +11:00
Oliver 2f7e0974b7 Add 'shipment' foreign-key field to SalesOrderAllocation model 2021-10-25 17:42:56 +11:00
Oliver f00ec26efd Create SalesOrderShipment model 2021-10-25 13:09:06 +11:00
Oliver e7bd91096c Merge pull request #2195 from SchrodingersGat/sales-order-pricing-fix 
Sales order pricing fix
 2021-10-25 07:14:16 +11:00
Oliver 65b673b2bb Improve pricing rendering for purchase order table 2021-10-24 19:43:05 +11:00
Oliver bc596c1f20 Improve rendering of pricing in sale order table 2021-10-24 19:40:32 +11:00
Oliver 5f6e67086f Add "reload" button for salesorderlineitem table 2021-10-24 19:35:23 +11:00
Oliver a0140dc9a2 bug fix: enable "table reload" for tables without any filters 
- setupFilterList function was returning too early
 2021-10-24 19:35:15 +11:00
Oliver 367b80c17a Merge pull request #2194 from matmair/reduce-vertical-space 
Move part detail toggle button
 2021-10-24 19:08:07 +11:00
Oliver 5392011130 Merge pull request #2192 from matmair/fix-sso-signup 
Fix sso signup
 2021-10-24 08:32:08 +11:00
Oliver 5571cfdbdb Merge pull request #2184 from SchrodingersGat/allocation-fixes 
Sales order allocation fix
 2021-10-20 23:53:59 +11:00
Oliver 50a79770e5 Un-comment lines in build.serializers 2021-10-20 23:37:26 +11:00