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
67f76c8bca Merge remote-tracking branch 'inventree/master' into drf-api-forms 2021-06-27 09:26:23 +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
82a6ff7772 Adds unit testing for fancy new metadata class 2021-06-23 20:58:05 +10:00
Oliver
f0db9bc3d5 Live update of Company image 2021-06-23 19:29:41 +10:00
Oliver
36e6b9f164 Set allow_null flag on image fields 2021-06-23 11:40:37 +10:00
Oliver
a866001ffe Bump API version to 6 2021-06-23 08:40:51 +10:00
Oliver
878f26c770 Enable upload of company image via the API 2021-06-23 08:39:06 +10:00
Oliver
b8e4b58df0 Catch potential error updating image that does not exist... 2021-06-22 22:23:27 +10:00
Oliver
061a120af2
Merge pull request #1705 from SchrodingersGat/part-validation 
API Validation fixes
 2021-06-22 13:39:05 +10:00
Oliver
979ef674d6 Update data for unit test fixtures 2021-06-22 13:24:03 +10:00
Oliver
40fcfe1f47 Reduce noise in logs 2021-06-22 09:32:36 +10:00
Adam Walsh
d1a2ed9af1
Fix supplier part view/edit without a manufacturer 
Fixes the following issues when a supplier part was created with an MPN but no manufacturer was assigned:
- Viewing a supplier part stock item
- Editing a supplier part stock item
 2021-06-21 11:20:43 -04:00
Oliver
e0e560352e Add forms / views for ManufacturerPartParameter CRUD 2021-06-21 16:14:58 +10:00
Oliver
70b6a3c13f Display table of parameters 2021-06-21 00:39:18 +10:00
Oliver
a00441a1c0 Adds API endpoints for ManufacturerPartParameter mdoel 2021-06-21 00:28:28 +10:00
Oliver
0013eb4c23 Adds inline for SupplierPart 2021-06-21 00:03:16 +10:00
Oliver
8188ba86a7 Adds tabular inline class for ManufacturerPartParameter 
- Super cool!
 2021-06-21 00:00:55 +10:00
Oliver
3fcb552759 Register admin class for ManufacturerPartParameter 2021-06-20 23:54:03 +10:00
Oliver
310f369394 Adds admin interface for ManufacturerPart 2021-06-20 23:49:44 +10:00
Oliver
2473318828 Add ManufacturerPartParameter model 2021-06-20 17:50:07 +10:00
Oliver
847d946fa4 Bug fixes 2021-06-20 17:39:00 +10:00
Oliver
3fb57abe66 Error catching 2021-06-18 19:39:06 +10:00
Nigel
f8e4a5ac2e
test: improve coverage of new get_destination 2021-06-09 11:04:42 -06: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
0bac7ebf3e styling 2021-06-05 17:18:46 +02: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
ffaa6ee3a9 Fixed price break row actions after sorting 2021-06-01 14:22:00 -04:00
Oliver Walters
4520bb7447 PEP style fixes 2021-05-27 16:36:26 +10:00
eeintech
b04ad48178 Fixed test using manual exchange backend, template update 2021-05-25 11:39:04 -04:00
eeintech
bbd95f2c70 Fixed exchange rate backend test 2021-05-20 14:52:56 -04:00
Matthias
0ff7ee21d0 usage of new templates 2021-05-12 15:41:48 +02:00
Matthias
f9f191b5e3 Inclusion in all tamplates 
#1574
 2021-05-12 15:31:35 +02:00
Matthias
5eb1a1f426 fixed styling 2021-05-08 12:32:19 +02:00
Matthias Mair
e59f467c79
Merge branch 'master' into spaces! 2021-05-08 12:27:19 +02:00
Matthias
b09f49aaa5 Merge branch 'master' of https://github.com/inventree/InvenTree into issue1425 2021-05-06 14:54:26 +02:00
Matthias
d5b65e6e41 yaml! 2021-05-06 14:38:13 +02:00
Matthias
a77d9d9de7 same treatment for html 2021-05-06 14:33:03 +02:00
Matthias Mair
39d4129157
chery picked all fixed trans str from #1438 (#1554) 2021-05-06 20:29:58 +10:00
Matthias
f2b0717d10 removes all lines consisting only of spaces 
this really bothers me for some reason - nothing technical
 2021-05-06 12:11:38 +02:00
Matthias
efa9da2ce1 removed unused imports 2021-05-06 00:00:13 +02:00
Matthias
1a227faec4 abstracting get_price 2021-05-05 23:42:52 +02:00
Oliver
5d214fc869
Merge pull request #1535 from eeintech/get_price 
Added support for fractional price and lower price break
 2021-05-01 09:52:21 +10:00
