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
Matthias
bae28e8207
Add setting for enabeling reports
...
Fixes #2278
2021-11-10 23:54:54 +01:00
Oliver
30684685f9
Add unit test to check an "empty" (null) barcode can be supplied
2021-11-09 12:07:57 +11:00
Oliver
b2ae346343
Provide model-level default function option
2021-11-08 13:30:59 +11:00
Oliver
1743111613
Check if customer exists when rendering sales order template
...
Fixes https://github.com/inventree/InvenTree/issues/1742
2021-11-05 11:03:38 +11:00
Oliver
ecccae1081
Merge remote-tracking branch 'inventree/master' into stock-item-forms
2021-11-03 13:34:45 +11:00
Oliver
b1c23e30f5
Fix CSS for user badges
2021-11-03 11:59:20 +11:00
Oliver
aaf27d4098
Adds new buttons to create a new stock item
2021-11-03 07:27:58 +11:00
Oliver
360f0406b5
CSS updates
...
- Add template for filter lists
- Filter lists now layout horizontally
- Change flex-row to flex-wrap
2021-11-01 08:38:24 +11:00
Oliver
a151a68e58
convert sale_price to string before exporting
2021-10-31 00:05:20 +11:00
Oliver
361f4498df
Fix broken tables removed by conflict
2021-10-30 23:51:59 +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
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
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
2778ff55da
Remove btn-default
2021-10-28 19:57:17 +11:00
Oliver
f8ac016d60
replace labels with badges
2021-10-28 17:41:40 +11:00
Oliver
ae2c3e8293
remove "panel-inventree" references
2021-10-28 08:31:36 +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
a004f293ff
Replace all instances of data-toggle with data-bs-toggle
2021-10-27 22:06:30 +11:00
Oliver
82271cfcb7
Add breadcrumbs to purchase order and sales order pages
...
(cherry picked from commit dd5eeb7c61049b8991cb9388f7d55b82ff3ffe03)
2021-10-27 20:18:09 +11:00
Oliver
75845ce1ca
Merge branch 'master' into partial-shipment
2021-10-27 01:05:55 +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
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
