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
3c3dd9368d Do not auto-complete salesorder when shipment is done 
- User might want to add more line items?
 2021-12-03 00:45:44 +11:00
Oliver
732034d9e5 Merge conflicting migrations 2021-12-03 00:43:10 +11:00
Oliver
80b615bfb7 Import fix 2021-12-03 00:08:05 +11:00
Oliver
93173ef1ee Merge remote-tracking branch 'inventree/master' into partial-shipment 
# Conflicts:
#	InvenTree/order/serializers.py
 2021-12-02 23:58:52 +11:00
Oliver
ecf70b6d4d Some PEP fixes 2021-12-02 23:58:02 +11:00
Oliver
e1668c8662 More stuffs: 
- Allow filtering of salesorderlineitem by "completed" status
- Allow deletion of (empty) shipment
- Show which items are going to be shipped
 2021-12-02 23:52:53 +11:00
Oliver
e74e7138a9 More stuff: 
- Pass tracking number through when completing a shipment
- Reload tables automatically when certain actions are performed
- Limit stock items to only those with available stock
 2021-12-02 21:59:59 +11:00
Oliver
d5ace1a8da Differentiate between "fully allocated" and "partially allocated" in stock item table 2021-12-02 21:46:05 +11:00
Oliver
6ec0cfc641 Merge branch 'master' into partial-shipment 
# Conflicts:
#	InvenTree/company/templates/company/company_base.html
#	InvenTree/stock/templates/stock/item_base.html
 2021-12-02 20:49:13 +11:00
Matthias
c2a6a8a30c
PEP fix 2021-12-02 10:01:20 +01:00
Matthias
970cec590b
only values starting with int possible -> only positive values 2021-12-02 09:06:58 +01:00
Matthias
c4f1a81c9c
fix permissions for test 2021-12-02 01:18:45 +01:00
Matthias
fc6f1b4acc
unittests to show the fix works 2021-12-01 23:45:16 +01:00
Matthias
dc65634abc
use mixin on all serializers whos models use ReferenceIndexingMixin 2021-12-01 23:36:21 +01:00
Matthias
3b5e9d3283
use BigIntegerField for a hugher range ;-) 2021-12-01 22:39:53 +01:00
Oliver
fd02197851 Refactor purchase order page 2021-11-30 20:39:28 +11:00
Oliver
7b43e3e585 Refactor sales order page 2021-11-30 20:33:41 +11:00
Oliver
bce69b7733 Removes ship_order function 2021-11-30 00:45:40 +11:00
Oliver
6963503d02 Delete old SalesOrderShip view 2021-11-30 00:44:42 +11:00
Oliver
3f9b280e17 Allow shipment numbers to be non-unique for different sales orders 
- must be unique for a given sales order
 2021-11-30 00:42:30 +11:00
Oliver
f3f3030b37 Adds API endpoint to "ship" a sales order shipment 2021-11-30 00:02:03 +11:00
Oliver
c6b11b5e38 New logic for completing a SalesOrderShipment 2021-11-29 23:11:21 +11:00
Oliver
da6c723184 Merge branch 'master' into partial-shipment 
# Conflicts:
#	InvenTree/order/serializers.py
 2021-11-29 22:59:36 +11:00
Oliver
32be39774f PEP fixes 2021-11-28 22:36:47 +11:00
Oliver
4ee55847f1 Refactor attachment tables 2021-11-28 14:21:20 +11:00
Oliver
0949bac175 serializer fixes 2021-11-28 14:21:09 +11:00
Oliver
6582fd3d04 Add 'link' field to attachment serializer 2021-11-28 12:57:37 +11:00
Oliver
e9ed7bffc9 adds a "link" field to the InvenTree attachment model 
- Allows attachments to also serve as links to external files
 2021-11-28 12:53:01 +11:00
Oliver
0b997dc784 Display both 'allocated' and 'fulfilled' quantity values in salesorder table 2021-11-26 23:30:34 +11:00
Oliver
8aed68a1d1 Adds "shipped" field to SalesOrderLineItem 
- This is an internal tracker of quantity of items shipped
- Updated by the database logic (not by the user)
- Keeps track of how many items have been shipped against a lineitem
- Does not matter if the actual stock items are later removed from the database
 2021-11-26 23:20:27 +11:00
Oliver
c943b320e6 shipment table tweaks 2021-11-26 23:02:29 +11:00
Oliver
d5e7489623 Table filters 2021-11-26 22:31:25 +11:00
Oliver
ac645b1fc7 Adds "responsible" row to purchase order table 2021-11-26 22:05:27 +11:00
Oliver
64d2674c04 Add action menu (hide for now) 2021-11-26 20:38:37 +11:00
Oliver
136fc67675 Adds data toolbar 2021-11-26 11:25:11 +11:00
Oliver
d3b9adc87a Separate "completed shipments" onto its own tab 2021-11-26 10:50:43 +11:00
Oliver
68e2b0850b Merge branch 'master' into partial-shipment 
# Conflicts:
#	InvenTree/build/serializers.py
#	InvenTree/order/templates/order/so_sidebar.html
 2021-11-26 08:25:51 +11:00
