diff --git a/loanpy/src/loan/accept_loan_request.py b/loanpy/src/loan/accept_loan_request.py index 4d79edc177ff342f4b12669d42da1620ab92fdac..ca89c7c6e8e0b3bbebb130309b757b421b2a964c 100755 --- a/loanpy/src/loan/accept_loan_request.py +++ b/loanpy/src/loan/accept_loan_request.py @@ -23,7 +23,7 @@ Accept a loan request. from __future__ import absolute_import import caosdb as db from caosadvancedtools.serverside.helper import print_success, get_timestamp -from .box_loan import (main, get_loan, F_LOAN, +from .box_loan import (main, get_loan, F_LOAN,update_loan_state, LOAN_ACCEPTED, S_LOAN_ACCEPTED, S_LOAN_REQUESTED, get_borrower_names, set_property) diff --git a/loanpy/src/loan/accept_return_request.py b/loanpy/src/loan/accept_return_request.py index 7a647e09ee728b7e2c4c0b83e88d12c95baddf72..045f9671707076fdb2ef01e03cb71aad1cfb891b 100755 --- a/loanpy/src/loan/accept_return_request.py +++ b/loanpy/src/loan/accept_return_request.py @@ -25,7 +25,7 @@ from __future__ import absolute_import import caosdb as db from caosadvancedtools.serverside.helper import print_success, get_timestamp from .box_loan import (BOX_BORROWED, CONTENT, main, get_loan, set_property, - F_LOAN, RETURN_ACCEPTED, + F_LOAN, RETURN_ACCEPTED,update_loan_state, RETURNLOCATION, S_RETURN_ACCEPTED, S_RETURN_REQUESTED, get_borrower_names, set_location_of_borrowed_items) diff --git a/loanpy/src/loan/box_loan.py b/loanpy/src/loan/box_loan.py index bf2a362d5f5414f9e10707da1b798f4e11451354..fea71720cb5e801d90270da1c8a2520ba6dd9eae 100644 --- a/loanpy/src/loan/box_loan.py +++ b/loanpy/src/loan/box_loan.py @@ -493,7 +493,7 @@ def insert_or_update_person(firstname, lastname, email): return person except EmptyUniqueQueryError: - return create_person(firstname, lastname, email) + return create_person(firstname, lastname, email).insert() def set_property(entity, prop, value, case_sensitive=True): diff --git a/loanpy/src/loan/confirm_loan.py b/loanpy/src/loan/confirm_loan.py index e21496f599205e1115f5543348cdf7e40c2cb484..d2c69b05fa9d22090f13e97a5439f81ae8f352ab 100755 --- a/loanpy/src/loan/confirm_loan.py +++ b/loanpy/src/loan/confirm_loan.py @@ -26,7 +26,7 @@ import caosdb as db from caosadvancedtools.serverside.helper import get_timestamp, print_success from .box_loan import (BOX, BOX_BORROWED, DESTINATION, F_LOAN, LENT, S_LENT, - S_LOAN_ACCEPTED, get_borrower_names, + S_LOAN_ACCEPTED, get_borrower_names,update_loan_state, get_loan, main, set_location_of_borrowed_items, set_property) diff --git a/loanpy/src/loan/manual_return.py b/loanpy/src/loan/manual_return.py index 0bb6bce242b102d4ad28f719b323b2935304d387..1fe79b19a655d9dc37e429e435509c1661f52e58 100755 --- a/loanpy/src/loan/manual_return.py +++ b/loanpy/src/loan/manual_return.py @@ -27,7 +27,7 @@ from caosadvancedtools.serverside.helper import get_timestamp, print_success from .box_loan import (BOX, BOX_BORROWED, BOX_RETURNED, CONTENT, F_LOAN, RETURNED, RETURNLOCATION, S_RETURN_ACCEPTED, S_RETURNED, - get_borrower_names, get_loan, main, + get_borrower_names, get_loan, main,update_loan_state, set_location_of_borrowed_items, set_property) diff --git a/loanpy/src/loan/reject_return_request.py b/loanpy/src/loan/reject_return_request.py index 0c068234d620645ae52150cf40e1d62fb4ed0120..c381f18b3b5cb2818353ec9afc2a6433c12c7802 100755 --- a/loanpy/src/loan/reject_return_request.py +++ b/loanpy/src/loan/reject_return_request.py @@ -23,7 +23,7 @@ Reject a return request. from __future__ import absolute_import import caosdb as db from caosadvancedtools.serverside.helper import print_success -from .box_loan import (main, get_loan, F_LOAN, +from .box_loan import (main, get_loan, F_LOAN,update_loan_state, S_RETURN_REQUESTED, RETURN_REQUESTED, S_LENT, get_borrower_names) diff --git a/loanpy/src/loan/request_return.py b/loanpy/src/loan/request_return.py index 823e0ce9e49e3844c4829d9c27875e6bef35b67d..347e6134f5817ab592f8e4dcc96afc68611af2f9 100755 --- a/loanpy/src/loan/request_return.py +++ b/loanpy/src/loan/request_return.py @@ -30,7 +30,7 @@ from caosadvancedtools.serverside.helper import get_timestamp, print_success from .box_loan import (BORROWER, COMMENT, CONTENT, EXPECTED_RETURN, F_COMMENT, F_CURRENT_LOCATION, F_EMAIL, F_EXPECTED_RETURN_DATE, - F_FIRST_NAME, F_LAST_NAME, F_LOAN, FIRST_NAME, LAST_NAME, + F_FIRST_NAME, F_LAST_NAME, F_LOAN, FIRST_NAME, LAST_NAME,update_loan_state, RETURN_REQUESTED, RETURNLOCATION, S_LENT, assert_date_in_future, assert_key_in_data, get_loan, insert_or_update_person, main,