diff --git a/accounts/doctype/period_closing_voucher/period_closing_voucher.py b/accounts/doctype/period_closing_voucher/period_closing_voucher.py index 69061bf521..5d7fc1e867 100644 --- a/accounts/doctype/period_closing_voucher/period_closing_voucher.py +++ b/accounts/doctype/period_closing_voucher/period_closing_voucher.py @@ -34,7 +34,7 @@ class DocType(AccountsController): def validate_posting_date(self): from accounts.utils import get_fiscal_year - self.year_start_date = get_fiscal_year(self.doc.posting_date)[1] + self.year_start_date = get_fiscal_year(self.doc.posting_date, self.doc.fiscal_year)[1] pce = webnotes.conn.sql("""select name from `tabPeriod Closing Voucher` where posting_date > %s and fiscal_year = %s and docstatus = 1""", diff --git a/setup/doctype/currency_exchange/test_currency_exchange.py b/setup/doctype/currency_exchange/test_currency_exchange.py index 0f8caed332..f8260be607 100644 --- a/setup/doctype/currency_exchange/test_currency_exchange.py +++ b/setup/doctype/currency_exchange/test_currency_exchange.py @@ -13,5 +13,11 @@ test_records = [ "from_currency": "USD", "to_currency": "EUR", "exchange_rate": 0.773 - }] + }], + [{ + "doctype": "Currency Exchange", + "from_currency": "INR", + "to_currency": "USD", + "exchange_rate": 0.0167 + }], ] \ No newline at end of file diff --git a/stock/utils.py b/stock/utils.py index 6d9f204726..4f5e11a657 100644 --- a/stock/utils.py +++ b/stock/utils.py @@ -299,6 +299,8 @@ def create_material_request(material_requests): mr_list = [] defaults = webnotes.defaults.get_defaults() exceptions_list = [] + from accounts.utils import get_fiscal_year + current_fiscal_year = get_fiscal_year(nowdate())[0] or defaults.fiscal_year for request_type in material_requests: for company in material_requests[request_type]: try: @@ -309,7 +311,7 @@ def create_material_request(material_requests): mr = [{ "doctype": "Material Request", "company": company, - "fiscal_year": defaults.fiscal_year, + "fiscal_year": current_fiscal_year, "transaction_date": nowdate(), "material_request_type": request_type }]