Matthias
f0dd543ffa
render price in oer-modal if enabled in settings
2021-06-17 23:44:22 +02:00
Matthias
a3a623a5ca
update-button for modal, repeat 1st step on use
2021-06-17 23:24:32 +02:00
Matthias
2d8b96a6b8
setting to control visibility of price
2021-06-17 23:15:42 +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
Matthias
af2cfe55be
missed a translation there
2021-06-17 00:51:53 +02:00
Matthias
ddd84dcd7c
Merge branch 'master' of https://github.com/inventree/InvenTree into so-total
2021-06-17 00:50:39 +02:00
Matthias
bbe7edbf82
totals like in #1666
2021-06-17 00:50:10 +02:00
Matthias
5d3360e63b
added quantity total
2021-06-17 00:23:08 +02:00
Matthias
dac112d908
added footer total for price
2021-06-17 00:22:32 +02:00
Matthias
2fc185bd71
show footer
2021-06-16 23:57:33 +02:00
Matthias
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
Oliver
573f601752
Merge pull request #1632 from matmair/nav-style
...
same nav sidebar distance for everything
2021-06-06 22:14:20 +10:00
Matthias
05d79a4c19
same nav sidebar distance for everything
2021-06-05 15:18:08 +02:00
Matthias
d87592aedb
use the default currency in forms
2021-06-05 13:22:11 +02:00
Matthias
1da1753b23
Merge branch 'master' of https://github.com/inventree/InvenTree into price-history
2021-05-23 02:31:07 +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
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
Matthias
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
Matthias
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
Matthias
4156b71c4b
Merge branch 'master' of https://github.com/inventree/InvenTree into price-history
2021-05-11 13:32:14 +02:00
Oliver Walters
0020e85397
Refactor add_tracking_entry
2021-05-11 20:56:20 +10:00
Oliver Walters
70ad0ba0de
Improve reporting in stock history API
2021-05-11 17:41:17 +10:00
Oliver Walters
af53b341f0
Replace "addTrasactionNote" function with "add_tracking_entry"
...
- Does not add translated strings to the database
2021-05-11 17:17:48 +10:00
eeintech
c9e77edf04
Almost there?
2021-05-10 17:31:29 -04:00
eeintech
6d8f94619b
Improved template render, raised bar for automatic field matching
2021-05-10 12:52:34 -04:00
eeintech
f0932040ee
Fixed form validation for previous step, hide tab depending on order status, added purchase_price field
2021-05-10 11:42:22 -04:00
Matthias
a210b331ce
just a small translation
2021-05-09 00:27:00 +02:00
Matthias
5622468209
better readable structure
2021-05-08 20:55:01 +02:00
Matthias
e6372fd600
added translations
2021-05-08 20:54:23 +02:00
Matthias Mair
e59f467c79
Merge branch 'master' into spaces!
2021-05-08 12:27:19 +02:00
eeintech
9b69980a6c
Oopsy forgot to merge PurchaseOrderUpload view
2021-05-07 18:08:11 -04:00
eeintech
88000200b3
Merged master and resolved conflicts
2021-05-07 18:02:40 -04:00
eeintech
ceccdf3909
Now creating PurchaseOrderLineItem instances!
2021-05-07 18:00:30 -04:00
eeintech
fbf24621f3
Getting there...
2021-05-07 16:46:10 -04:00
eeintech
6e269ae41a
Now displaying item match table
2021-05-07 13:23:10 -04:00
Oliver
e47a8d6d5e
Merge pull request #1545 from matmair/issue1425
...
adds sales order line item price
2021-05-07 23:54:45 +10:00
Matthias
63cf75eefc
styling again
2021-05-07 15:37:15 +02:00
