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
13,204 Commits 6 Branches 99 Tags 484 MiB
9bcbaaa5f5
Commit Graph

198 Commits

Author SHA1 Message Date
Matthias Mair
0d9f76a019
Merge branch 'inventree:master' into matmair/issue2279 2021-12-04 17:52:58 +01:00
Oliver
087ac0bd34 Adds filter to purchase order for "assigned to me" 2021-12-04 21:15:38 +11:00
Matthias
0f0460f8ea
merge 2021-12-02 17:24:07 +01:00
Matthias Mair
11e527a02a
Merge branch 'inventree:master' into plugin-2037 2021-12-02 09:23:05 +01:00
Matthias Mair
fcf7f615aa
Merge branch 'inventree:master' into webhooks 2021-12-02 09:22:48 +01:00
Matthias
61b53a10b0
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2279 2021-12-01 23:59:22 +01:00
Oliver
da6c723184 Merge branch 'master' into partial-shipment 
# Conflicts:
#	InvenTree/order/serializers.py
 2021-11-29 22:59:36 +11:00
Matthias
9454b51866
fix rules 2021-11-28 17:18:46 +01:00
Matthias
ace4370ee9
add ruleset 2021-11-28 16:50:34 +01:00
Matthias
90b3f63851
add ruleset 2021-11-28 16:47:40 +01:00
Matthias
91bc865887
remove webhook ruleset 2021-11-19 23:19:02 +01:00
Matthias
260c51f6fc
Pulls out the webhook dev for partial merge 
Fixes #2036
 2021-11-19 22:35:28 +01:00
Matthias
9ae8474ed9
fix test 2021-11-12 02:34:18 +01:00
Oliver
d5cf2b08ac Merge remote-tracking branch 'inventree/master' into partial-shipment 
# Conflicts:
#	InvenTree/InvenTree/version.py
#	InvenTree/order/models.py
 2021-11-11 12:35:59 +11:00
Matthias
d982bfe201
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-11-10 00:37:49 +01:00
Matthias
2835022330
merge 2021-11-10 00:30:21 +01:00
Oliver
f1eaeef949 PEP fixes 2021-11-08 16:53:43 +11:00
Oliver
ca0619a482 Adds API filtering for the "user" list 2021-11-08 16:53:15 +11:00
Oliver
3d553cf7de Adds search capability to "owner" API 
- Currently a bit of a hack, but it works...
 2021-11-08 16:49:15 +11:00
Matthias
df72cb2608
merge upstream 2021-11-04 23:44:41 +01:00
Matthias
363f21d6d7
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-11-04 10:10:58 +01:00
Oliver
bebf368d06 Add functionality and unit testing for new model 2021-11-04 01:11:42 +11:00
Oliver
ef2307aeaa Add new model to permissions table 2021-11-04 00:46:23 +11:00
Matthias
61d3ea6293
refactor underscore handeling into function 2021-11-01 22:33:56 +01:00
Matthias
78d9e906da
remove testing string 2021-11-01 22:28:38 +01:00
Matthias
3e3da8b2d1
fix permission parser 2021-11-01 22:23:51 +01:00
Matthias
6dead88028
fix permission parsing if underscores in perm 2021-11-01 17:06:13 +01:00
Matthias
a8e18a7972
handle modelnames / permissions with underscores 2021-11-01 00:24:57 +01:00
Matthias
fc566621b7
add rulesets 2021-11-01 00:24:21 +01:00
Oliver
2f7e0974b7 Add 'shipment' foreign-key field to SalesOrderAllocation model 2021-10-25 17:42:56 +11:00
Matthias
32122102e6
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-10-15 23:36:19 +02:00
Oliver
51efd6b2e4 Add permissions for new mdoel 2021-10-13 14:06:36 +11:00
Matthias
9aaf4c25e1
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-10-12 22:23:45 +02:00
Oliver
40e5536300 Handle rare case where user instance has no name assigned 2021-10-11 21:39:34 +11:00
Matthias
ca3e9709e1
rueset for messafe 2021-09-12 22:46:41 +02:00
Matthias
440311cddb
ruleset 2021-09-12 17:36:57 +02:00
Matthias
28f0e99b84
rulesets for all_auth 2021-08-30 22:43:50 +02:00
Matthias
69ff0ac248 ruleset 2021-07-22 23:39:36 +02:00
Oliver
bd4dde2cb7 Add permissions for PartLabel model 2021-07-08 23:22:25 +10:00
Oliver
993abd9d91 Refactor forms for sales orders 2021-07-03 00:14:36 +10:00
Oliver
5e9372f2d6 Add API endpoints for Owner model 
- Will be necessary for PurchaseOrder, SalesOrder and BuildOrder forms
 2021-07-02 22:45:42 +10:00
Oliver
82a6ff7772 Adds unit testing for fancy new metadata class 2021-06-23 20:58:05 +10:00
Oliver
5ba7aeaa27 Fixes: 
- Use DRF ImageField, not FileField
- Ensure that permissions get updated correctly in 'test' mode
- Allow file upload in the APITester class
 2021-06-23 10:28:21 +10:00
Oliver
213e4dccc5 Add model to permission set 2021-06-21 08:35:54 +10:00
Matthias
06d3489ede fix: added ruleset 2021-06-05 18:06:26 +02: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
Oliver Walters
f766711838 Add fixture for users / groups 2021-04-25 11:41:48 +10:00
Oliver Walters
06afd4d726 Refactor "ready" state into a function 2021-04-25 10:52:31 +10:00
Oliver Walters
2d7bff0773 Prevent auto-update of group permissions during loaddata stage 2021-04-25 10:30:56 +10:00
Oliver Walters
4a522bb05a Allow 'admin' account access to the report models 2021-04-22 14:53:42 +10:00
Oliver Walters
0fbf39f1bc More fixes 2021-04-20 10:59:28 +10:00
eeintech
3eae70e745 Merged master and company migrations 2021-04-12 11:10:35 -04:00
Oliver Walters
e787c853e5 Update logger context 2021-04-10 20:08:13 +10:00
Oliver Walters
731ec25b24 Merge remote-tracking branch 'inventree/master' into django-q 
# Conflicts:
#	.github/workflows/style.yaml
#	.travis.yml
#	InvenTree/InvenTree/settings.py
 2021-03-31 22:17:38 +11: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
