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,050 Commits 6 Branches 99 Tags 484 MiB
6367f1a9ed
Commit Graph

536 Commits

Author SHA1 Message Date
Oliver Walters
ae9ef04013 Use the company thumbnail in the Company API 2020-04-07 11:27:56 +10:00
Oliver Walters
e0655f61d8 Check if Company thumbnails are created on Company app start 2020-04-07 11:23:30 +10:00
Oliver Walters
1a233e7949 Create thumbnails for Company model 2020-04-07 11:17:00 +10:00
Oliver Walters
1356718bb7 Improver company website icon 2020-04-07 00:19:43 +10:00
Oliver Walters
44c10c45cd visual consolidation 2020-04-06 20:50:33 +10:00
Oliver Walters
a306ad0bc3 Alter "URL" to "link" for Company models 2020-04-06 11:36:25 +10:00
Oliver Walters
67a73c1fbf auto-fill price break with default quantity 2020-03-31 22:11:16 +11:00
Oliver Walters
5af2fae120 Simplify URLs for purchase orders 2020-03-22 19:47:08 +11:00
Oliver Walters
01f1ac49e3 Improve SupplierPart detail page 2020-03-19 10:23:41 +11:00
Oliver Walters
6731bc1b06 Implement auto-rounding decimal field 
Ref: https://stackoverflow.com/questions/37958130/automatically-round-djangos-decimalfield-according-to-the-max-digits-and-decima
 2020-03-18 22:22:40 +11:00
Oliver Walters
7dcc94b106 Filter purchaseorder API by supplier part 2020-02-12 12:44:52 +11:00
Oliver Walters
33d21594da Create new stock item from supplierpart stock page 
- Allow stock-item-create form to have supplierpart passed as initial data
- Add some translations too
 2020-02-12 11:32:01 +11:00
Oliver Walters
6d80788618 Allow stock-filtering and export using SupplierPart ID 2020-02-12 11:16:00 +11:00
Oliver Walters
8dd8505a2c More tab updates 
- Add Stock tab
- Add Stock table for supplier part
- Allow stock API to be filtered by supplier-part ID
- Add Orders tab
 2020-02-12 11:09:37 +11:00
Oliver Walters
d9d21395d9 Add a 'pricing' tab for SupplierPart 2020-02-12 10:48:25 +11:00
Oliver Walters
63b70614b6 Create 'tabs' for SupplierPart view 2020-02-12 10:42:45 +11:00
Oliver Walters
50fee1bfe5 More work on translations 2020-02-12 10:25:46 +11:00
Oliver Walters
d0a7a24649 Add translatable strings 2020-02-02 21:43:10 +11:00
Oliver Walters
908e2ef8bc Add glyphicon for company notes 2020-02-02 11:54:09 +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
71c1faf9ff Use the client-side PO table in more places 2019-12-09 21:55:00 +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
98374ca466 Update to more recent libraries 
- Specify exact module versions
 2019-12-05 14:12:05 +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
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
ae2e2f36e4 Update a bunch more tables 2019-09-22 22:18:53 +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
1cffd41c07 Fix broken price-break buttons 
- Did not work!
 2019-09-17 10:54:28 +10:00
Oliver Walters
55ebf48684 Add more export fields for SupplierPart and SupplierPriceBreak 2019-09-16 09:43:57 +10:00
Oliver Walters
03043e67c7 Perform full validation when importing data 2019-09-15 19:58:05 +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
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
37ab3d214d Import/export management for the Company app 
- Company
- SupplierPart
- SupplierPriceBreak
 2019-09-13 22:39:15 +10:00
Oliver Walters
7e9c095edb Ok, fixed now 2019-09-13 21:14:00 +10:00
Oliver Walters
36ec5e41b0 Cleanup 2019-09-13 20:53:04 +10:00
Oliver
afdea818f7
Merge pull request #510 from SchrodingersGat/delete-lead-time 
Remove lead-time field
 2019-09-12 22:45:58 +10:00
Oliver Walters
91453094aa Remove lead-time field 2019-09-12 22:37:09 +10:00
Oliver Walters
31625aa4bb Fix buttons for edit/delete supplier price break 2019-09-12 21:53:29 +10:00
Oliver Walters
231a669fe5 Export stock based on supplier 2019-09-08 23:53:09 +10:00
Oliver Walters
efc08f6824 Improve table sorting for company list 2019-09-07 20:47:02 +10:00
Oliver Walters
af8a96e080 Add option to edit currency 2019-09-03 09:55:15 +10:00
Oliver Walters
09cb82cdc0 Fix converted_cost 
- Incompatibility between float and decimal
 2019-09-03 09:46:32 +10:00
