2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-05-04 14:28:48 +00:00

516 Commits

Author SHA1 Message Date
Oliver Walters
0b8a50cd92 Add 'location_detail' filter 2021-06-18 16:51:34 +10:00
Oliver Walters
caf52c6ce5 Add optional detail elements to SOAllocation API 2021-06-18 16:49:56 +10:00
Oliver Walters
ad8dbb5900 Add API LIST endpoint for SalesOrderAllocations 2021-06-18 16:48:32 +10:00
f0dd543ffa render price in oer-modal if enabled in settings 2021-06-17 23:44:22 +02:00
a3a623a5ca update-button for modal, repeat 1st step on use 2021-06-17 23:24:32 +02:00
2d8b96a6b8 setting to control visibility of price 2021-06-17 23:15:42 +02:00
Matthias Mair
e77e89b16c
Merge branch 'inventree:master' into part-import 2021-06-17 16:42:49 +02:00
Oliver
93e83d0bf9
Merge pull request #1587 from nwns/feature/see_default_location
feat(purchase orders): show the preferred location for each PO Line
2021-06-17 17:01:05 +10:00
af2cfe55be missed a translation there 2021-06-17 00:51:53 +02:00
ddd84dcd7c Merge branch 'master' of https://github.com/inventree/InvenTree into so-total 2021-06-17 00:50:39 +02:00
bbe7edbf82 totals like in #1666 2021-06-17 00:50:10 +02:00
5d3360e63b added quantity total 2021-06-17 00:23:08 +02:00
dac112d908 added footer total for price 2021-06-17 00:22:32 +02:00
2fc185bd71 show footer 2021-06-16 23:57:33 +02:00
70e0933336 total price column as per #1660 2021-06-16 23:52:00 +02:00
Nigel
f8e4a5ac2e
test: improve coverage of new get_destination 2021-06-09 11:04:42 -06:00
Nigel
cd07ea835d
feat(purchase orders): show the preferred location for each PO Line
Adds the ability for the Purchaser to specify where the item is
intentended to go when received.  If the Purchaser does not set a
preferred location, then the default location for the part is displayed.
If the item is received them where it was actually placed is shown.

NOTE: if an item is split when received only one of the resulting
StockItem location is used.

Fixes #1467
Addresses some of the requests in #551
2021-06-09 09:06:03 -06:00
5a869d247f Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-06 17:46:33 +02:00
Oliver
573f601752
Merge pull request #1632 from matmair/nav-style
same nav sidebar distance for everything
2021-06-06 22:14:20 +10:00
05d79a4c19 same nav sidebar distance for everything 2021-06-05 15:18:08 +02:00
d87592aedb use the default currency in forms 2021-06-05 13:22:11 +02:00
eeintech
74bd975a0b Revert back to form_list
Moved OrderMatchItemForm to forms.py
2021-06-04 13:41:07 -04:00
fc9e1e6770 suggested changes @eeintech 2021-06-03 00:17:29 +02:00
495babe712 Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-02 00:36:15 +02:00
Matthias Mair
859a3178a4
Merge branch 'master' into part-import 2021-05-26 13:08:58 +02:00
1da1753b23 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-05-23 02:31:07 +02:00
3c5bb048a1 renaming a few parts 2021-05-22 15:39:54 +02:00
Oliver Walters
7cd345aeb5 Change location of 'banner' messages
- Place them inside the main panel
- Generally underneath the thumbnail
2021-05-18 19:19:43 +10:00
dd56bc1fa5 setup not realy needed 2021-05-18 11:18:13 +02:00
616dd76f8a refactor and doc 2021-05-18 11:10:01 +02:00
64f8846e99 generalising for done() 2021-05-18 10:47:56 +02:00
ad4902ea44 restucture 2021-05-18 10:19:35 +02:00
cb0ef30eff form overrides 2021-05-18 10:17:19 +02:00
92f8bd36f1 inherited setup method 2021-05-18 01:55:47 +02:00
46723f42ca Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-05-18 00:57:10 +02:00
3a5b4ab74b crispy forms for FileManagementFormView 2021-05-16 16:00:02 +02:00
Oliver
980befe0fa
Merge pull request #1586 from nwns/feature/show_poline_items_in_admin
feat(admin): Show the line items on the PO on the Admin Site
2021-05-15 07:50:53 +10:00
Oliver
6f10195f8c
Merge pull request #1465 from nwns/feature/po_on_sales_order
Show PO for Stock Items on Sales Order Detail and stock
2021-05-15 07:49:59 +10:00
Nigel
30a2194fe1
feat(admin): Show the line items on the PO on the Admin Site 2021-05-14 13:24:13 -06:00
be92efe7b9 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-05-13 22:58:01 +02:00
Nigel
bca2f4a07b
feat(sales_order): Stock Items show the PO number
Stock items show the PO number that they were purchased on when being
viewed in the sales order allocation modal and when viewing the sales
order details.
2021-05-13 14:18:25 -06:00
eeintech
22249206d2 Fixed duplicate check 2021-05-13 16:06:57 -04:00
Matthias Mair
b1410c7c2b Merge branch 'inventree:master' into price-history 2021-05-12 23:39:57 +02:00
f9f191b5e3 Inclusion in all tamplates
#1574
2021-05-12 15:31:35 +02:00
Oliver
9d98ecca92
Merge pull request #1561 from eeintech/multi_part_forms
Multi-step form framework + Purchase order upload file view
2021-05-12 22:18:35 +10:00
eeintech
e9c4ce8c5f Added support for reference and notes fields 2021-05-11 17:11:09 -04:00
eeintech
a093118856 Few more fixes 2021-05-11 11:02:54 -04:00
eeintech
10eb69caf9 Merge branch 'master' of github.com:inventree/InvenTree into multi_part_forms 2021-05-11 10:22:34 -04:00
Oliver Walters
84bfffd5a7 Override 'add_note' when new StockItem is created
- This allows us to prevent the issue of duplicate notes being created
2021-05-11 22:51:29 +10:00
Oliver Walters
93e6eb6dc7 Unit test fixes 2021-05-11 22:26:03 +10:00