Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,926 Commits 6 Branches 99 Tags 484 MiB
ddcfc8996c
Commit Graph

582 Commits

Author SHA1 Message Date
Oliver
bb60eed897
Merge pull request #1811 from SchrodingersGat/spa 
Dynamically switch between navbar selections on pages
 2021-07-15 23:43:43 +10:00
Oliver
09d175f7cf Fix purchase order import form 2021-07-15 23:11:59 +10:00
Oliver
df89008116 Refactor allocation page(s) 
- Also perform null check on notes before displaying
 2021-07-15 16:53:14 +10:00
Oliver
2d2ad91545 Move "stock" part view 2021-07-15 12:52:36 +10:00
eeintech
3d9ad24e27 Defined custom SupplierPart object manager and prefetch related models in all queries 2021-07-13 12:55:36 -04:00
Oliver
b6227f7d28 Refactor PurchaseOrder display 2021-07-13 21:21:00 +10:00
Oliver
65de52b705 Add javascript to dynamically switch between views 2021-07-13 20:58:05 +10:00
Oliver
9889e314a9 Remove unused templates 2021-07-13 20:04:12 +10:00
Oliver
970f08260c Update navbar 2021-07-13 20:04:02 +10:00
Oliver
39c58e4015 Move all "SalesOrder" content onto a single page 2021-07-13 19:59:11 +10:00
Oliver
7539bd47fe Fix rendering issues 2021-07-09 12:10:27 +10:00
Oliver
6a995042c9 Fix bug relating no PurchaseOrderLineItem with null Part reference 2021-07-09 12:10:17 +10:00
Oliver
004b36b1df Refactor BuildOrderCreate form 2021-07-09 00:18:03 +10:00
Oliver
1deab0c040 Fix for SalesOrder attachment table 2021-07-08 10:48:08 +10:00
Oliver
939d5838fa Fixes for PurchaseOrder attachment table 2021-07-08 10:45:42 +10:00
eeintech
87a7081185 Fixed supplier part detail handling in stock table 2021-07-06 14:32:16 -04:00
Oliver
3cc9299b41 Refactor SOLineItemCreate view 2021-07-03 21:56:29 +10:00
Oliver
699b21f6fd Remove broken URL 2021-07-03 21:46:08 +10:00
Oliver
889834b693 Refactor POLineItemCreate form 2021-07-03 21:43:22 +10:00
Oliver
c524f754e9 Allow null values for purchase_price and sale_price 2021-07-03 21:27:03 +10:00
Oliver
25a80d2aa7 Fix form filters 2021-07-03 21:21:32 +10:00
Oliver
5c1fddd96d JS bug fix 2021-07-03 16:28:03 +10:00
Oliver
77c3aa5379 Use custom currency choices 2021-07-03 12:45:59 +10:00
Oliver
55f8fefe79 Remove old test 2021-07-03 12:33:28 +10:00
Oliver
8c3a4b60ab Refactoring forms for order line items 
- Required some fixes for money serializer
-
 2021-07-03 01:17:29 +10:00
Oliver
1cdf03ef49 Added MinMoneyValidator to InvenTreeModelMoneyField 
- Refactor edit and delete forms for PurchaseOrderLineItem
 2021-07-03 00:34:41 +10:00
Oliver
993abd9d91 Refactor forms for sales orders 2021-07-03 00:14:36 +10:00
Oliver
984828f3bb Specify 'default' functions for 'reference' field in SalesOrder and PurchaseOrder 
- Refactor CreatePurchaseOrder form
- Some migrations
 2021-07-02 23:59:02 +10:00
Oliver
7e5c9aa043 Refactor PurchaseOrderEdit form 2021-07-02 23:04:53 +10:00
Oliver
5e9372f2d6 Add API endpoints for Owner model 
- Will be necessary for PurchaseOrder, SalesOrder and BuildOrder forms
 2021-07-02 22:45:42 +10:00
Oliver
51ebe30754 Merge remote-tracking branch 'inventree/master' into drf-api-forms 
# Conflicts:
#	InvenTree/company/forms.py
 2021-07-02 11:26:09 +10:00
Matthias
3c6c9c59d6 added clean migration steps for all price fields 2021-07-01 07:11:15 +02:00
Oliver
59b794f0e5 Cleanup old forms 2021-07-01 14:25:14 +10:00
Matthias
ea8b102897 style fix 2021-07-01 00:50:50 +02:00
Matthias
fcdefc4f83 removing default_currency in fields 2021-07-01 00:40:26 +02:00
Matthias
3a57093b4e replace MoneyFields with inherited classes 2021-07-01 00:13:38 +02:00
Oliver
30ac5dba55 Display attachment upload date 2021-06-30 17:44:23 +10:00
Oliver
9b4db43232 Refactoring "attachment" tables to use the API 
- Part attachments
- StockItem attachments
- PurchaseOrder attachments
- SalesOrder attachments
- BuildOrder attachments
 2021-06-30 17:40:44 +10:00
Oliver
682b2b4b2f Support rendering / updating of date inputs 2021-06-30 17:04:21 +10:00
Oliver
4e23dbd0af Refactor delete views for SalesOrderAttachment and PurchaseOrderAttachment 2021-06-30 12:54:38 +10:00
Oliver
712c9598d1 Refactor SalesOrderAttachment forms 2021-06-30 10:09:05 +10:00
Oliver
60d599b476 Refactor PurchaseOrderAttachment views 2021-06-30 10:03:54 +10:00
Oliver
6156fffd1d Remove broken URLs 2021-06-29 21:25:20 +10:00
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
Matthias
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
Matthias
b4412ef575 also show prices of the value 0 2021-06-20 13:32:52 +02:00
Matthias
452d2004ce added handling for no supplier price 2021-06-19 23:46:31 +02:00
Matthias
7d5aa8189d Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-18 23:30:54 +02:00
Matthias
b86793703e Merge branch 'part-import' of https://github.com/matmair/InvenTree into part-import 2021-06-18 23:14:48 +02:00
Matthias
59e6cc1a10 Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-18 23:10:59 +02:00
Matthias
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
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
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
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
Matthias
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
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
eeintech
74bd975a0b Revert back to form_list 
Moved OrderMatchItemForm to forms.py
 2021-06-04 13:41:07 -04:00
Matthias
fc9e1e6770 suggested changes @eeintech 2021-06-03 00:17:29 +02:00
Matthias
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
Matthias
1da1753b23 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-05-23 02:31:07 +02:00
Matthias
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
Matthias
dd56bc1fa5 setup not realy needed 2021-05-18 11:18:13 +02:00
Matthias
616dd76f8a refactor and doc 2021-05-18 11:10:01 +02:00
Matthias
64f8846e99 generalising for done() 2021-05-18 10:47:56 +02:00
Matthias
ad4902ea44 restucture 2021-05-18 10:19:35 +02:00
Matthias
cb0ef30eff form overrides 2021-05-18 10:17:19 +02:00
Matthias
92f8bd36f1 inherited setup method 2021-05-18 01:55:47 +02:00