Oliver Walters
c6a435eba0 Add currency field to SupplierPriceBreak 2019-09-03 09:34:32 +10:00
Oliver Walters
f3e161564d Fix for serialization of company images 2019-09-02 22:06:42 +10:00
Oliver Walters
23d19d6784 Remove old debug messages 2019-07-11 23:07:52 +10:00
Oliver Walters
20ec36d3ea Enforce authentication for API access 2019-07-08 19:20:00 +10:00
Oliver Walters
16e1be61f5 Fix buttons and rendering for supplierpart page 2019-07-08 19:15:20 +10:00
Oliver Walters
b185abbb87 Catch case in which a request.GET is not available 
(cherry picked from commit 9296c0ba0f8c4914cd04b820c6172f8c3a794750)
 2019-07-08 09:41:20 +10:00
Oliver Walters
d5119e1aff Replace some cog icons 2019-06-20 21:28:00 +10:00
Oliver Walters
fefbcf2ed9 Clean up buttons for stock location 2019-06-19 18:49:05 +10:00
Oliver Walters
05a5ab222d Some more changes 2019-06-19 08:09:05 +10:00
Oliver Walters
776ca7db12 Visual style for build 2019-06-19 08:03:39 +10:00
Oliver Walters
3e6cdb15be Clean up display of company pages 
- Add some more buttons
- visual style consolidation
 2019-06-19 07:48:05 +10:00
Oliver Walters
7effe3af9d Add buttons to company page 2019-06-19 00:01:30 +10:00
Oliver Walters
b9dc4a0c2f Further tests for order 2019-06-17 22:10:37 +10:00
Oliver Walters
0857ec61fd Add a test fixture for orders 2019-06-17 19:47:16 +10:00
Oliver Walters
0fa8e3809e Limit PO selection to only those which are PENDING 2019-06-15 15:33:03 +10:00
Oliver Walters
ff6df9741f Perform model validation on API serializers 
If you have a class, why not subclass it?!
 2019-06-13 23:03:58 +10:00
Oliver Walters
74327d3094 Order from supplier 'parts list' page 2019-06-12 00:10:39 +10:00
Oliver Walters
d8d41c6eff PEP fixes 2019-06-10 23:08:08 +10:00
Oliver Walters
04a9b1a980 Create a new purchase order from a company page 2019-06-10 22:56:34 +10:00
Oliver Walters
c132f275f5 Split display of purchase orders by company view 2019-06-10 22:43:09 +10:00
Oliver Walters
9efdd836f4 Tweak the 'on_order' calculation 2019-06-10 21:56:50 +10:00
Oliver Walters
351c5fb7d0 Fix for 'on_order' calculation 
- Handle null results
 2019-06-07 09:54:36 +10:00
Oliver Walters
31ad31365a Calculate parts on order for a Part / SupplierPart 2019-06-07 08:37:25 +10:00
Oliver Walters
04abe2b3d1 Display list of purchase orders against a particular supplier par 2019-06-05 21:50:11 +10:00
Oliver Walters
67248ec4dd List purchase orders for a given part 2019-06-05 21:47:22 +10:00
Oliver Walters
e199ed2281 PEP fixes 2019-06-05 00:21:19 +10:00
Oliver Walters
8d70d2f28a Fix rendering of purchase order status codes 2019-06-04 23:14:57 +10:00
Oliver Walters
76a72be926 Add order status field 
- Display status field in PurchaseOrder list view
 2019-06-04 23:09:51 +10:00
Oliver Walters
da53de844a Add page for detailing company purchase orders 2019-06-04 22:39:46 +10:00
Oliver Walters
c45d8a5782 Add 'purchase orders' tab for company 2019-06-04 22:35:34 +10:00
Oliver Walters
7a3b186a0c Fix double loading of modals.html 2019-06-03 21:51:59 +10:00
Oliver Walters
a305301b95 Switch between display and edit mode for build allocations 2019-05-27 08:07:38 +10:00
Oliver Walters
d563e873ed Change some icons 2019-05-26 00:35:52 +10:00
Oliver Walters
c45a506a10 Rename field part.has_variants to part.is_template 2019-05-25 23:58:31 +10:00
Oliver Walters
c3d75deb16 More 'limit_choices_to' limitations for template parts 2019-05-25 23:55:16 +10:00
Oliver Walters
d5da93b9d0 Make supplier part list API searchable 2019-05-24 21:33:45 +10:00
Oliver Walters
5664fc5472 Detail in StockItem API now optional 2019-05-23 22:57:45 +10:00
Oliver Walters
9052ccc181 Make 'part_detail' field in SupplierPart serializer optional 2019-05-23 22:44:37 +10:00
Oliver Walters
4d35841233 Consolidate on 'pk' as the ID field in the API 2019-05-23 00:31:27 +10:00
Oliver Walters
cd7bc6cce5 Include pricing information in part supplier view 
Also some CSS tweaks to secondary modal buttons
 2019-05-22 22:11:27 +10:00
