2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-30 12:36:45 +00:00

118 Commits

Author SHA1 Message Date
Oliver
9ec5e39c50 js tweaks 2021-12-04 17:50:25 +11:00
Oliver
008c52ef39 Allocation by serial number now moved to the API 2021-12-04 13:08:00 +11:00
Oliver
921ef5ae9e Tweaks to PO and SO tables 2021-12-04 10:11:18 +11:00
Oliver
1215ef520d Further JS linting 2021-12-04 09:44:23 +11:00
Oliver
35b3bc73cc Merge remote-tracking branch 'inventree/master' into partial-shipment
# Conflicts:
#	InvenTree/order/api.py
2021-12-04 09:35:54 +11:00
Oliver
3abad2f73d js linting 2021-12-04 09:33:42 +11:00
Oliver
acfafe22c5 order lines can be received directly from the new table 2021-12-03 21:07:09 +11:00
Oliver
6d90ded27f First pass at a part-purchase-order table 2021-12-03 20:54:21 +11:00
Oliver
c93009876d UI changes 2021-12-03 20:14:09 +11:00
Oliver
e1668c8662 More stuffs:
- Allow filtering of salesorderlineitem by "completed" status
- Allow deletion of (empty) shipment
- Show which items are going to be shipped
2021-12-02 23:52:53 +11:00
Oliver
e74e7138a9 More stuff:
- Pass tracking number through when completing a shipment
- Reload tables automatically when certain actions are performed
- Limit stock items to only those with available stock
2021-12-02 21:59:59 +11:00
Oliver
586d38fb61 Add item count to shipment table 2021-12-02 21:40:21 +11:00
Oliver
6ec0cfc641 Merge branch 'master' into partial-shipment
# Conflicts:
#	InvenTree/company/templates/company/company_base.html
#	InvenTree/stock/templates/stock/item_base.html
2021-12-02 20:49:13 +11:00
Oliver
6e9937e0e9 Don't be dull, check for null 2021-11-30 15:24:19 +11:00
Oliver
3f9b280e17 Allow shipment numbers to be non-unique for different sales orders
- must be unique for a given sales order
2021-11-30 00:42:30 +11:00
Oliver
f3f3030b37 Adds API endpoint to "ship" a sales order shipment 2021-11-30 00:02:03 +11:00
Oliver
da6c723184 Merge branch 'master' into partial-shipment
# Conflicts:
#	InvenTree/order/serializers.py
2021-11-29 22:59:36 +11:00
Oliver
0b997dc784 Display both 'allocated' and 'fulfilled' quantity values in salesorder table 2021-11-26 23:30:34 +11:00
Oliver
c943b320e6 shipment table tweaks 2021-11-26 23:02:29 +11:00
Oliver
d5e7489623 Table filters 2021-11-26 22:31:25 +11:00
Oliver
ac645b1fc7 Adds "responsible" row to purchase order table 2021-11-26 22:05:27 +11:00
Oliver
d5cf2b08ac Merge remote-tracking branch 'inventree/master' into partial-shipment
# Conflicts:
#	InvenTree/InvenTree/version.py
#	InvenTree/order/models.py
2021-11-11 12:35:59 +11:00
Oliver
b6d48cab2a Make further use of notification messages 2021-11-04 10:14:01 +11:00
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
638c9d4007 Enable bootstrap-5 theme for select2 2021-10-30 22:16:40 +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
e7c25126a4 Construct table of "shipments" 2021-10-26 00:17:17 +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
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
f83dc134ef linting 2021-10-20 23:20:43 +11:00
Oliver
92568748cf Further improvements
- Add callback for when a select2 form field is updated
- Adjust selected quantity based on returned data
- auto_fill the stock_item field
2021-10-20 23:03:03 +11:00
Oliver
f7b6c68237 Pre-fill the form with the remaining allocation quantity 2021-10-20 22:37:54 +11:00
Oliver
64cf916c50 Add a form to select export format 2021-10-07 13:33:10 +11:00
Oliver
a8388b0999 JS linting 2021-10-06 20:35:51 +11:00
Oliver
5cdf5a2670 Only include "in stocK" field if the sales order is pending 2021-10-06 20:16:59 +11:00
Oliver
336b05aa4e Exclude sales order allocations when searching stock 2021-10-06 17:42:00 +11:00
Oliver
cbd2732622 Merge remote-tracking branch 'inventree/master' into sales-order-allocation-fixes 2021-10-06 17:28:38 +11:00
Oliver
b5c5842e7d Add ability to create a new sales order allocation using the API forms framework 2021-10-06 17:26:48 +11:00
Oliver
4d13674452 Migrate views to use the API forms architecture:
- SalesOrderAllocationEdit
- SalesOrderAllocationDelete
2021-10-06 17:16:01 +11:00
Oliver
87775ae16b Brace yourseflf 2021-10-06 17:02:27 +11:00
Oliver
e055902f3e More JS linting 2021-10-06 16:58:00 +11:00
Oliver
21be5b4a26 JS linting 2021-10-06 16:52:56 +11:00
Oliver
ac3a97d4d6 Fix button callbacks for the allocation table 2021-10-06 16:47:21 +11:00
Oliver
4d8bec9663 Fix rendering of row sub tables 2021-10-06 16:38:13 +11:00
Oliver
f9f8527ae5 Fix build button
- Now links into the API forms
2021-10-06 16:20:15 +11:00
Oliver
4d2cf233b3 Move the "loadSalesOrderLineItemTable" code to order.js 2021-10-06 16:14:39 +11:00