2792 Commits

Author	SHA1	Message	Date
Ben Charlton	9149aa1536	Fix internal server error when serializing stock with no location	2020-08-24 18:04:22 +01:00
eeintech	946d824995	Switched to ModelChoiceField	2020-08-24 11:41:14 -05:00
eeintech	6f89f7dc7f	Merge branch 'master' into show_potential_bom_items_stock	2020-08-24 10:35:59 -05:00
Ben Charlton	b6f9590d55	Add default config example to config template	2020-08-24 15:24:18 +01:00
Ben Charlton	988d263ef1	Allow custom authentication / middleware in config.yaml	2020-08-24 15:05:21 +01:00
Ben Charlton	471ece136e	Merge branch 'master' into feature-non-int-serial	2020-08-24 11:12:07 +01:00
Oliver Walters	78826dc20b	Merge remote-tracking branch 'inventree/master'	2020-08-23 21:21:18 +10:00
Oliver	2a4b9c6c5c	Merge pull request #929 from SchrodingersGat/label-enable ... Label enable	2020-08-23 21:18:11 +10:00
Oliver Walters	ca1985e11a	PEP fixes	2020-08-23 21:10:45 +10:00
Oliver Walters	9a35293126	Remove PartFilterMixin class	2020-08-23 21:08:41 +10:00
Oliver Walters	ed5ad3c047	Rename 'part_filters' field to 'filters'	2020-08-23 21:05:54 +10:00
Oliver Walters	c849f618d5	Clean up implementation of test report matching	2020-08-23 21:03:29 +10:00
Oliver Walters	b7ae95686e	Add field "enabled" to Report template	2020-08-23 20:51:41 +10:00
Radek Hladik	f9149d041e	Collapse navbar on small screen	2020-08-23 10:56:29 +02:00
Oliver Walters	116d966d29	Delete "ReportTemplate" class	2020-08-23 09:10:56 +10:00
Oliver Walters	771b2117c4	Remove duplicated function	2020-08-23 09:08:24 +10:00
Oliver Walters	8f1af0f5f9	Add "enabled" field to Label class ... - Only list labels which are enabled - Allows labels to be hidden / disabled without being deleted	2020-08-23 09:07:15 +10:00
Ben Charlton	23cc3d9b06	Handle 'next serial' more gracefully	2020-08-21 19:17:58 +01:00
Ben Charlton	c31b30bf83	Fix simple tests	2020-08-21 18:53:51 +01:00
Ben Charlton	f7ed48809c	Support non-integer serial numbers	2020-08-21 17:36:49 +01:00
Ben Charlton	eeca3effee	Fix disabled form item from preventing stock location moves for items with serial numbers	2020-08-21 16:20:33 +01:00
Oliver Walters	98017cb8bd	Merge remote-tracking branch 'inventree/master'	2020-08-21 22:11:02 +10:00
Oliver Walters	05fae4be87	Are more methods to tasks.py: ... - static - update - install - key - coverage The functionality of setup.py is now included here!	2020-08-21 21:08:04 +10:00
Oliver Walters	59b3d8b5bc	Fix stocktake export ... - Exclude MPTT fields - Fix foreignkey field references	2020-08-21 20:08:47 +10:00
Oliver Walters	25cced3b90	Exclude MPTT fields from Part model resource	2020-08-21 20:08:16 +10:00
eeintech	9fa13aeae3	Show 'available_stock' in Part string representation	2020-08-20 15:38:41 -05:00
eeintech	89e63df1fb	Corrected style	2020-08-20 14:53:03 -05:00
eeintech	6fc275ca30	BoM export: added option to export part paremeters (#126) and stocks (#793)	2020-08-20 13:53:27 -05:00
Oliver Walters	142a1462bb	Merge remote-tracking branch 'inventree/master'	2020-08-20 16:02:18 +10:00
Oliver Walters	90d34cdfcf	StockItem: Allow customer field to be blank	2020-08-20 14:54:55 +10:00
Oliver Walters	2f88cc9fe0	Merge remote-tracking branch 'inventree/master'	2020-08-20 14:48:16 +10:00
Oliver	4f1b469cee	Merge pull request #915 from SchrodingersGat/tex-response ... Tex response	2020-08-20 14:14:24 +10:00
Oliver Walters	8e0dfa9c6f	PEP fix	2020-08-20 14:05:55 +10:00
Oliver Walters	64ae181bf6	Add some more context data	2020-08-20 14:01:41 +10:00
Oliver Walters	5a8804f4bc	If LaTeX template errors, return the raw LaTeX!	2020-08-20 13:57:29 +10:00
Oliver Walters	c1956d13b5	Merge remote-tracking branch 'inventree/master'	2020-08-20 09:04:17 +10:00
Oliver Walters	0aeb7ddbdf	Allow column show/hide on BOM table	2020-08-20 08:57:11 +10:00
Oliver Walters	41c4a5376b	Bugfix: Recursive BOM display ... - Actually request recursively! (duh) - Fix the idField and parentIdField for the BOM display (was incredibly wrong) - Sub-rows are initially displayed in the "collapsed" state	2020-08-20 08:52:22 +10:00
Oliver Walters	6930456e2b	Merge remote-tracking branch 'inventree/master'	2020-08-19 14:19:43 +10:00
Oliver Walters	0faba39dfc	PEP: Remove unused variable ... (cherry picked from commit e49a1c1ad2)	2020-08-19 14:08:52 +10:00
Oliver Walters	7e829e88af	Add option for including supplier data for BOM export ... (cherry picked from commit d0b5550c86)	2020-08-19 14:08:47 +10:00
Oliver Walters	3d0012a3bf	Bugfix: accomodate missing manfufacturer links ... If a supplier_part does not have an associated manufacturer, the code would break (cherry picked from commit 965dba4739)	2020-08-19 14:08:41 +10:00
eeintech	b5bc8935a2	Added manufacturer data to BoM export ... (cherry picked from commit c7ddccc4ec)	2020-08-19 14:08:34 +10:00
Oliver Walters	f8bb357e6c	Merge remote-tracking branch 'inventree/master'	2020-08-18 21:30:08 +10:00
Oliver Walters	1767ef7a3a	Fix issues with tree sorting ... - Need to set parent ID based on the BOM items - This is to prevent data duplication that was weird and dumb	2020-08-18 21:24:11 +10:00
Oliver Walters	82903d2bd6	BOM display is now heirarchical	2020-08-18 21:01:22 +10:00
Oliver Walters	4cd54203a2	Add jquery-treegrid plugin	2020-08-18 20:53:50 +10:00
Oliver Walters	37baec2db6	bootstrap-table: Add "extensions"	2020-08-18 20:53:05 +10:00
Oliver Walters	32133fecc7	Merge remote-tracking branch 'upstream/master'	2020-08-18 14:41:03 +10:00
Oliver Walters	92ac93aac5	More intelligent checking for circular BOM ... - Check all the way down a BOM "tree" - Validate BOM tree before allowing BOM submission	2020-08-18 14:17:59 +10:00
Oliver Walters	ca4d3df287	Update translation files	2020-08-18 14:01:40 +10:00
Oliver Walters	68fb599c73	Major improvements to BOM upload ... - Column headings now match the values provided in BOM import template - Add a new column for part selection, while displaying all imported data - Better code documentation - Improve data validation - Allow decimal quantity (not just integer!) - Better matching logic	2020-08-18 14:01:01 +10:00
Oliver Walters	7349b396ca	Merge remote-tracking branch 'upstream/master' into bom-import-export	2020-08-18 11:50:40 +10:00
Oliver Walters	476cc5f661	BOM upload: improve generation of "import" template ... - Better field naming - Remove some fields which are not required here - Better description of what is going to happen	2020-08-18 11:47:27 +10:00
Oliver Walters	badc306f33	Merge remote-tracking branch 'upstream/master'	2020-08-18 10:39:24 +10:00
eeintech	783a94acce	Corrected MakeBomTemplate method's queryset	2020-08-17 16:42:28 -05:00
eeintech	84c0ec7937	BoM: added part matching based on IPN	2020-08-17 16:35:38 -05:00
eeintech	303157c586	Added part match auto-selection (if partial_ratio >= 100) to BoM part selection form	2020-08-17 14:10:24 -05:00
eeintech	685a58b807	Merge remote-tracking branch 'origin/master' into bom_dev	2020-08-17 12:05:54 -05:00
Oliver Walters	25d90f643a	Make BOM levels integers	2020-08-17 10:39:35 +10:00
Oliver	4dcd6ee136	Update version.py	2020-08-16 14:03:49 +10:00
Oliver	ab62f8fc59	Update version.py ... Increment version number	2020-08-16 14:03:20 +10:00
Oliver	b5b882d3b6	Merge pull request #906 from SchrodingersGat/blabel ... Label Printing Functionality	2020-08-16 14:02:38 +10:00
Oliver Walters	d52278e423	Icon tweak	2020-08-16 13:45:58 +10:00
Oliver Walters	da079b23dc	Fix duplicate label printing menu action	2020-08-16 13:43:59 +10:00
Oliver Walters	ccda637e3c	Fixes for barcode decoding	2020-08-16 13:42:27 +10:00
Oliver Walters	a4267f76e8	Fixes for barcode data rendering	2020-08-16 13:39:05 +10:00
Oliver Walters	2bbc65cc59	Add "brief" version of QR codes ... - Use this to render to labels (as it contains much less information)	2020-08-16 13:29:38 +10:00
Oliver Walters	2f5e3efada	Update translations	2020-08-16 12:11:22 +10:00
Oliver Walters	1807ba4e7b	Add form for selecting label template for a StockItem	2020-08-16 12:10:58 +10:00
Oliver Walters	30e24f19d9	PEP fixes	2020-08-16 11:13:17 +10:00
Oliver Walters	cdde0f8c43	Add URL endpoint for downloading PDF labels	2020-08-16 11:12:21 +10:00
Oliver Walters	2b1d6c268c	Render to an in-memory PDF	2020-08-16 10:29:03 +10:00
Oliver Walters	18b3fd3256	Add context data to StockItemLabel model	2020-08-16 10:24:15 +10:00
Oliver Walters	aefd70ce49	Add admin interface for StockItemLabel	2020-08-16 09:29:45 +10:00
Oliver	eb2422e6be	Merge pull request #905 from SchrodingersGat/bom-depth ... Allow user to set "depth" of exported multi-level BOM	2020-08-16 09:29:09 +10:00
Oliver Walters	a45902bd4f	Add "label" app	2020-08-16 09:28:12 +10:00
Oliver Walters	e5406cae24	More PEP fixes	2020-08-16 09:05:16 +10:00
Oliver Walters	97103207b6	PEP fixes	2020-08-16 08:34:54 +10:00
Oliver Walters	b27ecf54d7	Allow user to set "depth" of exported multi-level BOM	2020-08-16 08:29:36 +10:00
Oliver Walters	f1373e3bea	Improve speed of BomItem API queries ... - Including the pricing information takes absolutely ages, takes too long!!	2020-08-15 21:52:32 +10:00
Oliver Walters	e1a8772af6	Update serializers for SupplierPart	2020-08-15 21:24:01 +10:00
Oliver Walters	d34383e842	Specify serializer type for part category	2020-08-15 21:20:31 +10:00
Oliver Walters	2f77007dbe	Significant query speed improvements to stock list API ... - Thanks, django-debug-toolbar! - Gah, django DRF is the worst. Enforcing a PrimaryKeyRelatedSerializer seems to really improve speed	2020-08-15 21:15:11 +10:00
Oliver Walters	3c4cfc9a1b	Flake fix	2020-08-15 19:56:02 +10:00
Oliver Walters	2bb669d7de	Remove defunct "log_queries" option	2020-08-15 19:52:04 +10:00
Oliver Walters	b8b3a933ab	Add django-debug-toolbar plugin ... - Must be running in DEBUG mode - Must set debug_toolbar to True in config file	2020-08-15 19:48:42 +10:00
Oliver Walters	2280558303	Add a method of return raw LaTeX for debugging	2020-08-15 19:27:31 +10:00
Oliver Walters	3b01614a38	Merge remote-tracking branch 'inventree/master'	2020-08-09 21:37:06 +10:00
Oliver Walters	cebba6909c	Revert thing	2020-08-09 21:21:12 +10:00
Oliver Walters	3336eb9f45	Default stock list behaviour is to only show in_stock items	2020-08-09 21:12:49 +10:00
Oliver Walters	0da9e0f834	Add "sent_to_customer" filter	2020-08-09 21:10:21 +10:00
Oliver Walters	502702b3bc	Add some more visual tags to the stock list	2020-08-09 21:04:41 +10:00
Oliver	bb6b3b965d	Merge pull request #896 from SchrodingersGat/company-ordering ... Add default ordering for Company model	2020-08-08 17:21:21 +10:00
Oliver	fcfd1f82d6	Merge pull request #898 from SchrodingersGat/filter-depleted ... Filter depleted	2020-08-08 17:19:28 +10:00
Oliver Walters	19c036f50a	Add migration files	2020-08-08 17:16:04 +10:00
Oliver Walters	ad11681369	Custom filter tag for company stock listing	2020-08-08 17:15:08 +10:00
Oliver Walters	bc3fda71a4	Display "depleted" label next to depleted stock	2020-08-08 17:11:50 +10:00
Oliver Walters	96a3f2920d	Stock table filters now arranged in alphabetical order	2020-08-08 17:09:22 +10:00
Oliver Walters	099f56e779	Add "depleted" table filter	2020-08-08 17:08:18 +10:00
Oliver Walters	402301e165	Add ability to filter stock items by "depleted" status	2020-08-08 17:06:22 +10:00
Oliver Walters	732405f738	Cannot edit quantity for serialized stock when adjusting	2020-08-08 17:01:29 +10:00
Oliver Walters	a7ee323035	PEP fix	2020-08-08 16:59:48 +10:00
Oliver Walters	ad977d4d26	Add default ordering for Company model ... - Now will sort by "name" in choice fields, etc	2020-08-08 16:54:09 +10:00
Oliver Walters	3831a04ce0	Merge remote-tracking branch 'inventree/master'	2020-08-08 09:52:48 +10:00
Oliver Walters	8d9cfd3678	Migration file for StockStatus codes	2020-08-08 09:44:21 +10:00
Oliver Walters	a2c3c1086c	Catch unhandled javascript errors	2020-08-08 09:31:57 +10:00
Oliver Walters	ff71fe6e93	Fix "in_stock" logic for StockItem ... - Not in stock if it is at a customer!	2020-08-08 09:20:42 +10:00
Oliver Walters	861a2982db	Removed "SHIPPED" stock status code	2020-08-08 09:16:53 +10:00
Oliver Walters	459cc03aae	Remove "ASSIGNED_TO_BUILD" status code	2020-08-08 09:08:15 +10:00
Oliver Walters	80173a9d43	Remove ASSIGNED_TO_OTHER_ITEM status code	2020-08-08 09:07:25 +10:00
Oliver Walters	bdea29df04	Add functionality to return stock item from customer	2020-08-08 09:05:33 +10:00
Oliver Walters	7b332d93ee	Rearrange button layouts	2020-08-08 08:48:27 +10:00
Oliver Walters	0f199556df	Add migration file	2020-08-04 11:21:27 +10:00
Oliver Walters	3a266cf322	Allow default_keywords to be null	2020-08-04 11:10:24 +10:00
Oliver Walters	d65d76653c	Merge remote-tracking branch 'inventree/master'	2020-08-03 20:49:33 +10:00
Oliver Walters	10691b3d03	Allow creation of a stock item with zero quantity	2020-07-30 21:05:37 +10:00
Oliver Walters	b7f30ee136	Update translations	2020-07-30 20:26:14 +10:00
Oliver Walters	d90edab59f	Staff users are allowed to delete stock items that otherwise are not able to be deleted	2020-07-30 20:23:46 +10:00
Oliver Walters	d1d5b45073	Merge remote-tracking branch 'inventree/master'	2020-07-22 14:52:57 +10:00
eeintech	f386039d5a	Added validation method for uploaded file using imghdr library	2020-07-21 16:01:17 -05:00
eeintech	af70dd5dfe	Allowing Part thumbnail (image) update via API	2020-07-20 16:16:26 -05:00
eeintech	51c194fb8f	Merge branch 'master' of github.com:eeintech/InvenTree into bom_dev	2020-07-19 15:05:07 -05:00
Oliver Walters	6994af411d	Merge remote-tracking branch 'inventree/master'	2020-07-18 13:31:07 +10:00
Oliver Walters	0152ae79ef	Adds table filters for stock assigned to a particular customer	2020-07-14 15:54:03 +10:00
eeintech	3b98d85143	Merge branch 'master' of github:eeintech/InvenTree into bom_dev	2020-07-09 08:48:41 -05:00
eeintech	46586ba960	Corrected typo in part.models, simplified MakeBomTemplate function	2020-07-09 08:47:52 -05:00
eeintech	9b7977a217	API: Allow part deletion if inactive	2020-07-08 10:56:23 -05:00
Oliver Walters	5f2ca784c9	Merge branch 'negative-stock-fix'	2020-06-28 19:26:56 +10:00
Oliver	3d7676e292	Merge pull request #880 from SchrodingersGat/negative-stock-fix ... Improve logic of "quantity_to_order" function	2020-06-28 19:23:37 +10:00
Oliver Walters	3d245c7ce3	Improve logic of "quantity_to_order" function	2020-06-28 19:14:51 +10:00
Oliver Walters	134a688e4a	Fix filter logic for 'starred' parts	2020-06-28 19:08:13 +10:00
Oliver Walters	fa3d2d005a	"Active" part toggle is always enabled	2020-06-22 11:27:59 +10:00
Oliver Walters	930f903f5d	Add ability to display "out of stock" items against a part	2020-06-22 10:48:41 +10:00
Oliver Walters	dedc25d681	Update verbose names for some fields	2020-06-13 20:46:19 +10:00
Oliver Walters	82433db1ea	Merge remote-tracking branch 'inventree/master'	2020-06-12 18:16:23 +10:00
Oliver Walters	2e91f64a96	Add (disabled) print-label button for Part display	2020-06-12 18:13:14 +10:00
Oliver Walters	1ad4b8b131	Reorganize buttons for "Part" view	2020-06-12 18:11:57 +10:00
Oliver Walters	9757fb06db	Fix a weird button issue ... - reloadTable() was causing the button 'click' handler to fire... - NFI why this is happening	2020-06-12 16:47:57 +10:00
Oliver Walters	ab4e6548dc	Transfer stock items into a stock location using barcode scanning	2020-06-12 16:29:08 +10:00
Oliver Walters	351a55c9ea	Add the concept of "action groups" to the buttons for the Stock Location view	2020-06-12 11:14:33 +10:00
Oliver Walters	e1c503836d	Improve barcode icon in navbar	2020-06-12 10:56:52 +10:00
Oliver Walters	8cafaa0e62	Make barcode javascript translatable	2020-06-12 10:43:27 +10:00
Oliver Walters	6064c6ceb5	Add dialog for linking a barcode with a stock item	2020-06-12 10:26:23 +10:00
Oliver Walters	b559816dca	Update translations	2020-06-12 10:25:07 +10:00
Oliver Walters	ba94b340dd	Add function to un-link barcode from a stock item	2020-06-12 10:12:31 +10:00
Oliver Walters	beccbe8583	Flake fixes	2020-06-11 19:46:36 +10:00
Oliver Walters	07be08d0f3	"Simplify" qr code display	2020-06-11 19:40:44 +10:00
Oliver Walters	4bb9c4c559	Prevent barcode data being entered multiple times	2020-06-11 19:27:32 +10:00
Oliver Walters	2d9b75c6ae	Include URL data in barcode scan endpoint	2020-06-11 19:21:38 +10:00
Oliver Walters	3aecb110a5	Add qrcode icon as prefix to barcode input	2020-06-11 19:05:55 +10:00
Oliver Walters	503d5a41b1	Add global 'barcode-scan' button	2020-06-11 18:09:43 +10:00
Oliver Walters	e943681baa	Add translations for error messages	2020-06-11 18:09:06 +10:00
Oliver Walters	0559946791	Add unit testing framework for barcodes	2020-06-11 14:44:56 +10:00
Oliver Walters	22a8e82108	Add endpoint for assigning a particular barcode to a StockItem	2020-06-11 12:21:33 +10:00
Oliver Walters	a72ed11cb0	Skeleton for DigiKey barcode	2020-06-11 11:16:55 +10:00
Oliver Walters	1a15b46d65	Remove some debug statements	2020-06-11 11:14:02 +10:00
Oliver Walters	0068cd9825	Refactor barcode endoint ... - Moved code into 'barcode' directory	2020-06-11 11:09:07 +10:00
Oliver Walters	290c0eb225	Add barcode javascript file	2020-06-11 09:56:59 +10:00
Oliver Walters	bc31cc550e	Consolidate buttons for stock item	2020-06-10 15:27:30 +10:00
Oliver Walters	f40a9d1dad	Merge remote-tracking branch 'inventree/master'	2020-06-09 16:28:59 +10:00
Oliver Walters	38dcdcad54	Update translation hooks	2020-06-09 16:18:38 +10:00
Oliver	aeba189c1a	Merge pull request #863 from SchrodingersGat/decimalfix ... Decimalize display of variant stock	2020-06-09 13:44:47 +10:00
Oliver Walters	09400fd66b	Decimalize display of variant stock ... (cherry picked from commit 6e45360c4b7a6bc91f584f498fb6e1988593db95)	2020-06-09 13:31:16 +10:00
Oliver Walters	c7586b83e9	Fix display of buttons for stock item ... (cherry picked from commit b23017b6bf)	2020-06-09 13:15:12 +10:00
Oliver Walters	b23017b6bf	Fix display of buttons for stock item	2020-06-09 13:14:29 +10:00
Oliver Walters	a6a58b299b	Merge remote-tracking branch 'inventree/master'	2020-06-06 08:59:28 +10:00
Oliver Walters	126e42a022	Add "IPN" column to stock list table	2020-06-06 08:47:06 +10:00
Oliver Walters	7be158722f	Merge remote-tracking branch 'inventree/master'	2020-06-05 20:04:41 +10:00
Oliver Walters	16d261d956	Make description fields optional	2020-06-05 19:33:32 +10:00
Oliver Walters	15817ce61a	Add "IPN" column to part table	2020-06-05 19:26:41 +10:00
Oliver Walters	fcd588cb01	Filter SalesOrder by status	2020-06-05 12:08:47 +10:00
Oliver Walters	6ebce2b2fd	Add ability to filter purchase orders by "outstanding" status	2020-06-05 12:06:28 +10:00
Oliver Walters	544e217347	Add page to show stock which is assigned to a customer	2020-06-05 11:52:07 +10:00
Oliver Walters	9f599546de	Use stock status for determining "in stock"	2020-06-05 09:08:46 +10:00
Oliver Walters	408c6a4040	Filter stock list by "customer"	2020-06-05 09:05:57 +10:00
Oliver Walters	2c7e0bd321	Merge remote-tracking branch 'inventree/master'	2020-06-04 20:07:59 +10:00
Oliver Walters	ca1526405b	PEP fixes	2020-06-04 19:51:43 +10:00
Oliver Walters	80019a3ed8	Add forms/views for manually assigning a stock item to a customer	2020-06-04 19:45:41 +10:00
Oliver Walters	d907136264	Display customer in stock item	2020-06-04 19:13:37 +10:00
Oliver Walters	fbd21827fb	Add 'customer' field to StockItem	2020-06-04 19:08:33 +10:00
Oliver Walters	4ddabb82ef	Add a button to assign stock item to customer	2020-06-04 11:50:55 +10:00
Oliver Walters	a3c0d35b20	Fix for case where BOM item quantity is zero	2020-06-04 11:37:55 +10:00
Oliver Walters	dd9584f487	Follow link when a new stock item is created	2020-05-30 20:58:52 +10:00
Oliver Walters	8459de7be2	Display a message if no stock location is set	2020-05-30 20:58:05 +10:00
Oliver Walters	b73044cd44	Merge remote-tracking branch 'inventree/master'	2020-05-29 13:47:19 +10:00
Oliver Walters	5f3816212f	template parts are now allowed to be variants ... - Do not throw an error here!	2020-05-29 12:40:40 +10:00
Oliver Walters	59d9e430b4	Remove unique-together requirement ... - This is handled manually via the validate_unique function	2020-05-28 20:38:24 +10:00
Oliver Walters	774e26eb19	Mark some fields as not-required via the API	2020-05-28 20:33:33 +10:00
Oliver Walters	9b7b65374d	Use rounding decimal field in BomItem form	2020-05-27 10:33:47 +10:00
Oliver Walters	7bcf9bf5be	Allow template parts to be specified for the BOM item	2020-05-27 10:06:18 +10:00
Oliver Walters	d0b3e0bd7c	Merge remote-tracking branch 'inventree/master'	2020-05-27 09:31:15 +10:00
Oliver Walters	78990a99e5	Fix serializer for stock item	2020-05-26 23:01:30 +10:00
Oliver Walters	fe69a8e7bb	Merge remote-tracking branch 'inventree/master'	2020-05-26 21:53:20 +10:00
Oliver Walters	e128410d54	Update 'required' status for new serializers ... (cherry picked from commit 2306e29743eb25266c78bec5357d1194e0778c58)	2020-05-26 20:29:09 +10:00
Oliver Walters	81e38eeb14	Add some more custom FileField serializers ... (cherry picked from commit 7b9ff27baefacc977fef7852e99d8a9bb46a062a)	2020-05-26 20:29:04 +10:00
Oliver Walters	861e30e8d6	Add a special serializer class for FileField which has a custom to_representation function ... - This was solving a very subtle bug which will probably only ever apply to a single installation instance - Future me will most likely not remember what this was for or how it works - In any case, there we go - Ref: http://www.cdrf.co/3.9/rest_framework.fields/Field.html (cherry picked from commit 7305094854)	2020-05-26 20:29:00 +10:00
Oliver Walters	03cc6892ea	Merge remote-tracking branch 'inventree/master'	2020-05-26 12:52:17 +10:00
Oliver Walters	c0f1966a2c	Decimal filter on StockItem adjustment form	2020-05-26 12:08:00 +10:00
Oliver Walters	c92bb78ae8	Stock table display fixes	2020-05-26 12:06:38 +10:00