Oliver Walters
2817e6ca31 Added further part pricing 2019-05-21 14:08:40 +10:00
Oliver Walters
cdcc4f9ca1 Simple tests for price breaks 2019-05-21 13:53:25 +10:00
Oliver Walters
6f73c379c2 Remove 'minimum' order from SupplierPart 
- This can be handled using the 'PriceBreak' set
 2019-05-21 13:51:43 +10:00
Oliver Walters
357bfdae3f Add some test fixtures for Company app 2019-05-21 13:33:05 +10:00
Oliver Walters
f19d4eec79 Improve query speed for supplierpart api 2019-05-21 08:19:16 +10:00
Oliver Walters
6ae48d07c4 Cleanup pricing algorithms 2019-05-20 23:53:39 +10:00
Oliver Walters
4bde00d925 AND AGAIN 
Use --fake to force the migration
 2019-05-20 22:24:18 +10:00
Oliver Walters
70be052c74 Rebuilt migrations again (arrrrrrrrrrrrrrrrrrrrrrrrrrgh never do this) 2019-05-20 21:45:37 +10:00
Oliver Walters
9ddedc6915 Restart migrations 
- Easier to delete all the migrations and start again :'(
 2019-05-19 00:11:41 +10:00
Oliver Walters
4c82714777 Allow 5 decimal places for pricing info 2019-05-18 23:08:47 +10:00
Oliver Walters
cdc55bb5d3 PEP fixes 2019-05-18 23:08:42 +10:00
Oliver Walters
a3d1591929 Display part pricing in Part view 
- Calculate min_price and max_price based on provided supplier information
 2019-05-18 23:08:38 +10:00
Oliver Walters
0cfb243eb3 Move SupplierPart and SupplierPriceBreak to the 'Company' app 
- https://docs.djangoproject.com/en/2.2/ref/models/options/#django.db.models.Options.db_table
- https://stackoverflow.com/questions/3519143/django-how-to-specify-a-database-for-a-model
- And others, presumably
 2019-05-18 23:08:34 +10:00
Oliver Walters
5043c354b1 Set default value for SupplierPriceBreak 
Edit or Delete a SupplierPriceBreak
 2019-05-18 23:08:30 +10:00
Oliver Walters
fc3072a459 Form for creating a new price break for a supplier part 2019-05-18 23:08:25 +10:00
Oliver Walters
b77b6d2256 Display number of supplier parts in supplier list 2019-05-16 22:29:39 +10:00
Oliver Walters
0a1887477c Create template for stock table 2019-05-16 22:15:44 +10:00
Oliver Walters
7ef448d205 PEP 2019-05-16 21:26:53 +10:00
Oliver Walters
64a82389a2 Add ability for Company model to count stock sourced from that supplier 2019-05-16 21:26:12 +10:00
Oliver Walters
1b06cd23af Add 'stock' tab for supplier page 2019-05-16 21:16:19 +10:00
Oliver Walters
292e29e95e Add some more secondary modals 2019-05-15 07:50:54 +10:00
Oliver Walters
a1d587b7f4 Rename 'Company' to 'Suppliers' in front-end 2019-05-15 07:44:13 +10:00
Oliver Walters
fcdddf6bb6 Cleaup for delete supplier part form 2019-05-13 22:52:20 +10:00
Oliver Walters
0e0096467c Update delete form for Company objects 2019-05-13 22:50:05 +10:00
Oliver Walters
d5dbc1b072 Display supplier part URL in table 2019-05-12 12:20:15 +10:00
Oliver Walters
1d36ea3e2e Add a 'full_name' field for Part 
- Combines IPN | Name | Variant
- Use this to display in most views
 2019-05-12 12:16:04 +10:00
Oliver Walters
01778f996e PEP fixes 2019-05-10 20:12:15 +10:00
Oliver Walters
ba2f565e35 docstring improvements 
- Added Attribute docstring to all model objects
 2019-05-10 20:11:52 +10:00
Oliver Walters
ca6bd0a999 Add page title for company page 2019-05-09 18:17:28 +10:00
Oliver Walters
15cd93a773 Display company thumb in company index 2019-05-09 00:49:19 +10:00
Oliver
fa2bf947ab
Merge pull request #267 from SchrodingersGat/bom-img 
BOM table improvements
 2019-05-09 00:42:33 +10:00
