Fix: Purchase Return was being saved as Purchase entries
Fix: Receipt Vouchers could not be deleted as wrong permission was checked v7.1.1
This commit is contained in:
parent
9b483e6d65
commit
8b82cf8157
@ -250,5 +250,5 @@ def get_id(
|
|||||||
def show_blank(
|
def show_blank(
|
||||||
request: Request, db: Session = Depends(get_db), user: UserToken = Security(get_user, scopes=["purchase-return"]),
|
request: Request, db: Session = Depends(get_db), user: UserToken = Security(get_user, scopes=["purchase-return"]),
|
||||||
):
|
):
|
||||||
additional_info = {"date": get_date(request.session), "type": "Purchase"}
|
additional_info = {"date": get_date(request.session), "type": "Purchase Return"}
|
||||||
return blank_voucher(additional_info, db)
|
return blank_voucher(additional_info, db)
|
||||||
|
@ -71,7 +71,7 @@ def post_voucher(
|
|||||||
|
|
||||||
def check_delete_permissions(voucher: Voucher, user: UserToken):
|
def check_delete_permissions(voucher: Voucher, user: UserToken):
|
||||||
voucher_type = VoucherType.by_id(voucher.type).name.replace(" ", "-").lower()
|
voucher_type = VoucherType.by_id(voucher.type).name.replace(" ", "-").lower()
|
||||||
if voucher_type in ["payment", "purchase"]:
|
if voucher_type in ["payment", "receipt"]:
|
||||||
voucher_type = "journal"
|
voucher_type = "journal"
|
||||||
if voucher.posted and "edit-posted-vouchers" not in user.permissions:
|
if voucher.posted and "edit-posted-vouchers" not in user.permissions:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "overlord",
|
"name": "overlord",
|
||||||
"version": "7.1.0",
|
"version": "7.1.1",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"ng": "ng",
|
"ng": "ng",
|
||||||
"start": "ng serve",
|
"start": "ng serve",
|
||||||
|
2
setup.py
2
setup.py
@ -11,7 +11,7 @@ with open(os.path.join(here, 'requirements.txt'), "r") as r:
|
|||||||
requires = r.read().splitlines()
|
requires = r.read().splitlines()
|
||||||
|
|
||||||
setup(name='brewman',
|
setup(name='brewman',
|
||||||
version='7.1.0',
|
version='7.1.1',
|
||||||
description='brewman',
|
description='brewman',
|
||||||
long_description=README + '\n\n' + CHANGES,
|
long_description=README + '\n\n' + CHANGES,
|
||||||
classifiers=[
|
classifiers=[
|
||||||
|
Loading…
x
Reference in New Issue
Block a user