From 8bf52fef4235c03e29457d24efb37dbab3607dd7 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 9 Aug 2018 19:45:33 +0530 Subject: [PATCH] minor fixes --- .../doctype/account/chart_of_accounts/chart_of_accounts.py | 2 +- erpnext/accounts/doctype/pricing_rule/pricing_rule.py | 6 +++--- .../accounts/doctype/purchase_invoice/purchase_invoice.py | 3 +-- erpnext/setup/doctype/email_digest/email_digest.py | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py b/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py index 1bcc820ff4..f4cf6fabce 100644 --- a/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py +++ b/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py @@ -38,7 +38,7 @@ def create_charts(company, chart_template=None, existing_company=None): "report_type": report_type, "account_number": account_number, "account_type": child.get("account_type"), - "account_currency": frappe.get_cached_value('Company', company, "default_currency"), + "account_currency": frappe.db.get_value('Company', company, "default_currency"), "tax_rate": child.get("tax_rate") }) diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py index 96cd747960..0979854920 100644 --- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py @@ -167,14 +167,14 @@ def get_pricing_rule_for_item(args): if args.transaction_type=="selling": if args.customer and not (args.customer_group and args.territory): - customer = frappe.db.get_cached_value("Customer", args.customer, ["customer_group", "territory"]) + customer = frappe.get_cached_value("Customer", args.customer, ["customer_group", "territory"]) if customer: args.customer_group, args.territory = customer args.supplier = args.supplier_group = None elif args.supplier and not args.supplier_group: - args.supplier_group = frappe.db.get_cached_value("Supplier", args.supplier, "supplier_group") + args.supplier_group = frappe.get_cached_value("Supplier", args.supplier, "supplier_group") args.customer = args.customer_group = args.territory = None pricing_rules = get_pricing_rules(args) @@ -209,7 +209,7 @@ def get_pricing_rule_for_item(args): return item_details def remove_pricing_rule_for_item(pricing_rule, item_details): - pricing_rule = frappe.db.get_cached_value('Pricing Rule', pricing_rule, + pricing_rule = frappe.get_cached_value('Pricing Rule', pricing_rule, ['price_or_discount', 'margin_type'], as_dict=1) if pricing_rule and pricing_rule.price_or_discount == 'Discount Percentage': item_details.discount_percentage = 0.0 diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index f343165de1..266049063a 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -220,7 +220,7 @@ class PurchaseInvoice(BuyingController): item.expense_account = warehouse_account[item.warehouse]["account"] else: item.expense_account = stock_not_billed_account - + elif not item.expense_account and for_validate: throw(_("Expense account is mandatory for item {0}").format(item.item_code or item.item_name)) @@ -486,7 +486,6 @@ class PurchaseInvoice(BuyingController): asset_amount = flt(item.net_amount) + flt(item.item_tax_amount/self.conversion_rate) base_asset_amount = flt(item.base_net_amount + item.item_tax_amount) - item.expense_account = item.expense_account if (not item.expense_account or frappe.db.get_value('Account', item.expense_account, 'account_type') != 'Asset Received But Not Billed'): diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py index 3ca022d400..631c0bcd49 100644 --- a/erpnext/setup/doctype/email_digest/email_digest.py +++ b/erpnext/setup/doctype/email_digest/email_digest.py @@ -22,7 +22,7 @@ class EmailDigest(Document): self.from_date, self.to_date = self.get_from_to_date() self.set_dates() self._accounts = {} - self.currency = frappe.get_cached_value('Company', self.company, "default_currency") + self.currency = frappe.db.get_value('Company', self.company, "default_currency") def get_users(self): """get list of users"""