2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-05-01 21:16:46 +00:00

135 Commits

Author SHA1 Message Date
Matthias
bb2ad7c2cb
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-12-04 18:04:47 +01:00
Oliver
087ac0bd34 Adds filter to purchase order for "assigned to me" 2021-12-04 21:15:38 +11:00
Matthias Mair
11e527a02a
Merge branch 'inventree:master' into plugin-2037 2021-12-02 09:23:05 +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
91bc865887
remove webhook ruleset 2021-11-19 23:19:02 +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
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
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
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
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
06d3489ede fix: added ruleset 2021-06-05 18:06:26 +02:00
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