mirror of
https://github.com/inventree/InvenTree.git
synced 2025-04-28 11:36:44 +00:00
* Adds ReturnOrder and ReturnOrderAttachment models * Adds new 'role' specific for return orders * Refactor total_price into a mixin - Required for PurchaseOrder and SalesOrder - May not be required for ReturnOrder (remains to be seen) * Adds API endpoints for ReturnOrder - Add list endpoint - Add detail endpoint - Adds required serializer models * Adds basic "index" page for Return Order model * Update API version * Update navbar text * Add db migration for new "role" * Add ContactList and ContactDetail API endpoints * Adds template and JS code for manipulation of contacts - Display a table - Create / edit / delete * Splits order.js into multiple files - Javascript files was becoming extremely large - Hard to debug and find code - Split into purchase_order / return_order / sales_order * Fix role name (change 'returns' to 'return_order') - Similar to existing roles for purchase_order and sales_order * Adds detail page for ReturnOrder * URL cleanup - Use <int:pk> instead of complex regex * More URL cleanup * Add "return orders" list to company detail page * Break JS status codes into new javascript file - Always difficult to track down where these are rendered - Enough to warrant their own file now * Add ability to edit return order from detail page * Database migrations - Add new ReturnOrder modeles - Add new 'contact' field to external orders * Adds "contact" to ReturnOrder - Implement check to ensure that the selected "contact" matches the selected "company" * Adjust filters to limit contact options * Fix typo * Expose 'contact' field for PurchaseOrder model * Render contact information * Add "contact" for SalesOrder * Adds setting to enable / disable return order functionality - Simply hides the navigation elements - API is not disabled * Support filtering ReturnOrder by 'status' - Refactors existing filter into the OrderFilter class * js linting * More JS linting * Adds ReturnOrderReport model * Add serializer for the ReturnOrderReport model - A little bit of refactoring along the way * Admin integration for new report model * Refactoring for report.api - Adds generic mixins for filtering queryset (based on updates to label.api) - Reduces repeated code a *lot* * Exposes API endpoints for ReturnOrderReport * Adds default example report file for ReturnOrder - Requires some more work :) * Refactor report printing javascript code - Replace all existing functions with 'printReports' * Improvements for default StockItem test report template - Fix bug in template - Handle potential errors in template tags - Add more helpers to report tags - Improve test result rendering * Reduce logging verbosity from weasyprint * Refactor javascript for label printing - Consolidate into a single function - Similar to refactor of report functions * Add report print button to return order page * Record user reference when creating via API * Refactor order serializers - Move common code into AbstractOrderSerializer class * Adds extra line item model for the return order - Adds serializer and API endpoints as appropriate * Render extra line table for return order - Refactor existing functions into a single generic function - Reduces repeated JS code a lot * Add ability to create a new extra line item * Adds button for creating a new lien item * JS linting * Update test * Typo fix (cherry picked from commit 28ac2be35bd0148c598629988d40b1a234f069a5) * Enable search for return order * Don't do pricing (yet) for returnorder extra line table - Fixes an uncaught error * Error catching for api.js * Updates for order models: - Add 'target_date' field to abstract Order model - Add IN_PROGRESS status code for return order - Refactor 'overdue' and 'outstanding' API queries - Refactor OVERDUE_FILTER on order models - Refactor is_overdue on order models - More table filters for return order model * JS cleanup * Create ReturnOrderLineItem model - New type of status label - Add TotalPriceMixin to ReturnOrder model * Adds an API serializer for the ReturnOrderLineItem model * Add API endpoints for ReturnOrderLineItem model - Including some refactoring along the way * javascript: refactor loadTableFilters function - Pass enforced query through to the filters - Call Object.assign() to construct a superset query - Removes a lot of code duplication * Refactor hard-coded URLS to use {% url %} lookup - Forces error if the URL is wrong - If we ever change the URL, will still work * Implement creation of new return order line items * Adds 'part_detail' annotation to ReturnOrderLineItem serializer - Required for rendering part information * javascript: refactor method for creating a group of buttons in a table * javascript: refactor common buttons with helper functions * Allow edit and delete of return order line items * Add form option to automatically reload a table on success - Pass table name to options.refreshTable * JS linting * Add common function for createExtraLineItem * Refactor loading of attachment tables - Setup drag-and-drop as part of core function * CI fixes * Refactoring out some more common API endpoint code * Update migrations * Fix permission typo * Refactor for unit testing code * Add unit tests for Contact model * Tests for returnorder list API * Annotate 'line_items' to ReturnOrder serializer * Driving the refactor tractor * More unit tests for the ReturnOrder API endpoints * Refactor "print orders" button for various order tables - Move into "setupFilterList" code (generic) * add generic 'label printing' button to table actions buttons * Refactor build output table * Refactoring icon generation for js * Refactoring for Part API * Fix database model type for 'received_date' * Add API endpoint to "issue" a ReturnOrder * Improvements for stock tracking table - Add new status codes - Add rendering for SalesOrder - Add rendering for ReturnOrder - Fix status badges * Adds functionality to receive line items against a return order * Add endpoints for completing and cancelling orders * Add option to allow / prevent editing of ReturnOrder after completed * js linting * Wrap "add extra line" button in setting check * Updates to order/admin.py * Remove inline admin for returnorderline model * Updates to pass CI * Serializer fix * order template fixes * Unit test fix * Fixes for ReturnOrder.receive_line_item * Unit testing for receiving line items against an RMA * Improve example report for return order * Extend unit tests for reporting * Cleanup here and there * Unit testing for order views * Clear "sales_order" field when returning against ReturnOrder * Add 'location' to deltas when returning from customer * Bug fix for unit test
50 lines
3.4 KiB
Python
50 lines
3.4 KiB
Python
# Generated by Django 3.2.18 on 2023-03-22 10:56
|
|
|
|
import InvenTree.fields
|
|
import django.core.validators
|
|
from django.db import migrations, models
|
|
import django.db.models.deletion
|
|
import djmoney.models.fields
|
|
import djmoney.models.validators
|
|
|
|
|
|
class Migration(migrations.Migration):
|
|
|
|
dependencies = [
|
|
('stock', '0095_stocklocation_external'),
|
|
('order', '0084_auto_20230321_1111'),
|
|
]
|
|
|
|
operations = [
|
|
migrations.AddField(
|
|
model_name='returnorder',
|
|
name='total_price',
|
|
field=InvenTree.fields.InvenTreeModelMoneyField(blank=True, currency_choices=[], decimal_places=6, default_currency='', help_text='Total price for this order', max_digits=19, null=True, validators=[djmoney.models.validators.MinMoneyValidator(0)], verbose_name='Total Price'),
|
|
),
|
|
migrations.AddField(
|
|
model_name='returnorder',
|
|
name='total_price_currency',
|
|
field=djmoney.models.fields.CurrencyField(choices=[], default='', editable=False, max_length=3),
|
|
),
|
|
migrations.CreateModel(
|
|
name='ReturnOrderLineItem',
|
|
fields=[
|
|
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
|
('quantity', InvenTree.fields.RoundingDecimalField(decimal_places=5, default=1, help_text='Item quantity', max_digits=15, validators=[django.core.validators.MinValueValidator(0)], verbose_name='Quantity')),
|
|
('reference', models.CharField(blank=True, help_text='Line item reference', max_length=100, verbose_name='Reference')),
|
|
('notes', models.CharField(blank=True, help_text='Line item notes', max_length=500, verbose_name='Notes')),
|
|
('target_date', models.DateField(blank=True, help_text='Target date for this line item (leave blank to use the target date from the order)', null=True, verbose_name='Target Date')),
|
|
('received_date', models.DateField(blank=True, help_text='The date this this return item was received', null=True, verbose_name='Received Date')),
|
|
('outcome', models.PositiveIntegerField(choices=[(10, 'Pending'), (20, 'Return'), (30, 'Repair'), (50, 'Refund'), (40, 'Replace'), (60, 'Reject')], default=10, help_text='Outcome for this line item', verbose_name='Outcome')),
|
|
('price_currency', djmoney.models.fields.CurrencyField(choices=[], default='', editable=False, max_length=3)),
|
|
('price', InvenTree.fields.InvenTreeModelMoneyField(blank=True, currency_choices=[], decimal_places=6, default_currency='', help_text='Cost associated with return or repair for this line item', max_digits=19, null=True, validators=[djmoney.models.validators.MinMoneyValidator(0)], verbose_name='Price')),
|
|
('link', InvenTree.fields.InvenTreeURLField(blank=True, help_text='Link to external page', verbose_name='Link')),
|
|
('item', models.ForeignKey(help_text='Select item to return from customer', on_delete=django.db.models.deletion.CASCADE, related_name='return_order_lines', to='stock.stockitem', verbose_name='Item')),
|
|
('order', models.ForeignKey(help_text='Return Order', on_delete=django.db.models.deletion.CASCADE, related_name='lines', to='order.returnorder', verbose_name='Order')),
|
|
],
|
|
options={
|
|
'unique_together': {('order', 'item')},
|
|
},
|
|
),
|
|
]
|