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
10,114 Commits 6 Branches 99 Tags 484 MiB
e53e3b4a51
Commit Graph

645 Commits

Author SHA1 Message Date
Oliver
4d8bec9663 Fix rendering of row sub tables 2021-10-06 16:38:13 +11:00
Oliver
4d2cf233b3 Move the "loadSalesOrderLineItemTable" code to order.js 2021-10-06 16:14:39 +11:00
Oliver
93c53315cc Unit test fixes 2021-10-05 17:35:10 +11:00
Oliver
dd760bfecd Add filtering by "completed" status for purchase order line items 2021-10-05 17:15:41 +11:00
Oliver
5e951ef64b Add 'filtering' for purchase order line item table 2021-10-05 16:57:33 +11:00
Oliver
87f1bd87e7 Add button to receive selected items 2021-10-05 16:52:24 +11:00
Oliver
8684b55582 PEP fixes 2021-10-05 16:39:18 +11:00
Oliver
05d8f2b216 Remove outdated unit test case 2021-10-05 16:35:11 +11:00
Oliver
1ea9b6f4cf PEP fixes 2021-10-05 16:10:00 +11:00
Oliver
dd4428464d Receiving items against a purchase order now makes use of the API forms 
- Delete old unused code
- Improve serializer validation
 2021-10-05 16:05:18 +11:00
Oliver
b75e817447 Construct bare-bones API form 2021-10-05 14:57:50 +11:00
Oliver
e39f1c320c Merge remote-tracking branch 'inventree/master' into auto-allocation-improvements 2021-10-05 12:53:47 +11:00
Oliver
99503a60d3 Fix for "barcode" field in purchase order receive serializer 
- Allow blank values!
 2021-10-05 12:16:41 +11:00
Oliver
ddcfc8996c Further fixes for API / serializer classes 
- Correctly catch and re-throw errors
- Provide request to serializer context
 2021-10-05 12:12:37 +11:00
Oliver
29588ff2c5 Refactor the POReceive API endpoint 
- Lessons learned from the build allocate
- Use serializer.save() directly
 2021-10-05 11:20:43 +11:00
Oliver
dd4db6442e PEP fixes 2021-10-05 00:45:49 +11:00
Oliver
5ded23fd99 Fixes for serializer validation 
- Note: use the validate() function!
- Ref: https://www.django-rest-framework.org/api-guide/serializers/
- override serializer.save() functionality for simpler operation
 2021-10-04 23:44:23 +11:00
Oliver
8c78d3b8ea Add unit test 2021-10-03 01:03:40 +10:00
Oliver
6d448d8475 Handle internal django errors when receiving purchase order items via the API 
(cherry picked from commit 9355c68024)
 2021-10-03 00:24:09 +10:00
Oliver
b9b23a3853 bug fix 2021-09-08 14:14:14 +10:00
Oliver
1a21576f28 Adds separate option for "prevent_new_stock" to stock_table 2021-09-08 12:57:42 +10:00
Oliver
8368798280 Move po-line-item-table into javascript file 
- for better linting
 2021-09-08 12:51:49 +10:00
Oliver Walters
f38bf6e20a Adds unit testing for barcode field 2021-09-07 23:34:14 +10:00
Oliver Walters
bf05c9cfae Adds "barcode" field to POLineItem receive serializer 2021-09-07 23:06:36 +10:00
Oliver Walters
125554c53f Merge remote-tracking branch 'upstream/master' into receive-via-api 
# Conflicts:
#	InvenTree/templates/js/dynamic/inventree.js
#	InvenTree/templates/js/translated/forms.js
#	InvenTree/templates/js/translated/tables.js
 2021-09-07 22:34:00 +10:00
Oliver
5d703af932 Add migration file 2021-09-02 11:11:25 +10:00
Oliver
43c4e936a7 Fix on_delete for PurchaseOrderLineItem.destination 
- Currently set to DO_NOTHING
- However when deleting a StockLocation which has a PurchaseOrderLineItem.destionation point to it, this will cause an IntegrityError
 2021-09-02 10:41:23 +10:00
Matthias
0ebc45e834
replace i html tags 2021-09-02 00:18:47 +02:00
Matthias
6a420fd95c
replace bold tags 2021-09-02 00:17:12 +02:00
Oliver
610c05384b
Merge pull request #2020 from SchrodingersGat/mpn-sorting-fix 
Mpn sorting fix
 2021-08-26 22:06:06 +10:00