eeintech
4972440dda Fixed API test 2021-04-30 15:27:36 -04:00
eeintech
41962ca23a API fixes related to ManufacturerPart 2021-04-30 13:54:56 -04:00
eeintech
ad8d95f2f0 Added two more tests with fractional quantities 2021-04-29 14:35:23 -04:00
eeintech
87b38ec992 Added support for fractional part/bom quantity and price 2021-04-29 14:22:07 -04:00
Matthias
fc429708f1 [BUG] no attribute MPN 
Fixes #1524
 2021-04-27 21:38:06 +02:00
Oliver Walters
06afd4d726 Refactor "ready" state into a function 2021-04-25 10:52:31 +10:00
Oliver
157d58b157
Merge pull request #1481 from matmair/instance-name-in-title 
Instance name in title
 2021-04-18 21:48:37 +10:00
Matthias
5b9c4dc225 sipler translation strings 2021-04-18 01:21:11 +02:00
Matthias
59063bee6b extending translations to the whole sentence 2021-04-17 23:52:21 +02:00
Matthias
b1e08dae78 Merge branch 'master' of https://github.com/inventree/InvenTree into instance-name-in-title 2021-04-17 12:19:38 +02:00
Matthias
098ac0c461 using feature in views 2021-04-15 14:52:08 +02:00
eeintech
1e6c6c678f Split supplier part update migration and added reverse method for manufacturer data 2021-04-13 10:25:53 -04:00
eeintech
3eae70e745 Merged master and company migrations 2021-04-12 11:10:35 -04:00
Oliver Walters
b74d365529 Merge remote-tracking branch 'upstream/master' into django-q 2021-04-10 22:46:20 +10:00
Oliver Walters
e787c853e5 Update logger context 2021-04-10 20:08:13 +10:00
Oliver Walters
e6bd91c9e2 Company description is no longer a required field 2021-04-10 15:29:44 +10:00
eeintech
b5a5f5b409 Simplified stock table view in Part and SupplierPart detail pages 2021-04-08 13:42:35 -04:00
eeintech
f8d1ee8805 Made company description optional 2021-04-08 13:24:17 -04:00
eeintech
ccd35fc4b4 Fixed supplier part list bug and hide manufacturer fields in supplier part edit form 2021-04-07 11:50:11 -04:00
eeintech
63ade51c6c Updated migrations after merge with master 2021-04-07 10:49:19 -04:00
eeintech
f39928368e Merge branch 'master' of github.com:inventree/InvenTree into manufacturer_part 2021-04-07 10:33:55 -04:00
eeintech
b2264940a3 Dynamic control of information to make cleaner supplier and manufacturer tables 2021-04-07 09:54:20 -04:00
eeintech
734985faa9 Made manufacturer part ID dynamic for API supplier part create test 2021-04-06 14:53:35 -04:00
eeintech
52b2b9582d More tests and improved coverage (hopefully) 2021-04-06 14:30:03 -04:00
eeintech
7b4d3a3c07 Added test units for migration and API 2021-04-06 13:16:01 -04:00
eeintech
76fe535ef9 Improved delete form to show supplier parts deletion 2021-04-06 09:32:59 -04:00
eeintech
bd65a42410 Removed global setting for manufacturer parts (enabled for all users) 2021-04-06 08:49:45 -04:00
eeintech
fd66e8b136 Added MPN link to supplier part list 2021-04-05 15:41:18 -04:00
eeintech
547dcc6e80 Deleted manufacturers tab from supplier detail page 2021-04-05 15:19:34 -04:00
eeintech
58ddc47065 Updated migration files to handle duplicate manufacturer data 2021-04-05 11:21:34 -04:00
Matthias
efd14fca64 made translation lazy 2021-04-04 22:47:01 +02:00
Matthias
20c455384e added more translation-strings 2021-04-04 22:44:14 +02:00
Matthias
c68220a597 migrations for all the translated models, totally forgot that 2021-04-03 14:11:28 +02:00
Matthias
0547e1c03b added more translations in html / js 2021-04-03 04:05:59 +02:00
Matthias
446bc06c1b switched translation methode to lazy 2021-04-03 04:01:40 +02:00
Matthias
2de6fcbfa4 added missing translation fields #753 2021-04-03 03:59:09 +02:00
eeintech
45ca8d0e93 Fixes to the way ManufacturerPart is saved, manufacturer table filtering and test units 2021-04-02 11:13:57 -04:00
eeintech
bb69e38c1a Simple and View test units 2021-04-01 16:30:06 -04:00
eeintech
94574b37ae Added Manufacturer parts to search, fixed icons, added manufacturer view in supplier part detail page 2021-04-01 10:00:15 -04:00
eeintech
a8b858c824 Fixed serializer 2021-04-01 09:11:47 -04:00
eeintech
8c8b25a0d2 Validating API for SupplierPart, not able to spin-off ManufacturerPart from serialized data 2021-03-31 18:04:28 -04:00
eeintech
9e56bf90c5 More web testing, looks ready 2021-03-31 13:53:55 -04:00
eeintech
0b1f22c7fd Almost there, needs some interface testing and tweaking 2021-03-30 18:08:33 -04:00
eeintech
9c8817d73b Fixed serializers and started update of templates 2021-03-30 16:48:16 -04:00
eeintech
811f9333e8 SupplierPart manufacturer data is not serializing 2021-03-30 13:55:20 -04:00
eeintech
a4d098194b New SupplierPart manufacturer_part field 
New migration file with database update to manufacturer parts
Removed SourceItem model
 2021-03-30 13:14:30 -04:00
