Commit Graph

1886 Commits

Author SHA1 Message Date
Oliver Walters 50fee1bfe5 More work on translations 2020-02-12 10:25:46 +11:00
Oliver Walters 28e9d842bf Small tweaks for BOM export
- Steps towards preventing circular BOMs
- Improve formatting of exported BOM
2020-02-12 10:18:20 +11:00
Oliver Walters d04fb0d826 Use decimal2string instead of normalize 2020-02-12 10:08:35 +11:00
Oliver Walters 520b8d7b2b Fix for BOM pricing weirdness 2020-02-12 10:06:17 +11:00
Oliver Walters c287a0a0b9 More rounding improvements 2020-02-12 08:22:55 +11:00
Oliver Walters 265ed5115a Float parsing on StockItem tracking page 2020-02-12 08:19:08 +11:00
Oliver Walters 53d1040875 Fix allocation count 2020-02-12 08:14:04 +11:00
Oliver Walters 5ae7ca71d7 Improve number rendering of build allocation page 2020-02-12 08:12:26 +11:00
Oliver Walters 564635c368 Add some translatable strings 2020-02-12 08:11:59 +11:00
Oliver Walters 882bda46b4 Fix tests 2020-02-11 22:38:50 +11:00
Oliver Walters f865573e48 Implement cascading export of BOM 2020-02-11 22:32:36 +11:00
Oliver Walters 434d084371 Provide form for user to select export options 2020-02-11 21:43:17 +11:00
Oliver eecc435c02
Merge pull request #639 from SchrodingersGat/use-same-img
Use same thumbnail for multiple parts
2020-02-11 20:30:08 +11:00
Oliver Walters 55aa63dab4 Override save() method for Part model
- Delete old thumbnails if they are no longer being used
2020-02-11 20:27:06 +11:00
Oliver Walters 77c950a729 Fixed unit tests 2020-02-11 00:39:02 +11:00
Oliver Walters dee47bdea8 Prevent django_cleanup from deleting part thumbs that are used elsewhere
- Will need to implement a method for automatically deleting part thumbs...
2020-02-11 00:29:29 +11:00
Oliver Walters 8ea1086b03 Make thumb buttons only visible on mouseover 2020-02-11 00:28:46 +11:00
Oliver Walters e0e996a6c3 Add buttons to select or upload part images 2020-02-11 00:00:03 +11:00
Oliver Walters d4fe83170f Select existing image and upload successfully 2020-02-10 23:48:45 +11:00
Oliver Walters 534b60d4b8 Print out MEDIA_ROOT directory if in debug mode 2020-02-10 23:43:41 +11:00
Oliver Walters 725eb3c538 Do not duplicate images when copying a part
- Simply reference the existing image
2020-02-10 23:04:58 +11:00
Oliver Walters 17c10da10e Display existing images in a form 2020-02-10 22:57:36 +11:00
Oliver Walters a82e219336 Add translatable strings for part views 2020-02-10 22:10:06 +11:00
Oliver Walters 1327c1d3b1 Add API endpoint for querying part images 2020-02-10 22:03:06 +11:00
Oliver Walters 66c1a2ef57 test fix 2020-02-10 21:36:57 +11:00
Oliver Walters cb29ff14e0 Change auto_now field to auto_now_add
- Build creation date should no longer get erroneously updated
2020-02-10 21:34:41 +11:00
Oliver Walters 4bd4f2a0a3 Fix for bug b)
- Don't attempt to save if there are duplicates
- Fix overwritten variable name
- Provide correct return data to the form
2020-02-06 23:22:55 +11:00
Oliver Walters 2949289fab Fix for bug a)
- Would not create new StockItem for trackable part if Serial Numbers not provided
2020-02-06 23:11:47 +11:00
Oliver Walters 41336bd549 Fixes 2020-02-03 21:28:47 +11:00
Oliver Walters d059aff4f8 Use the part_deep_copy setting to set the default deep_copy value when duplicating a part 2020-02-03 21:14:06 +11:00
Oliver Walters 9cef038d6a IPN must match regex validator (if one is provided) 2020-02-03 21:09:24 +11:00
Oliver Walters 356b6cf15b Load default settings on InvenTree launch 2020-02-03 20:51:53 +11:00
Oliver 4b8e44bc4a
Merge pull request #632 from SchrodingersGat/database-stats
Database stats
2020-02-02 22:18:32 +11:00
Oliver Walters ef7fca5633 PEP fixes 2020-02-02 22:15:46 +11:00
Oliver Walters 244d364575 Display some basic stats 2020-02-02 22:13:10 +11:00
Oliver Walters aa210efad6 Simple skelton for database stats view 2020-02-02 22:03:31 +11:00
Oliver Walters 91ca37c84b Add stats link to navbac
- Also add translation layer for the navbar
2020-02-02 21:51:23 +11:00
Oliver Walters d0a7a24649 Add translatable strings 2020-02-02 21:43:10 +11:00
Oliver Walters 5264f816f1 Allow PartCategory and StocKLocation names to be non-unique
- As long as they are unique in the current tree level
2020-02-02 21:40:03 +11:00
Christian Schlüter e379b44606
Update German translation 2020-02-02 08:10:48 +01:00
Oliver a022b8223e
Update version.py 2020-02-02 12:46:42 +11:00
Oliver Walters 1a32e441b7 Add //TODO entry in stock tabs 2020-02-02 12:42:35 +11:00
Oliver Walters 20273f1541 Add commit date information to about window 2020-02-02 12:39:35 +11:00
Oliver Walters f88f5a39f8 Visual fix for allocation tab 2020-02-02 12:16:31 +11:00
Oliver Walters 1bdcbd1974 Markdownify the 'notes' field for StockItem
- New tab interface for the StockItem page
- Display / editing of notes field with markdown
2020-02-02 12:11:18 +11:00
Oliver Walters 908e2ef8bc Add glyphicon for company notes 2020-02-02 11:54:09 +11:00
Oliver Walters 0f92468462 Add icon to signify if notes exist 2020-02-02 11:48:43 +11:00
Oliver Walters 7ec194a14a Markdownify the notes field for PurchaseOrder
- Update model field
- Create tab view for PO page
- Add 'notes' tab
2020-02-02 11:44:44 +11:00
Oliver Walters a7846940c4 Markdownify the notes field for Build model 2020-02-02 00:00:19 +11:00
Oliver Walters 51fab36074 Display / editing for Company notes field
- Also includes some translation updates
2020-02-01 23:45:28 +11:00
Oliver Walters ca9f9e047c Make company notes field markdownable 2020-02-01 23:31:45 +11:00
Oliver Walters 1f71a93d88 Fix page formatting 2020-02-01 23:26:54 +11:00
Oliver Walters 88ec40e454 Fix success_url for notes form 2020-02-01 22:25:35 +11:00
Oliver Walters f0933f216c PEP fixes 2020-02-01 17:29:58 +11:00
Oliver Walters 919662054c Alter markdownify settings to properly render images, headings 2020-02-01 14:49:28 +11:00
Oliver Walters b9dda51378 Side-by-side live editing for markdown 2020-02-01 14:40:11 +11:00
Oliver Walters 3c3ae43c18 Add special view for displaying / editing notes field for part 2020-02-01 13:36:09 +11:00
Oliver Walters c546ed5dcd Update requirements
- Use markdownify for rendering
- Use markdownx for editing
2020-01-31 21:42:30 +11:00
Oliver Walters da01177d23 Blank 'notes' page for Part model 2020-01-31 20:38:29 +11:00
Oliver Walters aa2f63830e Translation template for part attachments page 2020-01-31 20:37:54 +11:00
Oliver Walters 596d06cf1a Add a markdown editor for the 'Notes" field of Part model
https://github.com/timmyomahony/django-pagedown
2020-01-31 20:28:54 +11:00
Oliver Walters bd653f2c49 Some more unit tests 2020-01-07 21:16:01 +11:00
Oliver Walters a064ce13fc PEP fixes 2020-01-06 20:51:12 +11:00
Oliver Walters e103bd8880 Write unit test for PurchaseOrder receive views 2020-01-06 20:50:16 +11:00
Oliver Walters 61897cb0fc Updated translation files 2020-01-06 09:24:29 +11:00
Oliver Walters 067d2be1f0 Bug fix - receiving lines against a PO caused issues due to integer/Decimal conversion 2020-01-06 09:23:13 +11:00
Oliver Walters 740d7678d7 Update translation files 2020-01-06 08:57:13 +11:00
Oliver Walters b3ec748123 Display current stock item quantity in stock-adjust modal form 2020-01-06 08:52:28 +11:00
Oliver d2d5909701
Merge pull request #601 from SchrodingersGat/trailing-fix
Trailing fix
2020-01-02 20:32:16 +11:00
Oliver Walters 43d47686c5 Style fixes 2020-01-02 20:27:07 +11:00
Oliver Walters dae74a19d3 Fix logic for decimal string helper 2020-01-02 20:25:59 +11:00
Leon Schnieber 720485709b Applied suggestions and corrected typos 2019-12-20 13:33:34 +01:00
Leon Schnieber 17c048e8dd added german translation 2019-12-19 17:51:42 +01:00
Leon Schnieber a0534dafec added german translation 2019-12-19 17:47:15 +01:00
Oliver Walters 6cd3b3176c Regenerate translation files
- Also fix documentation for making a virtual envirtonment
2019-12-09 22:17:21 +11:00
Oliver Walters fafd0397bc remove defunct file 2019-12-09 21:56:26 +11:00
Oliver Walters 71c1faf9ff Use the client-side PO table in more places 2019-12-09 21:55:00 +11:00
Oliver Walters a257f94ac0 Use client-side rendering for list of purchase orders 2019-12-09 21:33:27 +11:00
Oliver Walters 25e5a64cee Improve filtering / ordering / sorting for purchase-order API 2019-12-09 21:19:35 +11:00
Oliver Walters 5e9b012031 Bug fix for static lookup of blank image 2019-12-09 20:40:04 +11:00
Oliver Walters 1a6f06cceb normalize decimal fields 2019-12-06 22:40:27 +11:00
Oliver 9946fbda17
Merge pull request #585 from SchrodingersGat/tweaks
Reload page after ordering parts
2019-12-05 14:28:34 +11:00
Oliver Walters 98374ca466 Update to more recent libraries
- Specify exact module versions
2019-12-05 14:12:05 +11:00
Oliver Walters 2152cb14b4 Add translation files 2019-12-05 10:29:23 +11:00
Oliver Walters 7f2804dff3 Add button to mark a purchase order as complete, even if not all line items are received 2019-12-05 10:29:16 +11:00
Oliver Walters 3f172cb065 Add 'new location' button when receiving parts by individual line 2019-12-05 09:12:37 +11:00
Oliver Walters cbdea9f18c Reload page after ordering parts 2019-11-29 20:37:34 +11:00
Oliver Walters 7e6c5fae62 Display units in part table 2019-11-19 10:39:40 +11:00
Oliver Walters 8b2f1b9313 Better rendering of aggregated stock count in stock table
https://stackoverflow.com/questions/11832914/round-to-at-most-2-decimal-places-only-if-necessary#12830454
2019-11-19 10:36:01 +11:00
Oliver Walters 64db28be67 Fix __str__ function to get unit tests to pass 2019-11-19 10:31:49 +11:00
Oliver Walters 381becef79 Convert some more fields to decimal
- purchase order line item quantity
- purchase order line item received
2019-11-19 10:30:04 +11:00
Oliver Walters a1f33c4084 Change build allocation quantity to decimal field 2019-11-19 10:22:46 +11:00
Oliver Walters dbdbe69f7f Bug fix for test cases 2019-11-19 10:19:52 +11:00
Oliver Walters 9da8189899 Allow non-integer stock movement 2019-11-19 10:17:20 +11:00
Oliver Walters e4bfe43c04 More rendering improvements 2019-11-19 10:10:23 +11:00
Oliver Walters 003a2d9f3c Allow creation of stockitem with non-integer quantity
-  Also provided more translation strings
2019-11-19 10:00:08 +11:00
Oliver Walters 0ea8ade26c Better rendering for build allocation page
- Added translations too
2019-11-19 09:51:35 +11:00
Oliver Walters 75774771dc Changes to StockItem model
- Stock adjustments need to accept decimal values
2019-11-19 09:18:41 +11:00
Oliver Walters 20755a6dac Rendering of decimal value on stockitem page 2019-11-19 09:10:47 +11:00
Oliver Walters 4e1b9efe93 Fix javascript rendering of decimal quantity in BOM table 2019-11-19 09:08:17 +11:00
Oliver Walters 6e90ac367e Massaging unit tests
- Decimal fields are useful but VERY ANNOYING to use
- Needed to fix some test cases
2019-11-19 08:59:56 +11:00
Oliver Walters 400941c10f Change item quantity field from PositiveInteger to Decimal
- Allow 'partial' quantity e.g. '0.45kg'
- Need to change some maths functions as Decimal type is pernickity
2019-11-19 08:49:54 +11:00
Oliver Walters 81a226c760 Added translation strings for stock.models 2019-11-19 08:46:25 +11:00
Oliver Walters 5ffbfe8eb8 Add translation strings for part models 2019-11-19 08:42:10 +11:00
Oliver Walters 16f3dfb678 Removed old migration file 2019-11-16 20:39:10 +11:00
Oliver Walters b7473be8ef Update stock adjustment dialog 2019-11-16 20:29:05 +11:00
Oliver Walters 2261973331 Ability to delete multiple stock items 2019-11-16 20:19:10 +11:00
Oliver Walters 789515e39d Add translations for the StockItem detail page 2019-11-16 20:14:08 +11:00
Oliver Walters 0effb584b9 Remove 'active' field
- Will work this change in at a later date
2019-11-16 20:13:51 +11:00
Oliver Walters 339126b27a Add new field "active" to StockItem model
- True by default
- Set to 'false' to mark a stockitem as 'deleted'
2019-11-16 19:41:36 +11:00
Oliver Walters 56255a98d8 Add a menu item to delete multiple stock items 2019-11-16 19:28:47 +11:00
Oliver Walters 1887463f7f Properly display 'notes' field in grouped rows for stock table 2019-11-04 21:55:48 +11:00
Oliver Walters d1c7877713 Add unit test for CompanyIndex 2019-09-30 13:44:19 +10:00
Oliver Walters be96a2f7e3 Add some unit tests 2019-09-30 13:39:56 +10:00
Oliver Walters 871b853b9f Single form to delete single or multiple SupplierPart objects 2019-09-30 13:28:51 +10:00
Oliver Walters ab25a199ce Bug fix - secondary modals not working correctly 2019-09-27 21:00:27 +10:00
Oliver Walters b870728125 Add translation hooks for part detail template 2019-09-27 10:12:46 +10:00
Oliver Walters 427f47310b Add detail pane to top-level part view 2019-09-27 10:04:20 +10:00
Oliver Walters 3e2a5263a5 Add stock information for top-level stock page 2019-09-27 09:59:14 +10:00
Oliver Walters f2eb66d854 Update readme file and scripts 2019-09-26 10:37:39 +10:00
Oliver Walters fcba00bc69 Check for altered translation files that have not been compiled 2019-09-26 10:32:44 +10:00
Oliver Walters 9be528a3fb Add (brief) documentation page regarding translations 2019-09-26 10:07:18 +10:00
Oliver Walters 40acf90efe Add some initial (empty) translation files 2019-09-26 09:59:50 +10:00
Oliver Walters 3cc79d6def Add default language option to config.yaml 2019-09-26 09:56:41 +10:00
Oliver Walters 0e0405f337 Update settings.py to enable translations 2019-09-26 09:55:45 +10:00
Oliver fb75617807
Update version.py 2019-09-24 08:08:42 +10:00
Oliver Walters 7c1615a2b6 Fix user recording when serializing stock 2019-09-24 07:59:59 +10:00
Oliver Walters 41c07fc423 Save user who created a stock item
- Handled differently for batch or serialized parts
2019-09-24 07:54:18 +10:00
Oliver Walters 52ec213a28 Save user information when creating a new purchase order 2019-09-24 07:43:14 +10:00
Oliver Walters b1380687e6 PEP 2019-09-23 19:31:50 +10:00
Oliver Walters 8d92960f10 Ability to receive PO lines items individually 2019-09-23 19:31:18 +10:00
Oliver Walters 0d68dbcfa7 Display which lines have been received against a PO 2019-09-23 19:05:22 +10:00
Oliver Walters 21e369e6cc Update ReceivePurchaseOrder form
- Location field is now a proper MPTT field
- Ability to create a new location
2019-09-23 19:02:36 +10:00
Oliver Walters ae2e2f36e4 Update a bunch more tables 2019-09-22 22:18:53 +10:00
Oliver Walters 2046c12600 Use a jQuerified function 2019-09-22 21:56:57 +10:00
Oliver Walters df41fafefb Update page table 2019-09-22 21:42:51 +10:00
Oliver Walters 8eaff6a353 Add wrapper function around bootstrapTable 2019-09-22 21:37:20 +10:00
Oliver Walters fcbf0e6e93 Create UI elements to cancel an order
- View
- Form
- Template
- Button
- Javascript
2019-09-20 11:52:38 +10:00
Oliver Walters 6f54091354 Improve display of stock location 2019-09-20 00:03:59 +10:00
Oliver Walters 5a9e5dea20 Add sub-category and part count 2019-09-20 00:00:34 +10:00
Oliver Walters 508a3fc35c Improve display of part category page 2019-09-19 23:59:01 +10:00
Oliver Walters b3ea2bfb9a Update badges 2019-09-19 23:38:15 +10:00
Oliver Walters 3c98cd87a7 Use localStorage rather than sessionStorage for storing user prefs
- Also create some helper functions
2019-09-19 23:29:03 +10:00
Oliver Walters cf2abb4130 Add option to display ALL results in a paginated table
- Commonize the number of pages allowed
2019-09-19 23:20:42 +10:00
Oliver Walters 8a995cc193 Ability to edit username 2019-09-19 14:36:14 +10:00
Oliver Walters a77fd23fcf Add a reminder for future-self 2019-09-17 20:19:27 +10:00
Oliver Walters cb77506111 Simplify 2019-09-17 20:19:05 +10:00
Oliver Walters c5a82f4b6e Simplifty PartPriceInfo field 2019-09-17 20:17:25 +10:00
Oliver Walters 4a0be0dfb8 Simplify 2019-09-17 20:15:50 +10:00
Oliver Walters 774872e6a6 Make function atomic 2019-09-17 14:17:49 +10:00
Oliver Walters 08f958dd72 Add form for setting part category 2019-09-17 14:06:11 +10:00
Oliver Walters 94cd28ecb9 Add ability so set category for multiple parts at once 2019-09-17 13:49:57 +10:00
Oliver Walters b5b7dc0fbf Fix tests 2019-09-17 12:29:18 +10:00
Oliver Walters f90aa1d2cf Make purchase-order table sortable 2019-09-17 11:44:50 +10:00
Oliver Walters 1cffd41c07 Fix broken price-break buttons
- Did not work!
2019-09-17 10:54:28 +10:00
Oliver Walters d40fc59616 Reload page after ordering part 2019-09-17 10:34:41 +10:00
Oliver Walters a9d1cadc12 Add link to documentation 2019-09-17 00:41:28 +10:00
Oliver Walters 55ebf48684 Add more export fields for SupplierPart and SupplierPriceBreak 2019-09-16 09:43:57 +10:00
Oliver Walters 628a58e8fc Show which parts are short in build view 2019-09-16 08:23:40 +10:00
Oliver Walters fedbb834ee Add mouse-over text to build-cancel button 2019-09-16 08:17:39 +10:00
Oliver Walters 4746a3ccff Bootstrapify the table 2019-09-15 23:11:06 +10:00
Oliver Walters 2c1a744c2d Display singleton settings in the settings tab
- Only visible to 'staff' user
2019-09-15 23:09:58 +10:00
Oliver Walters 098cd0ec44 Add description field 2019-09-15 23:07:45 +10:00
Oliver Walters 02e71bd2ce Template for displaying other settings 2019-09-15 22:50:47 +10:00
Oliver Walters 3e33326120 Add the InvenTreeSetting model
- Storage of singleton settings in key:value pairs
2019-09-15 22:46:24 +10:00
Oliver Walters 194ae49914 Export full_name for parts 2019-09-15 22:23:34 +10:00
Oliver Walters 7f5aba423a Export full_name for parts 2019-09-15 22:23:28 +10:00
Oliver Walters db04f399c1 Simplify exporting of BOM for a part 2019-09-15 22:21:12 +10:00
Oliver Walters ed20e9d4a1 Simplify code for exporting PurchaseOrder
- New resource for managing import/export of POLineItem model
2019-09-15 22:04:52 +10:00
Oliver Walters 204cd967aa Include status label text when exporting stocktake data 2019-09-15 20:14:27 +10:00
Oliver Walters 03043e67c7 Perform full validation when importing data 2019-09-15 19:58:05 +10:00
Oliver Walters 2d17f957f1 Remove code duplication for part data export 2019-09-15 19:52:28 +10:00
Oliver Walters 2bc97764c7 Allow more file formats for BOM import 2019-09-15 19:45:59 +10:00
Oliver Walters 9c84e9076f Consolidate stock export code
- Now defined in stock.admin as StockItemResource
- Much more control over format of exported data
- Exported data can be re-imported!
2019-09-15 19:29:18 +10:00
jmht ce099f43f3 Fixes problem with 'New Purchase Order' button not working from Suppliers page. 2019-09-14 21:40:09 +01:00
Oliver Walters 70e07470db Custom URL validators for more fields 2019-09-14 00:08:49 +10:00
Oliver Walters 4ac8353099 Create a custom URL field, which allows the user-specified validators
- Ref: https://stackoverflow.com/questions/41756572/django-urlfield-with-custom-scheme
- Apply this to the URL field in the Part model
2019-09-14 00:04:08 +10:00
Oliver Walters ee17d5d3c3 Allow for custom url schemes to be specified in the config file 2019-09-14 00:03:13 +10:00
Oliver 0846daf1f6
Merge pull request #524 from SchrodingersGat/import-export
Customization of django-import-export plugin
2019-09-13 23:35:57 +10:00
Oliver Walters 8578a3b8d1 Add searching to other admin views 2019-09-13 23:32:49 +10:00
Oliver Walters 9b1d0bee3b Add filtering and searching to Part admin 2019-09-13 23:27:22 +10:00
Oliver Walters 28d49bdd47 PEP 2019-09-13 23:19:12 +10:00
Oliver Walters 6a19e94feb Include some extra calculated fields for Part export (readonly) 2019-09-13 23:15:34 +10:00
Oliver Walters 52eeffc2c4 Change more models to use ImportExportModelAdmin 2019-09-13 23:05:16 +10:00
Oliver Walters f707dd3430 Currency model admin now supports import / export 2019-09-13 23:02:54 +10:00
Oliver Walters cb5db332d3 Manager for import/export of StockItem data 2019-09-13 23:00:21 +10:00
Oliver Walters 23b814569a Manager for importing StockLocation data 2019-09-13 22:44:50 +10:00
Oliver Walters 37ab3d214d Import/export management for the Company app
- Company
- SupplierPart
- SupplierPriceBreak
2019-09-13 22:39:15 +10:00
Oliver Walters c579854e89 Export 'default_supplier' field 2019-09-13 22:29:11 +10:00
Oliver Walters 2bc34853e2 import/export manager for PartParameter 2019-09-13 22:27:32 +10:00
Oliver Walters c469e48f26 Data manager for BomItem 2019-09-13 22:23:40 +10:00
Oliver Walters bacd70687d Management class for PartCategory import / export 2019-09-13 22:20:08 +10:00
Oliver Walters 89acc778f5 Skip unchanged lines for matching ID values 2019-09-13 22:11:31 +10:00
Oliver Walters ac36048230 Improve import/export of Part
- Can now import part data
- Either UPDATE existing rows, or CREATE new ones
2019-09-13 22:08:31 +10:00
Oliver Walters 8a68313e5e Customize admin export of Part object 2019-09-13 21:39:37 +10:00
Oliver 9e1f56cdb8
Merge pull request #522 from SchrodingersGat/order-improvements
Order improvements
2019-09-13 21:16:47 +10:00
Oliver Walters 7e9c095edb Ok, fixed now 2019-09-13 21:14:00 +10:00
Oliver Walters 588713467d Fixed unit tests 2019-09-13 21:07:32 +10:00
Oliver Walters c8be9cb90c Display template badge in part table 2019-09-13 20:58:17 +10:00
Oliver Walters 36ec5e41b0 Cleanup 2019-09-13 20:53:04 +10:00