Oliver Walters
94ad378b9d Part and company images return the 'no image found' image if they do not have an image 2019-05-09 00:39:51 +10:00
Oliver Walters
e9c904076f Added help text for model fields 2019-05-08 23:32:57 +10:00
Oliver Walters
58e5b10d26 Display supplier logo in part suppliers list 
- Also add a background colour for popup image in case of transparent image file
 2019-05-08 20:23:54 +10:00
Oliver Walters
0754afd5f5 Display icons in supplier_part list 
- Bug fix for part list API query
 2019-05-08 20:16:53 +10:00
Oliver Walters
e58bed41b0 Visual style improvements 2019-05-07 21:24:09 +10:00
Oliver Walters
dcbd5d819c Enable DnD for Company image 
- Can actually use the existing form to do partial upload!
- Generecise the drag-and-drop upload function
- Remove some (now unnecessary) Python View code
 2019-05-07 14:47:31 +10:00
Oliver Walters
a03027ec9b Add makefile option for quick backup 2019-05-07 07:46:29 +10:00
Oliver Walters
4ef1e4fc78 Explicitly mark some CharField as non blank 2019-05-04 17:01:31 +10:00
Oliver Walters
2eb825b0e6 Improved table rendering 2019-05-04 00:02:53 +10:00
Oliver Walters
08b429fdb8 SupplierPart detail page now splits details into two columns 
- Price details in right-hand column
 2019-05-02 01:15:26 +10:00
Oliver Walters
436d158cfe Merge remote-tracking branch 'inventree/master' into build-allocation 
# Conflicts:
#	InvenTree/company/templates/company/tabs.html
 2019-05-01 08:15:58 +10:00
Oliver Walters
7e7ac60a1a Tweaks 
- Can't edit build status directly
- Refresh BOM table on reload
- Hide Company tabs that are not yet functional
 2019-04-30 20:55:28 +10:00
Oliver Walters
3b838d29ec Small fixes 
- Hide some tabs that aren't functional yet
- Hide fields instead of marking them as disabled
- Default behaviour is to allow all hosts
 2019-04-29 18:35:16 +10:00
Oliver Walters
d55ea1a982 PEP fixes 2019-04-28 01:09:48 +10:00
Oliver Walters
aa04941bf1 Add module-level docstrings for each app 2019-04-28 01:05:45 +10:00
Oliver Walters
a499fd325e Docstring for Stock app 2019-04-27 22:49:16 +10:00
Oliver Walters
ed3ae30248 Documentation for Part app 2019-04-27 22:18:07 +10:00
Oliver Walters
c3f0570926 Add docstring to Company app 2019-04-27 20:43:27 +10:00
Oliver Walters
0484e62836 PEP fixes 2019-04-27 15:25:40 +10:00
Oliver Walters
1fbea088dc Added API test for Company app 2019-04-27 15:02:20 +10:00
Oliver Walters
08aca6a5a8 Fix rendering for company part list 2019-04-26 23:08:13 +10:00
Oliver Walters
9ae5ea3876 Add RUD endpoint for Company 2019-04-26 21:44:38 +10:00
Oliver Walters
3c40418f04 100% coverage on company/models.py 2019-04-25 04:20:40 +10:00
Oliver Walters
7b68310d73 PEP fixes 2019-04-25 03:20:25 +10:00
Oliver Walters
a2d4403968 Reverse lookup for company URL 
- Added some simple tests
 2019-04-24 23:55:11 +10:00
Oliver Walters
41ee6320a8 Delete some other old templates 2019-04-18 23:44:15 +10:00
Oliver Walters
4f51258cf8 Removed old forms in Part 2019-04-18 23:39:05 +10:00
Oliver Walters
e57303ed37 Removed old forms from Company 2019-04-18 23:35:20 +10:00
Oliver Walters
52c3a63c61 Updated SupplierPriceBreak page 2019-04-17 00:48:01 +10:00
Oliver Walters
29f33a8eec Move button locations into bootstrap-table headers 
- part category
- stock location
- build list
- company list
- supplier part list
 2019-04-16 11:46:07 +10:00
Oliver Walters
ac3a4e3de4 PEP fixes for /company 2019-04-14 09:30:45 +10:00
Oliver Walters
8a3706dd76 Added MPN field to supplier part lists 2019-04-12 21:54:53 +10:00
Oliver Walters
7341fe4542 Fix modal form for creating company 2019-04-12 21:09:31 +10:00
Oliver
7644617af0 Better string formatting for models 
Allows for easier searching in drop-downs for ForeignKeys
 2018-05-09 00:17:39 +10:00