eeintech
50adb2ac61 SourceItem only for SupplierPart, added logic to templates 2021-03-29 15:39:25 -04:00
eeintech
e6dfb7da52 Added global setting to enable manufacturer parts 
Created SourceItem model
Updated templates
 2021-03-29 13:22:15 -04:00
eeintech
cbb887ae79 Merge branch 'master' of github.com:inventree/InvenTree into manufacturer_part 2021-03-29 10:12:20 -04:00
Oliver Walters
7a4b90649a HTML / CSS fixes 2021-03-29 16:36:27 +11:00
eeintech
e0a0bfdadb Fix style 2021-03-25 15:39:16 -04:00
eeintech
fd4f33d45b More templates updates 2021-03-24 12:39:26 -04:00
eeintech
4abd8587ab Updated company templates 2021-03-24 12:08:45 -04:00
eeintech
afd2dacfc7 Can now create, view list of parts and view detail page 2021-03-24 11:44:51 -04:00
eeintech
e28dde7f7b Fixed navbar, added missing template and urls 2021-03-23 17:45:03 -04:00
eeintech
08ffbee8ed Fixed model name and added to part navbar 2021-03-23 17:33:29 -04:00
eeintech
8f610d826f Added URLs and templates 2021-03-23 17:16:29 -04:00
eeintech
e897864396 Added ManufacturerPart model, form and views 2021-03-23 17:01:54 -04:00
Oliver Walters
9c91ba4692 Add image download functionality for company 2021-03-18 09:20:24 +11:00
Oliver Walters
4e7243b999 Add modal image overlay for company 2021-03-17 23:55:21 +11:00
Oliver Walters
47a1143570 Catch error when generating company thumbnail images 2021-03-17 11:55:51 +11:00
Oliver Walters
4a28fa7fa8 Fixes for company table 2021-03-03 08:36:16 +11:00
Oliver Walters
cd01bb0ad7 Refactor HTML view permission 
- Introspect database model from View
- Automatically get the permission from the View class
 2021-03-02 21:32:32 +11:00
Oliver Walters
34def10765 Delete un-needed code 2021-02-28 21:44:10 +11:00
Oliver Walters
44635d2499 Use server-side pagination for more list endpoints 2021-02-28 20:35:32 +11:00
Oliver Walters
b315b958b0 PEP fixes 2021-02-27 07:56:38 +11:00
Oliver Walters
5a536be22d More test refactoring 2021-02-26 22:08:06 +11:00
Oliver Walters
26e80fa0ab Fancify all the menubars 2021-02-25 09:10:20 +11:00
Oliver Walters
888fd4116c SupplierPart display now uses menubar display style 2021-02-24 21:12:41 +11:00
Oliver Walters
5525b23b9f Company view now uses menubar 2021-02-24 20:31:48 +11:00
Oliver Walters
5a58e0a298 Adds "admin" button to supplier part page 2021-02-23 13:16:03 +11:00
Oliver Walters
745188082b Add more searchable fields to SupplierPart model 2021-02-21 21:06:44 +11:00
Oliver Walters
ba71ce941f Display supplier part packaging 2021-02-19 14:34:21 +11:00
Oliver Walters
33d66182df Add "revision" number to report model 
- Auto-increments whenever the model is saved
 2021-02-05 12:01:44 +11:00
Oliver Walters
978ea7cc0b Typo fix 2021-02-04 23:11:19 +11:00
Oliver Walters
3c5169c793 So I learned something today... 
In migration files you can access the "historical" pythonic model, and use that, with *all* the helpers,
rather than writing clunky old SQL!!!!

:'(
 2021-02-04 23:10:10 +11:00
Oliver Walters
74704a7c1e Mark migrations with data operations "non atomic" 
Ref: https://docs.djangoproject.com/en/dev/howto/writing-migrations/#non-atomic-migrations
 2021-02-04 22:19:15 +11:00
