|
|
7cb029e7c3
|
Refactor: Rename "GLOBAL_SETTINGS" to "SETTINGS"
|
2022-01-01 22:43:35 +11:00 |
|
|
|
3ed8fc6ad4
|
Merge branch 'inventree:master' into webhooks
|
2021-12-15 00:21:03 +01:00 |
|
|
|
acbee38600
|
Merge branch 'inventree:master' into matmair/issue2279
|
2021-12-15 00:20:48 +01:00 |
|
|
|
3a3f8ba4ef
|
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2201
|
2021-12-08 18:31:33 +01:00 |
|
|
|
b8404c44b4
|
Merge branch 'inventree:master' into webhooks
|
2021-12-08 18:28:11 +01:00 |
|
|
|
cdcac90319
|
Merge branch 'inventree:master' into matmair/issue2279
|
2021-12-08 18:27:57 +01:00 |
|
|
|
bb2ad7c2cb
|
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037
|
2021-12-04 18:04:47 +01:00 |
|
|
|
1060f60117
|
Merge branch 'inventree:master' into webhooks
|
2021-12-04 17:53:21 +01:00 |
|
|
|
2a0e07abe0
|
Merge branch 'inventree:master' into matmair/issue2201
|
2021-12-04 17:53:13 +01:00 |
|
|
|
0d9f76a019
|
Merge branch 'inventree:master' into matmair/issue2279
|
2021-12-04 17:52:58 +01:00 |
|
|
|
087ac0bd34
|
Adds filter to purchase order for "assigned to me"
|
2021-12-04 21:15:38 +11:00 |
|
|
|
0f0460f8ea
|
merge
|
2021-12-02 17:24:07 +01:00 |
|
|
|
11e527a02a
|
Merge branch 'inventree:master' into plugin-2037
|
2021-12-02 09:23:05 +01:00 |
|
|
|
fcf7f615aa
|
Merge branch 'inventree:master' into webhooks
|
2021-12-02 09:22:48 +01:00 |
|
|
|
61b53a10b0
|
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2279
|
2021-12-01 23:59:22 +01:00 |
|
|
|
da6c723184
|
Merge branch 'master' into partial-shipment
# Conflicts:
# InvenTree/order/serializers.py
|
2021-11-29 22:59:36 +11:00 |
|
|
|
9454b51866
|
fix rules
|
2021-11-28 17:18:46 +01:00 |
|
|
|
ace4370ee9
|
add ruleset
|
2021-11-28 16:50:34 +01:00 |
|
|
|
90b3f63851
|
add ruleset
|
2021-11-28 16:47:40 +01:00 |
|
|
|
91bc865887
|
remove webhook ruleset
|
2021-11-19 23:19:02 +01:00 |
|
|
|
260c51f6fc
|
Pulls out the webhook dev for partial merge
Fixes #2036
|
2021-11-19 22:35:28 +01:00 |
|
|
|
9ae8474ed9
|
fix test
|
2021-11-12 02:34:18 +01:00 |
|
|
|
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 |
|
|
|
d982bfe201
|
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037
|
2021-11-10 00:37:49 +01:00 |
|
|
|
2835022330
|
merge
|
2021-11-10 00:30:21 +01:00 |
|
|
|
f1eaeef949
|
PEP fixes
|
2021-11-08 16:53:43 +11:00 |
|
|
|
ca0619a482
|
Adds API filtering for the "user" list
|
2021-11-08 16:53:15 +11:00 |
|
|
|
3d553cf7de
|
Adds search capability to "owner" API
- Currently a bit of a hack, but it works...
|
2021-11-08 16:49:15 +11:00 |
|
|
|
df72cb2608
|
merge upstream
|
2021-11-04 23:44:41 +01:00 |
|
|
|
363f21d6d7
|
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037
|
2021-11-04 10:10:58 +01:00 |
|
|
|
bebf368d06
|
Add functionality and unit testing for new model
|
2021-11-04 01:11:42 +11:00 |
|
|
|
ef2307aeaa
|
Add new model to permissions table
|
2021-11-04 00:46:23 +11:00 |
|
|
|
61d3ea6293
|
refactor underscore handeling into function
|
2021-11-01 22:33:56 +01:00 |
|
|
|
78d9e906da
|
remove testing string
|
2021-11-01 22:28:38 +01:00 |
|
|
|
3e3da8b2d1
|
fix permission parser
|
2021-11-01 22:23:51 +01:00 |
|
|
|
6dead88028
|
fix permission parsing if underscores in perm
|
2021-11-01 17:06:13 +01:00 |
|
|
|
a8e18a7972
|
handle modelnames / permissions with underscores
|
2021-11-01 00:24:57 +01:00 |
|
|
|
fc566621b7
|
add rulesets
|
2021-11-01 00:24:21 +01:00 |
|
|
|
2f7e0974b7
|
Add 'shipment' foreign-key field to SalesOrderAllocation model
|
2021-10-25 17:42:56 +11:00 |
|
|
|
32122102e6
|
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037
|
2021-10-15 23:36:19 +02:00 |
|
|
|
51efd6b2e4
|
Add permissions for new mdoel
|
2021-10-13 14:06:36 +11:00 |
|
|
|
9aaf4c25e1
|
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037
|
2021-10-12 22:23:45 +02:00 |
|
|
|
40e5536300
|
Handle rare case where user instance has no name assigned
|
2021-10-11 21:39:34 +11:00 |
|
|
|
ca3e9709e1
|
rueset for messafe
|
2021-09-12 22:46:41 +02:00 |
|
|
|
440311cddb
|
ruleset
|
2021-09-12 17:36:57 +02:00 |
|
|
|
28f0e99b84
|
rulesets for all_auth
|
2021-08-30 22:43:50 +02:00 |
|
|
|
69ff0ac248
|
ruleset
|
2021-07-22 23:39:36 +02:00 |
|
|
|
bd4dde2cb7
|
Add permissions for PartLabel model
|
2021-07-08 23:22:25 +10:00 |
|
|
|
993abd9d91
|
Refactor forms for sales orders
|
2021-07-03 00:14:36 +10:00 |
|
|
|
5e9372f2d6
|
Add API endpoints for Owner model
- Will be necessary for PurchaseOrder, SalesOrder and BuildOrder forms
|
2021-07-02 22:45:42 +10:00 |
|
