Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
Nabin Hait 2018-08-09 19:45:33 +05:30
parent c13960ddc9
commit 8bf52fef42
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
View File

@ -38,7 +38,7 @@ def create_charts(company, chart_template=None, existing_company=None):
"report_type": report_type, "report_type": report_type,
"account_number": account_number, "account_number": account_number,
"account_type": child.get("account_type"), "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") "tax_rate": child.get("tax_rate")
}) })

6
erpnext/accounts/doctype/pricing_rule/pricing_rule.py
View File

@ -167,14 +167,14 @@ def get_pricing_rule_for_item(args):
if args.transaction_type=="selling": if args.transaction_type=="selling":
if args.customer and not (args.customer_group and args.territory): 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: if customer:
args.customer_group, args.territory = customer args.customer_group, args.territory = customer
args.supplier = args.supplier_group = None args.supplier = args.supplier_group = None
elif args.supplier and not args.supplier_group: 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 args.customer = args.customer_group = args.territory = None
pricing_rules = get_pricing_rules(args) pricing_rules = get_pricing_rules(args)
@ -209,7 +209,7 @@ def get_pricing_rule_for_item(args):
return item_details return item_details
def remove_pricing_rule_for_item(pricing_rule, 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) ['price_or_discount', 'margin_type'], as_dict=1)
if pricing_rule and pricing_rule.price_or_discount == 'Discount Percentage': if pricing_rule and pricing_rule.price_or_discount == 'Discount Percentage':
item_details.discount_percentage = 0.0 item_details.discount_percentage = 0.0

3
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@ -220,7 +220,7 @@ class PurchaseInvoice(BuyingController):
item.expense_account = warehouse_account[item.warehouse]["account"] item.expense_account = warehouse_account[item.warehouse]["account"]
else: else:
item.expense_account = stock_not_billed_account item.expense_account = stock_not_billed_account
elif not item.expense_account and for_validate: elif not item.expense_account and for_validate:
throw(_("Expense account is mandatory for item {0}").format(item.item_code or item.item_name)) 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) 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) 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', if (not item.expense_account or frappe.db.get_value('Account',
item.expense_account, 'account_type') != 'Asset Received But Not Billed'): item.expense_account, 'account_type') != 'Asset Received But Not Billed'):

2
erpnext/setup/doctype/email_digest/email_digest.py
View File

@ -22,7 +22,7 @@ class EmailDigest(Document):
self.from_date, self.to_date = self.get_from_to_date() self.from_date, self.to_date = self.get_from_to_date()
self.set_dates() self.set_dates()
self._accounts = {} 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): def get_users(self):
"""get list of users""" """get list of users"""