Oliver
9ba6ac423d
Add shipment status to sales order page
2021-12-04 10:16:51 +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
43ee4e390a
API updates
...
- Allow filtering of POLineItem list endpoint by base part instance
- Include "order detail" in POLineItem serializer
2021-12-03 20:53:59 +11:00
Oliver
c93009876d
UI changes
2021-12-03 20:14:09 +11:00
Oliver
88fce1e813
Unit test fixes
2021-12-03 18:42:36 +11:00
Oliver
6b29e60494
Fixes for migration tests
2021-12-03 11:12:49 +11:00
Oliver
3c3dd9368d
Do not auto-complete salesorder when shipment is done
...
- User might want to add more line items?
2021-12-03 00:45:44 +11:00
Oliver
732034d9e5
Merge conflicting migrations
2021-12-03 00:43:10 +11:00
Oliver
80b615bfb7
Import fix
2021-12-03 00:08:05 +11:00
Oliver
93173ef1ee
Merge remote-tracking branch 'inventree/master' into partial-shipment
...
# Conflicts:
# InvenTree/order/serializers.py
2021-12-02 23:58:52 +11:00
Oliver
ecf70b6d4d
Some PEP fixes
2021-12-02 23:58:02 +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
d5ace1a8da
Differentiate between "fully allocated" and "partially allocated" in stock item table
2021-12-02 21:46:05 +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
Matthias
c2a6a8a30c
PEP fix
2021-12-02 10:01:20 +01:00
Matthias
970cec590b
only values starting with int possible -> only positive values
2021-12-02 09:06:58 +01:00
Matthias
c4f1a81c9c
fix permissions for test
2021-12-02 01:18:45 +01:00
Matthias
fc6f1b4acc
unittests to show the fix works
2021-12-01 23:45:16 +01:00
Matthias
dc65634abc
use mixin on all serializers whos models use ReferenceIndexingMixin
2021-12-01 23:36:21 +01:00
Matthias
3b5e9d3283
use BigIntegerField for a hugher range ;-)
2021-12-01 22:39:53 +01:00
Oliver
fd02197851
Refactor purchase order page
2021-11-30 20:39:28 +11:00
Oliver
7b43e3e585
Refactor sales order page
2021-11-30 20:33:41 +11:00
Oliver
bce69b7733
Removes ship_order function
2021-11-30 00:45:40 +11:00
Oliver
6963503d02
Delete old SalesOrderShip view
2021-11-30 00:44:42 +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
c6b11b5e38
New logic for completing a SalesOrderShipment
2021-11-29 23:11:21 +11:00
Oliver
da6c723184
Merge branch 'master' into partial-shipment
...
# Conflicts:
# InvenTree/order/serializers.py
2021-11-29 22:59:36 +11:00
Oliver
32be39774f
PEP fixes
2021-11-28 22:36:47 +11:00
Oliver
4ee55847f1
Refactor attachment tables
2021-11-28 14:21:20 +11:00
Oliver
0949bac175
serializer fixes
2021-11-28 14:21:09 +11:00
Oliver
6582fd3d04
Add 'link' field to attachment serializer
2021-11-28 12:57:37 +11:00
Oliver
e9ed7bffc9
adds a "link" field to the InvenTree attachment model
...
- Allows attachments to also serve as links to external files
2021-11-28 12:53:01 +11:00
Oliver
0b997dc784
Display both 'allocated' and 'fulfilled' quantity values in salesorder table
2021-11-26 23:30:34 +11:00
Oliver
8aed68a1d1
Adds "shipped" field to SalesOrderLineItem
...
- This is an internal tracker of quantity of items shipped
- Updated by the database logic (not by the user)
- Keeps track of how many items have been shipped against a lineitem
- Does not matter if the actual stock items are later removed from the database
2021-11-26 23:20:27 +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
64d2674c04
Add action menu (hide for now)
2021-11-26 20:38:37 +11:00
Oliver
136fc67675
Adds data toolbar
2021-11-26 11:25:11 +11:00
Oliver
d3b9adc87a
Separate "completed shipments" onto its own tab
2021-11-26 10:50:43 +11:00
Oliver
68e2b0850b
Merge branch 'master' into partial-shipment
...
# Conflicts:
# InvenTree/build/serializers.py
# InvenTree/order/templates/order/so_sidebar.html
2021-11-26 08:25:51 +11:00
Oliver
e53e3b4a51
Merge pull request #2350 from matmair/matmair/issue2347
...
Fix sidebar translation
2021-11-23 12:57:11 +11:00
Matthias
d884e62be1
[FR] Confirm to W293
...
Fixes #2335
2021-11-23 00:28:23 +01:00
Matthias
d79e9a62b4
fix trans tags
2021-11-22 23:42:29 +01:00
Matthias
933c420844
fix sidebar translation
...
Fixes #2347
2021-11-22 20:24:22 +01:00
Oliver
521ec4f1e6
Merge branch 'master' into partial-shipment
...
# Conflicts:
# InvenTree/order/serializers.py
2021-11-18 23:43:36 +11:00
Oliver
7ca36a092e
convert remaining serializers
2021-11-18 23:01:19 +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
