nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-03 21:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

use get_global_default instead of control panel

Browse Source
This commit is contained in:
Nabin Hait
2013-03-06 13:15:08 +05:30
parent 7804401d03
commit 87b9cd5ba1
6 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@@ -522,13 +522,13 @@ class DocType(BuyingController):
def update_raw_material_cost(self):
if self.sub_contracted_items:
for d in self.doclist.get({"parentfield": "entries"}):
rm_cost = webnotes.conn.sql(""" select raw_material_cost / quantity
from `tabBOM` where item = %s and is_default = 1 and docstatus = 1
and is_active = 1 """, (d.item_code,))
rm_cost = rm_cost and flt(rm_cost[0][0]) or 0
d.conversion_factor = d.conversion_factor or webnotes.conn.get_value(
"UOM Conversion Detail", {"parent": d.item_code, "uom": d.uom},
"conversion_factor") or 1
d.rm_supp_cost = rm_cost * flt(d.qty) * flt(d.conversion_factor)
rm_cost = webnotes.conn.sql(""" select raw_material_cost / quantity
from `tabBOM` where item = %s and is_default = 1 and docstatus = 1
and is_active = 1 """, (d.item_code,))
rm_cost = rm_cost and flt(rm_cost[0][0]) or 0
d.conversion_factor = d.conversion_factor or webnotes.conn.get_value(
"UOM Conversion Detail", {"parent": d.item_code, "uom": d.uom},
"conversion_factor") or 1
d.rm_supp_cost = rm_cost * flt(d.qty) * flt(d.conversion_factor)

2
accounts/doctype/sales_invoice/sales_invoice.py
View File

@@ -929,7 +929,7 @@ def send_notification(new_rv):
"""Notify concerned persons about recurring invoice generation"""
subject = "Invoice : " + new_rv.doc.name
com = new_rv.doc.company # webnotes.conn.get_value('Control Panel', '', 'letter_head')
com = new_rv.doc.company
hd = '''<div><h2>%s</h2></div>
<div><h3>Invoice: %s</h3></div>

3
accounts/page/voucher_import_tool/voucher_import_tool.py
View File

@@ -2,6 +2,7 @@ from __future__ import unicode_literals
import webnotes
from webnotes import _
from webnotes.utils import flt, comma_and
import webnotes.defaults
@webnotes.whitelist()
def get_template():
@@ -35,7 +36,7 @@ def get_template():
%(columns)s
''' % {
"template_type": template_type,
"user_fmt": webnotes.conn.get_value('Control Panel', None, 'date_format'),
"user_fmt": webnotes.defaults.get_global_default('date_format'),
"default_company": webnotes.conn.get_default("company"),
"naming_options": naming_options.replace("\n", ", "),
"voucher_type": voucher_type.replace("\n", ", "),