Oliver
233f093093 Update supplier part detail page 
- Consolidated buttons into dropdown
- Make look like other pages
 2018-05-09 00:12:21 +10:00
Oliver
3f1c6e2059 Simplified modal calls 
- Default modal target supplied (can be overridden in options)
 2018-05-08 19:55:39 +10:00
Oliver
c5155d5ac7 Move modal JS file 
- Loaded by base.
 2018-05-08 19:40:29 +10:00
Oliver
e746ca6e0a Paginate company page 2018-05-07 18:16:12 +10:00
Oliver
c1e7e95fc0 UI improvements 
Consolidated detail pages with OPTIONS drown down
(rather than multiple single buttons)
 2018-05-06 22:09:15 +10:00
Oliver
395bf23d6c Cleanup / formatting 2018-05-04 01:33:13 +10:00
Oliver
9ad20e85e3 Improve CSS for modal forms 2018-05-04 00:56:29 +10:00
Oliver
17e6147c47 Click on company image to edit it 2018-05-03 23:57:00 +10:00
Oliver
f995f54390 More API / JSON stuff 
- SupplierPart JSON API
- Part supplier list
- Company part list
 2018-05-03 00:47:03 +10:00
Oliver
be0797c6e6 Bootstrap table to company list 2018-05-02 23:17:24 +10:00
Oliver
211edb23bb Removed footable 
- Now using bootstrap-table
 2018-05-02 22:22:43 +10:00
Oliver
feff4f0ddd Add 'Contact' model to Company app 2018-04-30 17:20:01 +10:00
Oliver
bee760d184 Deleted extraneous form code 2018-04-30 00:59:36 +10:00
Oliver
a9c20f5d95 Added modal form success messages 
- More to be done, just a start
- Create / edit / delete
 2018-04-30 00:23:02 +10:00
Oliver
095492203f Simplified javascript templating 
- Load js modules in block js_load
- Write $(document).ready script in block js_ready
- Write any other js in block_js
 2018-04-28 12:45:12 +10:00
Oliver
bc597d7c21 Style fixes 2018-04-28 01:16:47 +10:00
Oliver
3de80fe059 Modalized 'new-supplier-part' from supplier page 2018-04-27 22:14:25 +10:00
Oliver
4794714a09 Modal form for company-delete 2018-04-27 22:07:11 +10:00
Oliver
36cf946a78 Modal for company create 
- Ajax modals now return the URL of the item they are operating on
- passing {follow: true} to the modal caller will go to that URL on success
- footable'd company list
 2018-04-27 21:58:22 +10:00
Oliver
c4e305bde6 Loaded both modals into single include 2018-04-27 21:35:36 +10:00
Oliver
e1e3cc71e6 More modal forms 
- supplier-part-edit
- supplier-part-delete
 2018-04-27 21:32:48 +10:00
Oliver
1df1bf2c07 Added 'URL' field to company 2018-04-24 18:01:15 +10:00
Oliver
25fcd3e9f1 Simple search filtering for part list 
- Needs to be 'generecised'
- Working well for now
 2018-04-24 09:06:30 +10:00
Oliver
08ed128bea PEP style fixes 2018-04-23 21:18:35 +10:00
Oliver
86a9b36c99 Add part-list API 
- Deleted some old serializers
- Simply list of parts
- Search by name / description
- Orderable by name
 2018-04-23 21:10:13 +10:00
Oliver
f1a5b3c1ca Add AJAX filtering of company list 
- Search across NAME and DESCRIPTION fields
- TODO - Implement pagination (how?)
 2018-04-23 20:37:36 +10:00
Oliver
6c1784b5b9 Implement (basic) JSON API for company model 
- Pagination
- Search company name and description
- Filter by is_customer and is_supplier
 2018-04-23 19:46:40 +10:00
Oliver
97f05f85de Added TODO entry 2018-04-22 23:16:12 +10:00
Oliver
ac3de4ce3d Add part detail page for company / supplier 2018-04-22 23:07:23 +10:00
Oliver
4ebd8cd6b1 Added company details tab 2018-04-22 22:44:49 +10:00
Oliver
d44a4e174b Added 'tabs' to company view 2018-04-22 22:38:35 +10:00
Oliver
ee2f262e19 Company index / detail / edit pages working 2018-04-22 22:21:50 +10:00
Oliver
4bedf0ed4c Finally got migrations working together 2018-04-22 21:54:12 +10:00
Oliver
cef3c664f9 Moving 'supplier' to 'company' 2018-04-19 09:01:25 +10:00