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
13,850 Commits 6 Branches 99 Tags 484 MiB
8cd782dc8f
Commit Graph

949 Commits

Author SHA1 Message Date
Oliver
3c02b95f85
Shipment date edit (#3050) 
* Allow user to select shipment date when shipping a salesorder

- Defaults to 'today'

* Retain the tracking number information through the from

* JS linting

* Add unit testing for the SalesOrderShipmentComplete serializer / API endpoint
 2022-05-23 13:57:40 +10:00
Maksim Stojkovic
0ec067da40
[Feature] Shipment Creation in Stock Allocation Modal (#3024) 
* Added order reference to line item options

* Basic working version implemented

* Re-execute fields function in secondary modals

* Added missing argument and parameter

* Added missing parentheses

* Fixed hidden field name for depth > 0
 2022-05-22 09:34:38 +10:00
Matthias Mair
5805685c48 Merge branch 'master' of https://github.com/inventree/InvenTree into style-fixes 2022-05-21 23:57:41 +02:00
Oliver
624a6ebb6c
Merge pull request #3043 from maksimstojkovic/fr-2986-shipment-page-action 
Complete Allocated Pending Orders from SO Page Actions Menu
 2022-05-21 23:45:29 +10:00
Matthias Mair
e1ff4b6e87 more class use 2022-05-20 23:01:20 +02:00
Matthias Mair
e1d22f538d resort imports 2022-05-20 17:24:51 +02:00
Maksim Stojkovic
c38862b28c Added page action to process pending shipments 2022-05-21 01:05:54 +10:00
Matthias Mair
74726f0fda fix endline 2022-05-20 13:35:07 +02:00
Matthias Mair
93b6934127 fix trailing 2022-05-20 13:20:55 +02:00
Maksim Stojkovic
af0901d06c Changed complete shipments button to always show 2022-05-20 19:30:19 +10:00
Maksim Stojkovic
b48f8fba2b
Merge branch 'inventree:master' into fr-2986-shipment-page-action 2022-05-20 16:02:45 +10:00
Maksim Stojkovic
239138a1b5 Added page actions menu item 2022-05-20 15:01:45 +10:00
Oliver
0c02e57b58
Merge pull request #3028 from maksimstojkovic/automatic-shipment-creation 
[Feature] Create a default shipment when creating SO
 2022-05-19 13:48:33 +10:00
Oliver
2ddaa9c04a
Merge pull request #3020 from SchrodingersGat/download-unit-tests 
Download unit tests
 2022-05-19 13:34:41 +10:00
Maksim Stojkovic
140006a4cd
Fix PEP styles 2022-05-19 12:19:55 +10:00
Maksim Stojkovic
4dc997c4ae Added unit test 2022-05-19 02:06:43 +10:00
Oliver Walters
0831b85e29 Adding some unit tests for SalesOrderLineItem API 2022-05-19 01:39:16 +10:00
Maksim Stojkovic
276075ce05 PEP styling 2022-05-19 00:33:03 +10:00
Maksim Stojkovic
2cf67ea0c9 Create default shipment in backend 2022-05-19 00:10:55 +10:00
Oliver Walters
b6c2ade940 Add unit test for downloading Part data 2022-05-18 07:52:29 +10:00
Oliver Walters
1c6d79451e Don't decode downloaded .xls file 2022-05-18 07:25:43 +10:00
Oliver Walters
c5b14944a1 Unit tests for downloading BuildOrder data 2022-05-18 00:31:43 +10:00
Oliver Walters
0d078768fe Unit tests for downloading PurchaseOrder data 2022-05-18 00:08:11 +10:00
Oliver Walters
a6be0b32c6 Add unit tests for exporting SalesOrder data 2022-05-17 23:48:58 +10:00
Oliver Walters
f4b470c396 Merge remote-tracking branch 'inventree/master' into shipment-assign-fix 2022-05-17 18:48:57 +10:00
Oliver
9bcbaaa5f5 Remove more python2 stuff 2022-05-17 16:57:31 +10:00
Oliver
c51f052f25
Merge pull request #3011 from matmair/matmair/issue2996 
Remove python 2 code
 2022-05-17 00:51:31 +10:00
Oliver Walters
27930cd897 PEP style fixes 2022-05-17 00:41:03 +10:00
Oliver Walters
3373bb19f1 Remove unique_together requirement on SalesOrderAllocation model 2022-05-17 00:36:30 +10:00
Oliver Walters
6512c0061e Catch a 500 and make it a 400 
While we are at it, convert __all__ to non_field_errors automatically
 2022-05-17 00:35:24 +10:00
Oliver
042cb021de
Merge pull request #2957 from SchrodingersGat/locate-mixin 
Adds plugin mixin to "locate" items
 2022-05-16 22:57:20 +10:00
Oliver Walters
bd17458f37 Add metadata endpoints for SalesOrder and PurchaseOrder models 2022-05-16 21:40:10 +10:00
Oliver Walters
5582c8ba43 Add metadata endpoints for SalesOrder and PurchaseOrder models 2022-05-16 21:29:49 +10:00
Oliver Walters
21ebf562fd Adds metadata fields to PurchaseOrder and SalesOrder models 2022-05-16 21:21:32 +10:00
Matthias
ecccfbd546
Remove encoding header 
Fixes #2996
 2022-05-15 20:33:00 +02:00
Matthias
136d642703
Merge branch 'fix-boolean' of https://github.com/matmair/InvenTree into fix-boolean 2022-05-15 17:52:34 +02:00
Matthias
77aeecf23a
make operators simpler 2022-05-15 17:52:23 +02:00
Oliver
d0ddb47b1f Adds exporter and download button for sales orders 2022-05-12 11:44:05 +10:00
Oliver
1b1f7634b7 Adds exporter and download button for PurchaseOrder table 2022-05-12 11:41:25 +10:00
Oliver
465e69c254 Refactor exporters for: 
- Part
- PurchaseOrderLineItem
 2022-05-12 11:33:17 +10:00
Oliver Walters
06e79ee91b Move view mixin to plugin.views 2022-05-07 22:34:03 +10:00
Oliver Walters
60f799c90a Add plugin view support for most of the remaining views 2022-05-06 23:32:42 +10:00
Matthias Mair
a1016c746c
Merge branch 'inventree:master' into so_fix_clean 2022-05-05 11:27:44 +02:00
Oliver
1dee578907
Merge pull request #2931 from SchrodingersGat/more-api-functionality 
Converting more forms to the API
 2022-05-04 23:24:28 +10:00
Matthias
df9ca599a2
use full names consistently 2022-05-04 15:18:36 +02:00
Oliver Walters
1c0fba0fca Add unit test for SalesOrderCancel API endpoint 2022-05-04 21:51:09 +10:00
Oliver Walters
7a5be35f10 Add unit tests for new purchase order API endpoints: 
- PurchaseOrderCancel
- PurchaseOrderComplete
- PurchaseOrderIssue
 2022-05-04 21:44:38 +10:00
Matthias
19d3b03280
fix double endif 2022-05-04 13:10:49 +02:00
Matthias
00dffd953b
add messages if company was deleted 2022-05-04 12:39:12 +02:00
Matthias
1a3d482e42
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2788 2022-05-04 12:33:21 +02:00
Oliver Walters
88dbd5aa74 PEP fixes 2022-05-04 18:46:07 +10:00
Oliver Walters
104f9d4a70 Remove outdated unit tests 2022-05-04 18:39:33 +10:00
Oliver Walters
1cefdfc2e4 PEP style fixes 2022-05-04 17:31:44 +10:00
Oliver Walters
a510ca89f7 Refactor CancelSalesOrder form 2022-05-04 15:55:21 +10:00
Oliver Walters
bf48e3204b Refactor PurchaseOrderIssue form 2022-05-04 15:45:13 +10:00
Oliver Walters
5afc3bfce2 Replace PurchaseOrderComplete form 2022-05-04 15:33:50 +10:00
Oliver Walters
62cd0f39c7 Replace the existing CancelPurchaseOrderForm with an API driven form 2022-05-04 15:14:14 +10:00
Oliver Walters
c7980a347e Adds ability to add custom serializer context information to the OPTIONS endpoint 
- Will be useful for constructing prettier forms with information about the endpoint
 2022-05-04 15:06:02 +10:00
Oliver
b65a969433
Merge pull request #2928 from matmair/coverage-adaption 
Increase coverage
 2022-05-04 09:39:24 +10:00
Matthias
0900fe82dc
ignore coverage on reverse conversion 2022-05-03 20:11:41 +02:00
Oliver Walters
e7ddeb8173 PEP style fixes 2022-05-03 17:36:30 +10:00
Oliver Walters
96c5a8252c remove dead code 2022-05-03 17:33:03 +10:00
Oliver Walters
141b764b94 Modal fixes 2022-05-03 14:01:25 +10:00
Oliver Walters
8cd8581dbf fixes 2022-05-03 13:51:04 +10:00
Oliver Walters
1794f65d19 Button to submit each row individually 2022-05-03 13:44:28 +10:00
Matthias
87515b1b48
fix __str__ instance 2022-05-02 22:46:03 +02:00
Matthias
e7b189ba29
fix templates 2022-05-02 22:41:24 +02:00
Matthias
8f3899ffe6
move migrations 2022-05-02 22:10:50 +02:00
Matthias Mair
0c338cb2ae
Merge branch 'inventree:master' into matmair/issue2788 2022-05-02 21:50:57 +02:00
Oliver Walters
e87a02638e Merge remote-tracking branch 'inventree/master' into order-parts-wizard 
# Conflicts:
#	InvenTree/order/serializers.py
#	InvenTree/templates/js/translated/model_renderers.js
 2022-05-02 16:11:11 +10:00
Matthias
de6507e918
update translation commands 2022-05-01 22:03:49 +02:00
Matthias
67ab45bdee
update depreciated paths 2022-05-01 22:00:18 +02:00
Matthias
d05472b30c
upgrade to pyhton 3.9 syntax 
using pyupgrade
 2022-05-01 21:53:12 +02:00
Matthias
58901a8cf6
fix migrations 2022-05-01 00:15:02 +02:00
Matthias
0c72fa180c
fix model backtrack 2022-05-01 00:09:17 +02:00
Matthias
132f4aa82e
Use set_null instead 2022-05-01 00:07:13 +02:00
Matthias
4180336705
comment out not used variable 2022-04-28 00:51:35 +02:00
Matthias
87aeed9ab3
disable broken test 2022-04-28 00:46:59 +02:00
Matthias
6319beb14e
only print if models found 2022-04-28 00:42:28 +02:00
Matthias
f1ee206c53
fix typo 2022-04-28 00:37:55 +02:00
Oliver Walters
b8ca7fb092 Merge remote-tracking branch 'inventree/master' into order-parts-wizard 
# Conflicts:
#	InvenTree/templates/js/translated/model_renderers.js
 2022-04-26 21:22:31 +10:00
Matthias Mair
3e39f99ccb
Merge branch 'inventree:master' into matmair/issue2788 2022-04-19 18:24:15 +02:00
Matthias Mair
b3dca68c6b
Merge branch 'inventree:master' into matmair/issue2694 2022-04-19 18:24:12 +02:00
Oliver Walters
c7257a1bd3 build order 2022-04-10 20:03:40 +10:00
Oliver Walters
1c60d4e152 Refactor notes for "purchase order" 2022-04-10 19:55:32 +10:00
Oliver Walters
ed69f06620 Merge remote-tracking branch 'inventree/master' into order-parts-wizard 2022-04-07 18:54:00 +10:00
eeintech
ad366ef0bd Fix part and po files import 2022-04-06 16:45:23 -04:00
Matthias
66e14b6ad0
move helper function to models.py 2022-04-02 00:01:38 +02:00
Matthias
57f9ef75e9
enable all functions for deleted company 2022-04-01 23:55:08 +02:00
Matthias
1d24f3586d
PEP fix 2022-03-30 01:35:21 +02:00
Matthias
e7f940810a
PEP style fix 2022-03-30 01:32:41 +02:00
Matthias
48441ea48e
add docstring 2022-03-30 01:32:29 +02:00
Matthias
aa30e62ad8
[BUG] Deleting a Customer Breaks Associated Sales Orders 
Add special protected deleted company
Fixes #2788
 2022-03-30 01:29:36 +02:00
Matthias
05cc34f573
add test for so 2022-03-29 22:54:15 +02:00
Matthias
03328088a2
add missing migrations 2022-03-29 00:03:19 +02:00
Matthias
1387709281
remove coverage from reverse action 2022-03-29 00:01:34 +02:00
Matthias
4cde888be6
fix docstrings 2022-03-28 23:59:50 +02:00
Matthias
5dcb84ec0f
stop adding blank part entries 2022-03-28 23:59:28 +02:00
Matthias
2bbad1d387
add unit test for migration 2022-03-28 23:52:26 +02:00
Matthias
760dafcdb2
use sub-context for migrations 2022-03-27 23:18:20 +02:00