Oliver Walters
140c8b5395 Use integer field instead of boolean literal (not correct SQL) 2021-02-04 21:33:10 +11:00
Oliver Walters
cabac6614c Add unit test for currency migration 2021-02-04 09:13:23 +11:00
Oliver Walters
d811f3c48a Typo fix 
(cherry picked from commit c58399206c)
 2021-02-04 08:39:27 +11:00
Oliver Walters
93f0dbd4ee Bug fix: add missing line 
(cherry picked from commit 2303e03580)
 2021-02-04 08:39:20 +11:00
Oliver Walters
ad0b59bf11 Bug fxi 
(cherry picked from commit 0e11b722be)
 2021-02-04 08:39:14 +11:00
Oliver Walters
b284fe7f2b Remove quotes around column names 
(cherry picked from commit 386cb2dd3a)
 2021-02-04 08:39:05 +11:00
Oliver Walters
29bb735dc4 Helper functions to automatically extract migration file info 2021-02-04 00:25:00 +11:00
Oliver Walters
34dbfe6d28 Test troublesome migration 0019 2021-02-03 23:16:23 +11:00
Oliver Walters
5e9097b5e0 PSQL: Upper-case column names *must* be qualified with double-quotes 
Ref: https://www.xspdf.com/resolution/53039249.html
 2021-02-03 13:16:32 +11:00
Oliver Walters
0e246a7fdf Migration fix (response is different for postgresql) 2021-02-03 13:02:28 +11:00
Oliver Walters
793e5b820e Remove all model references from migration file 2021-02-03 11:56:48 +11:00
Oliver Walters
bc43d14ebf Change model functions to raw SQL 2021-02-03 11:28:43 +11:00
Oliver Walters
f798537c73 Reverse migration company.0024 2021-02-03 09:52:59 +11:00
Oliver Walters
fef5b7548e Increase unit testing for order API 2021-01-14 22:06:53 +11:00
Oliver Walters
2a91bb0c87 Update SupplierPart model to allow data importing 
- django-import-export plugin seems to require null=True for char fields
- yes, this goes against django "best practice"
- Hopefully a better solution can be found
 2021-01-03 22:16:32 +11:00
Oliver Walters
607cc90ce0 Add extra context to SupplierPartCreate form 
(cherry picked from commit 5f8f0232a9)
 2020-11-27 11:18:23 +11:00
eeintech
11745ebd6c Removed one too many indent 2020-11-19 15:32:42 -05:00
eeintech
4768c9cbb3 Fixed validation of SupplierPart edit form by forcing the value of single_pricing field 2020-11-19 15:31:39 -05:00
Oliver Walters
599220a931 Fixes for custom SQL queries 
- Don't use double quotes!
- NO NO NO!
- Single quotes only
 2020-11-19 09:15:16 +11:00
Oliver Walters
0f42916521 Improve settings.py 
- Load database config from either config.yaml or environment variables
- Mix and match, if you want!
- Move to use logging module rather than just printing stuff
- Error if required database parameters are not required
 2020-11-13 13:38:01 +11:00
Oliver Walters
362437e75e PEP fixes 2020-11-13 07:28:21 +11:00
Oliver Walters
f239c8f8c8 Add missing migration file 2020-11-12 22:04:50 +11:00
Oliver Walters
ae7fbd6112 Add PEP8-naming extension for flake 
- Enforcing python naming checks
 2020-11-12 21:53:04 +11:00
Oliver Walters
47cbf3071d Add option to add a single-quantity price-break when creating a new SupplierPart object 
- Add unit testing!
 2020-11-12 21:36:32 +11:00
Oliver Walters
fd79f1ea0e Fixes for 'single pricing' for SupplierPart 2020-11-12 19:46:19 +11:00
Oliver Walters
51d2d85c26 When creating a new price break for a supplier part, default to using the currency code specified for the supplier company 2020-11-12 11:14:50 +11:00
Oliver Walters
1532be9c1e Add 'currency' option for company 
- e.g. an external supplier might have a default currency
- Adds a form input which only allows selection of allowed currency codes
- Add unit testing for currency validation
 2020-11-12 11:02:10 +11:00
Oliver Walters
ebac06ebee Add 'single_pricing' form to the EditSupplierPartForm 
- Idea here is to automatically create a unit-pricing price-break when a new SupplierPart is created
 2020-11-11 13:55:25 +11:00
Oliver Walters
fc89501a62 Fix for SQL cursor query 
- What works in SQLite don't necessarily fly with the big boys
 2020-11-11 08:06:14 +11:00
Oliver Walters
a19cf1f27a PEP fixes 2020-11-11 00:26:59 +11:00