Oliver
e53e3b4a51
Merge pull request #2350 from matmair/matmair/issue2347 
Fix sidebar translation
 2021-11-23 12:57:11 +11:00
Matthias
d884e62be1
[FR] Confirm to W293 
Fixes #2335
 2021-11-23 00:28:23 +01:00
Matthias
d79e9a62b4
fix trans tags 2021-11-22 23:42:29 +01:00
Matthias
933c420844
fix sidebar translation 
Fixes #2347
 2021-11-22 20:24:22 +01:00
Oliver
521ec4f1e6 Merge branch 'master' into partial-shipment 
# Conflicts:
#	InvenTree/order/serializers.py
 2021-11-18 23:43:36 +11:00
Oliver
7ca36a092e convert remaining serializers 2021-11-18 23:01:19 +11:00
Oliver
d5cf2b08ac Merge remote-tracking branch 'inventree/master' into partial-shipment 
# Conflicts:
#	InvenTree/InvenTree/version.py
#	InvenTree/order/models.py
 2021-11-11 12:35:59 +11:00
Matthias
bae28e8207
Add setting for enabeling reports 
Fixes #2278
 2021-11-10 23:54:54 +01:00
Oliver
30684685f9 Add unit test to check an "empty" (null) barcode can be supplied 2021-11-09 12:07:57 +11:00
Oliver
b2ae346343 Provide model-level default function option 2021-11-08 13:30:59 +11:00
Oliver
1743111613 Check if customer exists when rendering sales order template 
Fixes https://github.com/inventree/InvenTree/issues/1742
 2021-11-05 11:03:38 +11:00
Oliver
ecccae1081 Merge remote-tracking branch 'inventree/master' into stock-item-forms 2021-11-03 13:34:45 +11:00
Oliver
b1c23e30f5 Fix CSS for user badges 2021-11-03 11:59:20 +11:00
Oliver
aaf27d4098 Adds new buttons to create a new stock item 2021-11-03 07:27:58 +11:00
Oliver
360f0406b5 CSS updates 
- Add template for filter lists
- Filter lists now layout horizontally
- Change flex-row to flex-wrap
 2021-11-01 08:38:24 +11:00
Oliver
a151a68e58 convert sale_price to string before exporting 2021-10-31 00:05:20 +11:00
Oliver
361f4498df Fix broken tables removed by conflict 2021-10-30 23:51:59 +11:00
Oliver
eaa315e726 Merge branch 'master' into partial-shipment 
# Conflicts:
#	InvenTree/build/templates/build/build_base.html
#	InvenTree/order/templates/order/order_base.html
#	InvenTree/order/templates/order/sales_order_base.html
#	InvenTree/order/templates/order/sales_order_detail.html
#	InvenTree/order/templates/order/so_navbar.html
 2021-10-30 23:44:06 +11:00
Oliver
3849ea8057 Rearranging buttons 2021-10-29 23:20:09 +11:00
Oliver
c04118ed8a Driving the refactor tractor around the farm 2021-10-29 22:20:06 +11:00
Oliver
b41d1aed12 Refactor admin button for: 
- build order
- part detail
- stock item
- stock location
- company detail
- manufacturer-part
- purchase order
- sales order
 2021-10-29 17:07:35 +11:00
Oliver
80a41affc1 More sidebar action 2021-10-29 01:20:24 +11:00
Oliver
1b5428718e Refactored sidebar for "purchase order" 2021-10-29 01:11:00 +11:00
Oliver
00a0311c63 Refactor sidebar for "sales order" page 2021-10-29 01:08:18 +11:00
Oliver
2778ff55da Remove btn-default 2021-10-28 19:57:17 +11:00
Oliver
f8ac016d60 replace labels with badges 2021-10-28 17:41:40 +11:00
Oliver
ae2c3e8293 remove "panel-inventree" references 2021-10-28 08:31:36 +11:00
Oliver
711b3ba923 remove "panel-default" 2021-10-27 23:08:15 +11:00
Oliver
53c579c992 Refactor PO and SO pages 2021-10-27 23:03:08 +11:00
Oliver
a004f293ff Replace all instances of data-toggle with data-bs-toggle 2021-10-27 22:06:30 +11:00
Oliver
82271cfcb7 Add breadcrumbs to purchase order and sales order pages 
(cherry picked from commit dd5eeb7c61)
 2021-10-27 20:18:09 +11:00
Oliver
75845ce1ca Merge branch 'master' into partial-shipment 2021-10-27 01:05:55 +11:00
Oliver
2eb93b5a49 Add functionality to create a new sales order shipment 
- From the "New Shipment" button
- As a secondary modal from the stock allocation dialgo
 2021-10-27 00:57:47 +11:00
Oliver
7252b299f7 Add modal API form to allocate stock items against a SalesOrder 
- Added model renderer for SalesOrderShipment
- Some refactorin'
 2021-10-27 00:41:12 +11:00
