diff --git a/brewman/routers/purchase_return.py b/brewman/routers/purchase_return.py index 19dd3a45..9a1c567e 100644 --- a/brewman/routers/purchase_return.py +++ b/brewman/routers/purchase_return.py @@ -250,5 +250,5 @@ def get_id( def show_blank( 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) diff --git a/brewman/routers/voucher.py b/brewman/routers/voucher.py index 2f1c34bd..4f622769 100644 --- a/brewman/routers/voucher.py +++ b/brewman/routers/voucher.py @@ -71,7 +71,7 @@ def post_voucher( def check_delete_permissions(voucher: Voucher, user: UserToken): 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" if voucher.posted and "edit-posted-vouchers" not in user.permissions: raise HTTPException( diff --git a/overlord/package.json b/overlord/package.json index 81f698b8..1a82f148 100644 --- a/overlord/package.json +++ b/overlord/package.json @@ -1,6 +1,6 @@ { "name": "overlord", - "version": "7.1.0", + "version": "7.1.1", "scripts": { "ng": "ng", "start": "ng serve", diff --git a/setup.py b/setup.py index 73232050..8a8d229f 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ with open(os.path.join(here, 'requirements.txt'), "r") as r: requires = r.read().splitlines() setup(name='brewman', - version='7.1.0', + version='7.1.1', description='brewman', long_description=README + '\n\n' + CHANGES, classifiers=[