Oliver
ac8a0be74a Enable sorting by total_price 2021-08-26 08:48:19 +10:00
Oliver
bad246bca6 Fixes for ordering of stock table 2021-08-26 08:24:31 +10:00
Oliver
212a7eeed1 Disable filtering for total_price (as this is not a database field!) 2021-08-26 07:59:47 +10:00
Oliver
8660f13ef5 Allow sorting by purchase price (unit price) 2021-08-26 07:50:19 +10:00
Oliver
51992a92c1 Change name of purchaseorder line item table 
- Was conflicting with purchaseorder table
- Saved column selections were being overridden
 2021-08-25 18:00:32 +10:00
Oliver
4b8ef2ad62 Implements custom filtering back end 2021-08-25 17:46:42 +10:00
Oliver
c9756d30bd Add a custom OrderingFilter class 
Needs further work
 2021-08-25 12:04:15 +10:00
Oliver
2923589c4a Fix sortName for purchase order line item table 2021-08-25 12:02:25 +10:00
Oliver Walters
f6b9d9e6d0 Revert "WIP" 
This reverts commit 42af52ee51.
 2021-08-24 22:33:29 +10:00
Oliver Walters
42af52ee51 WIP 2021-08-24 22:31:13 +10:00
Oliver Walters
0d7eb6b72c Style fixes 2021-08-24 22:25:25 +10:00
Oliver Walters
d5e58fd798 Fix for status code serializer 2021-08-24 22:03:52 +10:00
Oliver
86e3e26196 Merge remote-tracking branch 'inventree/master' into receive-via-api 2021-08-24 15:07:55 +10:00
Oliver
1b65fbad2c Update unit tests 
- Found some bugs too, thanks unit tests!
 2021-08-24 11:42:08 +10:00
Oliver
d30173132a Actually receive items 2021-08-24 08:49:23 +10:00
Oliver
2aa505b2cb Fix unit tests to match new API format 2021-08-24 08:18:59 +10:00
eeintech
35738ce026 Updated all 'add' buttons to 'btn-success' CSS class 2021-08-23 14:52:35 -04:00
eeintech
6f742319e5 Corrected color of 'new' orders UI button 2021-08-23 12:48:47 -04:00
Oliver
6091f2ba33 Serializer improvements 
- Pass the "order" down to the nested serializers for validation
 2021-08-24 00:29:38 +10:00
Oliver
dc53a433a7 Fix serializer nesting 
- Add new API endpoint to receive items
- Add unit testing
 2021-08-23 23:35:22 +10:00
Oliver
28cc241354 Custom DRF serializers for receiving line items against a purchase order 2021-08-23 23:13:07 +10:00
Oliver
6141ddc3eb SalesOrderAttachment and PurchaseOrderAttachment 2021-08-16 10:53:28 +10:00
eeintech
9205d6d67c Improved creation of purchase order line items from file upload 2021-08-12 14:27:00 -04:00
Oliver
7756c766c3 Fix stock.js 2021-07-29 12:35:21 +10:00
Oliver
4381a16b0e Template cleanup 2021-07-29 12:31:07 +10:00
eeintech
8ac3d42fd8 Improved handling of po items destination 2021-07-20 17:15:01 -04:00
eeintech
23db7a89a9 Updated PO upload template, moved call to button, improved cleaned_decimal method to handle comma separator 2021-07-19 14:20:54 -04:00
Oliver Walters
e17b92b126 Add 'destination' field to POLineItem API serializer 2021-07-18 21:25:59 +10:00
Oliver Walters
f4f7514b45 Similar fix for customer_reference field 2021-07-18 10:47:35 +10:00
Oliver Walters
9719a14587 Add supplier_reference field to form 2021-07-18 10:33:27 +10:00
Oliver
5ce6dd325d
Merge pull request #1824 from SchrodingersGat/po-currency 
Use default curreny code
 2021-07-16 13:54:41 +10:00
Oliver
733951883e Use default curreny code 2021-07-16 13:35:51 +10:00
Oliver
0fcb4e3170 Link fixes 2021-07-16 13:30:11 +10:00
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