2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-05-06 07:18:48 +00:00

639 Commits

Author SHA1 Message Date
Oliver
170ed37d03 Delete CompanyCreate AJAX view 2021-06-29 21:20:53 +10:00
Oliver
67f76c8bca Merge remote-tracking branch 'inventree/master' into drf-api-forms 2021-06-27 09:26:23 +10:00
Matthias Mair
e760aa172a
Merge branch 'master' into part-import 2021-06-26 23:58:41 +02:00
Oliver
c5df91efce PEP Fix 2021-06-25 00:38:28 +10:00
Oliver
04374c71c2 Annotate models with their API list view
- It will make sense, trust me
2021-06-25 00:17:58 +10:00
Oliver
962badc36d
Merge pull request #1682 from matmair/order-modal-show-price
Order modal show price
2021-06-22 21:27:59 +10:00
Oliver
1456868d03 Add default values for line item serializers
- Once https://github.com/inventree/InvenTree/issues/1687 is fixed, remove default values
2021-06-22 17:03:21 +10:00
Oliver
4fe6562d29 PEP fixes 2021-06-22 16:43:49 +10:00
Oliver
26dd9c10a4 Fixes for SalesOrder API 2021-06-22 16:43:38 +10:00
Oliver
3fa3ce06a1 Fixes for PurchaseOrder API interface
- Allow DELETE endpoint for PurchaseOrder
- Remove 'read_only' attribute for 'reference' field
- Add extra functionality to API test class
- Add unit testing
2021-06-22 16:28:42 +10:00
Oliver
650d31ae32 Remove debug statements 2021-06-22 10:43:00 +10:00
b503c62464 Merge branch 'master' of https://github.com/inventree/InvenTree into order-modal-show-price 2021-06-22 00:27:56 +02:00
Oliver
e6598b5115 Displays "purchase order" column in StockItem table 2021-06-21 16:58:39 +10:00
b4412ef575 also show prices of the value 0 2021-06-20 13:32:52 +02:00
452d2004ce added handling for no supplier price 2021-06-19 23:46:31 +02:00
7d5aa8189d Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-18 23:30:54 +02:00
b86793703e Merge branch 'part-import' of https://github.com/matmair/InvenTree into part-import 2021-06-18 23:14:48 +02:00
59e6cc1a10 Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-18 23:10:59 +02:00
15804f873b Merge branch 'master' of https://github.com/inventree/InvenTree into order-modal-show-price 2021-06-18 16:46:11 +02:00
Oliver
e68a4abdf2 Error: wrong error 2021-06-18 19:51:54 +10:00
Oliver
3fb57abe66 Error catching 2021-06-18 19:39:06 +10:00
Oliver
34c34487b5 PEP style fix 2021-06-18 19:21:46 +10:00
Oliver
10ecddf9b4 Fixes after rebase 2021-06-18 17:25:24 +10:00
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