e78455085f Merge branch 'master' of github.com:inventree/InvenTree into manufacturer_part 2021-03-30 11:30:47 -04:00
Oliver Walters
1a288168b7 PEP fixes 2021-03-30 10:00:43 +11:00
Oliver Walters
58c30f48d5 Remove extra whitespace 2021-03-30 09:28:02 +11:00
Oliver Walters
0b78f3d931 Add unit testing for migrations 2021-03-30 08:42:44 +11:00
Oliver Walters
32cfe1b954 Emit warning rather than raise error 
- All calling functions check for None anyway
 2021-03-30 08:25:51 +11:00
eeintech
50adb2ac61 SourceItem only for SupplierPart, added logic to templates 2021-03-29 15:39:25 -04:00
eeintech
c85d737446 Fix CI 2021-03-25 15:04:48 -04:00
Oliver Walters
9d404afec0 Add 'ignore' rules for the django-q tables 2021-03-12 16:00:25 +11:00
Oliver Walters
c07f217416 Add "ignore" rules for new report models 2021-03-12 14:01:20 +11:00
Oliver Walters
753483e6c2 Use app label rather than table name for permission lookup 
- For legacy reasons there are some tables that are not named according to their app_label
- Simply use the app_label instead
 2021-03-02 19:34:56 +11:00
Oliver Walters
f6e982ce81 Fixes incorrect table name 2021-03-02 15:34:45 +11:00
Oliver Walters
5069882a7f URL tweaks 2021-02-27 22:41:36 +11:00
Oliver Walters
9d099c81a7 Refactor API tests for stock 2021-02-26 21:53:54 +11:00
Oliver Walters
6e3cb326fb Use better introspection, no longer required "role_required" 2021-02-26 21:36:40 +11:00
Oliver Walters
0f6cdd0037 Improve unit testing for new role endpoint 2021-02-26 21:04:09 +11:00
Oliver Walters
aad92902f2 Unit tests for new role view 2021-02-26 20:37:12 +11:00
Oliver Walters
2460965fef Add some more context data 2021-02-26 17:55:56 +11:00
Oliver Walters
5c61c18dc4 Add API endpoint which provides list of role permissions available to current user 2021-02-26 17:52:06 +11:00
Oliver Walters
6b48f0db43 Unit test fixes 2021-02-16 20:56:18 +11:00
Oliver Walters
98d291c2f8 Add model rule for ReportSnippet 2021-02-04 19:26:43 +11:00
eeintech
72c7ceb553 Merged master and updated stock_table.html 2021-01-17 13:11:59 -05:00
Oliver Walters
0134597747 Merge remote-tracking branch 'inventree/master' into label-api 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
 2021-01-14 23:56:23 +11:00
eeintech
c5778b6fb6 Added missing migration file (how did it escape?) 2021-01-13 17:33:55 -05:00
eeintech
e92e5dfe8f Merged master 2021-01-13 17:08:01 -05:00
eeintech
af1abb7129 Added missing migration file 2021-01-13 14:57:16 -05:00
eeintech
59c0a50289 Separated category from part permissions and location from stock item permissions 2021-01-13 13:35:49 -05:00
eeintech
28fb1b5fab Added owner model to admin page and added test cases 2021-01-13 11:38:37 -05:00
eeintech
5ca03af3e2 Improved Owner.get_owner method and fixed tests (try#2) 2021-01-12 16:36:29 -05:00
eeintech
49c954aa68 Fixed test cases? 2021-01-12 15:02:44 -05:00
eeintech
b6135fda74 Updated templates and a lot of manual testing 2021-01-12 13:16:04 -05:00
eeintech
9eace09e0e Added owner create method and fixed post_save receiver 2021-01-12 10:53:17 -05:00
eeintech
6f3cbb4e14 Switched to global owner model, need to validate use-cases table and fix tests 2021-01-11 17:41:29 -05:00
Oliver Walters
a0d1f95171 Add exception for new database table 2021-01-09 08:10:04 +11:00
eeintech
1ef5a2b481 Display permission levels for each ruleset in Group admin list view 2020-12-10 15:38:48 -05:00
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
Francois
a7444a9926
Merge branch 'master' into categories_parameters 2020-11-11 06:40:11 -05:00
Oliver Walters
56765d3f5a Fix for unit testing 2020-11-11 15:19:15 +11:00
Oliver Walters
5567ad07fd Update tests and translations 2020-11-11 00:31:39 +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
eeintech
684db67733 Added check for remove too 2020-11-05 09:37:01 -05:00
eeintech
0b76d1d036 Check if permission is not NoneType before adding to group 2020-11-05 09:34:18 -05:00
Francois
b1885138de
Merge branch 'master' into categories_parameters 2020-11-03 07:01:56 -05:00
Oliver Walters
083dac1300 Merge remote-tracking branch 'inventree/master' into build-fixes 2020-11-03 21:26:39 +11:00
Oliver
1c503adced
Merge pull request #1026 from eeintech/user_unique_group_validation 
Added check for multiple groups assigned to user
 2020-11-03 21:21:08 +11:00
Oliver Walters
2b91f69c7d Fix unit tests 2020-11-03 20:19:24 +11:00