Oliver
bff9f0828a Adds API endpoint to allocate stock items against a SalesOrder 
- SalesOrderAllocations are no longer created manually
- API endpoint performs data validation
- Multiple line items can be allocated at once
- Adds unit testing for new API endpoint
 2021-10-26 23:51:36 +11:00
Oliver
dd5eeb7c61 Add breadcrumbs to purchase order and sales order pages 2021-10-26 22:46:30 +11:00
Oliver
c90c224ed2 Update "reference" field for shipment model 
- Must be unique
- Auto-incrementing default value
- Updated migrations
 2021-10-26 22:13:55 +11:00
Oliver
2d910022ac Fix for supplier price breaks 
- Make "price" field an InvenTreeMoneySerializer instance
- Add client-side validation for number inputs
 2021-10-26 01:55:41 +11:00
Oliver
e7c25126a4 Construct table of "shipments" 2021-10-26 00:17:17 +11:00
Oliver
e9e4d13541 Add list and detail API endpoints for SalesOrderShipment 
- Filter by order
- Filter by "shipped" status
- SalesOrderShipment serializer includes information on items allocated to that shipment
 2021-10-25 23:34:58 +11:00
Oliver
9fcc55d71d Admin page for new model 2021-10-25 22:50:10 +11:00
Oliver
d31f2be955 Make "shipment" field required for a SalesOrderAllocation 
- Deleting a "Shipment" will delete any "Allocation" objects which reference it
- Improve existing data migration for new shipment model
 2021-10-25 22:47:41 +11:00
Oliver
ce5b47460a Added data migration for existing SalesOrder instances 
- If a SalesOrder is "PENDING" or there are allocations available, a shipment is created
 2021-10-25 22:35:27 +11:00
Oliver
2f7e0974b7 Add 'shipment' foreign-key field to SalesOrderAllocation model 2021-10-25 17:42:56 +11:00
Oliver
f00ec26efd Create SalesOrderShipment model 2021-10-25 13:09:06 +11:00
Oliver
5f6e67086f Add "reload" button for salesorderlineitem table 2021-10-24 19:35:23 +11:00
Oliver
6ebb956c8d Fix generation of API documentation 
- Can't use get_object_or_404 in API views!
 2021-10-17 22:32:03 +11:00
Oliver
a97a918860 cut out the fat 
(removing dead code for outdated form views)
 2021-10-17 21:46:33 +11:00
Oliver
ccaa7d2683 Merge branch 'master' into build-output-complete 2021-10-16 13:18:35 +11:00
Oliver
b60296e494 Add some more unit tests 2021-10-16 13:16:19 +11:00
Oliver
bf47b57c82 working on updating build output tables 2021-10-14 23:46:21 +11:00
Oliver
be6f417dff Random button cleanup 2021-10-14 23:13:12 +11:00
Oliver
54dd05a24d Add an API serializer to complete build outputs 2021-10-14 23:13:01 +11:00
Oliver
2c9bbb051a Add some unit tests 
- Saving a model automatically updates the reference_int field
- Data migrations are correctly applied
 2021-10-14 19:12:23 +11:00
Oliver
d0f60766e0 exclude new field from admin view 2021-10-14 18:57:02 +11:00
Oliver
d3d1d2f577 Auto-rebuild the reference field for the SalesOrder on save 2021-10-14 18:00:17 +11:00
Oliver
068b54f666 Data migration for PurchaseOrder and SalesOrder models 2021-10-14 17:58:09 +11:00
Oliver
7ce0f817aa Add a 'reference_int' field to the models, to be used as a secondary index 2021-10-14 17:45:43 +11:00
Oliver
e46875b0a3 Apply same fix to PurchaseOrder and SalesOrder lists 2021-10-14 14:31:25 +11:00
Oliver
64cf916c50 Add a form to select export format 2021-10-07 13:33:10 +11:00
Oliver
d391c5059b Adds button to sales order page to export to file 2021-10-07 13:21:30 +11:00
Oliver
996ccbe5bd Adds view for exporting sales order 2021-10-07 13:16:25 +11:00
Oliver
535d45bce4 Remove outdated Views / Forms 2021-10-06 20:19:29 +11:00
Oliver
336b05aa4e Exclude sales order allocations when searching stock 2021-10-06 17:42:00 +11:00
Oliver
4d13674452 Migrate views to use the API forms architecture: 
- SalesOrderAllocationEdit
- SalesOrderAllocationDelete
 2021-10-06 17:16:01 +11:00
Oliver
b8b4c60c43 Fix API endpoints for so-allocation detail 2021-10-06 17:02:03 +11:00
Oliver
0b7811b7e0 Add API endpoint for SalesOrderAllocation model 
- Increment API version number
 2021-10-06 16:54:40 +11:00
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
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
Matthias
46723f42ca Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-05-18 00:57:10 +02:00
Matthias
3a5b4ab74b crispy forms for FileManagementFormView 2021-05-16 16:00:02 +02: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