Oliver Walters
cb3c86f87a
Merge remote-tracking branch 'inventree/master' into currency-support
...
# Conflicts:
# InvenTree/InvenTree/settings.py
# InvenTree/InvenTree/urls.py
# InvenTree/templates/InvenTree/settings/tabs.html
# InvenTree/users/models.py
# requirements.txt
IMPORTANT: Had to merge some migration files due to different migrations applied on the part model tables
2020-11-12 17:24:48 +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
eeintech
bfdda847c4
Updated part migration reference in 0054
2020-11-11 11:18:10 -05:00
Francois
a7444a9926
Merge branch 'master' into categories_parameters
2020-11-11 06:40:11 -05:00
Oliver Walters
039a7badd1
A little whoopsie-doo:
...
- Part.clean() was incorrectly referencing a BomItem when it should have been referencing BomItem.part
2020-11-11 16:09:14 +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
4dff18e4a6
Remove common_currency model entirely
...
- A lot of views / pages / etc needed to be updated too
- Now uses django-money fields entirely
- Create a manual rate exchange backend (needs more work!)
2020-11-11 00:21:06 +11:00
Oliver Walters
1fc2ef5f18
Custom migration for PartSellPriceBreak
2020-11-10 22:31:46 +11:00
Oliver Walters
a6028f027a
Add setting to allow or prohibit duplicate IPN values
2020-11-10 09:03:26 +11:00
Oliver Walters
c4296ad4f1
Update migrations and translation
2020-11-09 23:47:31 +11:00
Oliver Walters
c95f124578
Add some helper magic for setting objects
...
- If the setting is defined as a "bool" then the returned value is automatically cast to a bool
- Add some more unit testing
2020-11-09 23:44:54 +11:00
Oliver Walters
75ab7b247b
Push part settings into part/settings.py
...
- Use the user-configurable defaults in the database model itself
- This means they are observed even when using the API / etc
2020-11-09 23:16:04 +11:00
Oliver Walters
e1b70ff68f
Add default values for create part form
2020-11-09 22:52:32 +11:00
eeintech
324645b67c
Added same level category checkbox and method when adding category template
2020-11-04 12:26:10 -05:00
eeintech
e401bb8e3c
Improved tests, fixed admin, improved naming
2020-11-04 12:06:07 -05:00
eeintech
1c14c2237a
Moved category templates processing to Part save() method
2020-11-04 09:52:26 -05:00
eeintech
9eba564ff6
Merge branch 'master' of git://github.com/inventree/InvenTree into categories_parameters
2020-11-04 07:52:16 -05:00
eeintech
142cea0cbb
Removed custom form save method, remove unused model methods, restored InvenTree CreateAjaxView, improved part related testing
2020-11-04 07:44:06 -05:00
eeintech
853a821497
Merge branch 'master' of git://github.com/inventree/InvenTree into fix_related_parts
2020-11-04 06:46:20 -05:00
Oliver Walters
f560be1a9a
Bug fix: Part thumbnail API list was not working
...
- Part images could not be selected from grid
2020-11-04 15:41:17 +11:00
eeintech
4e157fe956
Fixed text for parent categories checkbox
2020-11-03 17:05:08 -05:00
eeintech
279d5a00ce
Switched to get_ancestors to transverse all parents categories (not only root)
2020-11-03 16:58:53 -05:00
eeintech
5a5a36083e
Finalized implementation when creating new part
2020-11-03 16:54:46 -05:00
eeintech
0882528b82
Missing class trailing space
2020-11-03 11:15:16 -05:00
eeintech
32b46cdc2a
Added better PartRelated creation test
2020-11-03 11:14:31 -05:00
eeintech
6b702ef676
Manually merged part migrations
2020-11-03 07:27:51 -05:00
Francois
b1885138de
Merge branch 'master' into categories_parameters
2020-11-03 07:01:56 -05:00
Oliver Walters
3ea671986c
Merge conflicting migration files
2020-11-03 21:29:25 +11:00
Oliver Walters
083dac1300
Merge remote-tracking branch 'inventree/master' into build-fixes
2020-11-03 21:26:39 +11:00
Oliver
ef2c04baa8
Merge pull request #1048 from eeintech/related_parts
...
Related Parts
2020-11-03 21:18:27 +11:00
Oliver Walters
2b91f69c7d
Fix unit tests
2020-11-03 20:19:24 +11:00
Oliver Walters
b936f67d87
Various form fixes
...
- Updating forms, a lot has changed!
2020-11-03 16:21:40 +11:00
eeintech
13a07be728
Added PartCategoryParameterTemplate tests
2020-11-02 15:35:54 -05:00
eeintech
6320384ecb
Fixed category parameter template edit form
2020-11-02 15:05:37 -05:00
eeintech
34b784d1e4
Added setting, checkbox (PartCreateView only) and hook to create part parameters from category templates
2020-11-02 13:14:31 -05:00
eeintech
978b5f869d
Added checkbox to add parameter template to all categories
2020-11-02 12:20:29 -05:00
Oliver Walters
500da8099b
Add forms / views for creating a new build output, and completing the build
...
- Also some refactoring of how forms are handled and saved
2020-11-02 22:56:26 +11:00
Oliver Walters
b02c87ea50
Lots of work towards multiple build output
2020-11-02 01:24:31 +11:00
eeintech
3a347fba21
Added edit/delete for category parameter templates
2020-10-31 12:55:52 -05:00
eeintech
2a563d7370
Added category list of parameter templates table to settings
2020-10-31 09:18:33 -05:00
eeintech
3e5d8d2b2d
Added form to select category in settings and update context data
2020-10-31 08:35:47 -05:00
eeintech
5310ce8465
First step into managing Category Parameters to InvenTree settings
2020-10-30 17:17:18 -05:00
eeintech
34ff05d66e
Created PartCategoryParameterTemplate model and admin interface
2020-10-30 16:09:27 -05:00
Oliver Walters
95fadf1300
Update unit testing
2020-10-30 23:08:12 +11:00
Oliver Walters
3a702266e6
Merge remote-tracking branch 'inventree/master' into build-fixes
...
# Conflicts:
# InvenTree/InvenTree/views.py
# InvenTree/build/views.py
# InvenTree/locale/de/LC_MESSAGES/django.po
# InvenTree/locale/en/LC_MESSAGES/django.po
# InvenTree/locale/es/LC_MESSAGES/django.po
# InvenTree/order/views.py
# InvenTree/part/api.py
# InvenTree/part/views.py
# InvenTree/templates/js/bom.js
2020-10-30 22:44:25 +11:00
Oliver Walters
1caa341f8e
Fixes for unit tests
2020-10-30 21:34:56 +11:00
Oliver Walters
e049ca1a85
More refactoring
2020-10-30 16:54:05 +11:00
Oliver Walters
c533f59405
Refactor how form errors are handled
...
- Use form.add_error (as the django gods intended)
2020-10-30 16:04:56 +11:00
Oliver
fb28204dfd
Merge pull request #1093 from SchrodingersGat/bom-filters
...
Add filtering for BOM table
2020-10-30 12:45:46 +11:00
Oliver Walters
2428e77969
Add filtering for BOM table
2020-10-30 11:45:54 +11:00
