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

[minor] [fix]

Browse Source
This commit is contained in:
Anand Doshi 2013-07-11 18:26:00 +05:30
parent e464105c8e
commit 946e0de0cf
8 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,5 +164,5 @@ def gl_entry_details(doctype, txt, searchfield, start, page_len, filters):
%(mcond)s
ORDER BY gle.posting_date desc, gle.voucher_no desc
limit %(start)s, %(page_len)s""" % {dt:filters["dt"], acc:filters["acc"],
account_type: filters['account_type'], 'mcond':get_match_cond(doctype, searchfield)
account_type: filters['account_type'], 'mcond':get_match_cond(doctype, searchfield),
'txt': "%%%s%%" % txt,"start": start, "page_len": page_len})

4
selling/doctype/customer/customer.txt
View File

@ -2,7 +2,7 @@
{
"creation": "2013-06-11 14:26:44",
"docstatus": 0,
"modified": "2013-07-05 14:34:09",
"modified": "2013-07-11 16:53:18",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -93,7 +93,7 @@
"fieldtype": "Link",
"hidden": 0,
"in_filter": 1,
"label": "Lead Ref",
"label": "From Lead",
"no_copy": 1,
"oldfieldname": "lead_name",
"oldfieldtype": "Link",

4
setup/doctype/company/company.py
View File

@ -160,8 +160,8 @@ class DocType:
['Indirect Income','Income','Group','Yes','Income Account','Credit',self.doc.name,''],
['Source of Funds (Liabilities)','','Group','No','','Credit',self.doc.name,''],
['Capital Account','Source of Funds (Liabilities)','Group','No','','Credit',self.doc.name,''],
['Reserves and Surplus','Capital Account','Group','No','','Credit',self.doc.name,''],
['Shareholders Funds','Capital Account','Group','No','','Credit',self.doc.name,''],
['Reserves and Surplus','Capital Account','Ledger','No','','Credit',self.doc.name,''],
['Shareholders Funds','Capital Account','Ledger','No','','Credit',self.doc.name,''],
['Current Liabilities','Source of Funds (Liabilities)','Group','No','','Credit',self.doc.name,''],
['Accounts Payable','Current Liabilities','Group','No','','Credit',self.doc.name,''],
['Stock Liabilities','Current Liabilities','Group','No','','Credit',self.doc.name,''],

2
setup/page/setup/setup.js
View File

@ -68,7 +68,7 @@ wn.pages['Setup'].onload = function(wrapper) {
} else {
var col = $(repl('<div class="col col-lg-5">\
<span class="badge">%(count)s</span>\
<span class="badge view-link">%(count)s</span>\
<b><i class="%(icon)s"></i>\
<a class="data-link">%(title)s</a></b>\
</div>', {

10
setup/page/setup/setup.py
View File

@ -9,7 +9,7 @@ items = [
},
{"doctype":"Company"},
{"doctype":"Fiscal Year"},
{"doctype":"Currency"},
{"doctype":"Currency", "filter": {"enabled": 1}},
{
"type": "Section",
"title": "Users and Permissions",
@ -48,8 +48,8 @@ items = [
{"doctype":"Customer Group", "tree": "Sales Browser"},
{"doctype":"Territory", "tree": "Sales Browser"},
{"doctype":"Sales Person", "tree": "Sales Browser"},
{"doctype":"Contact"},
{"doctype":"Address"},
{"doctype":"Contact", "query": "select count(*) from `tabContact` where ifnull(customer, '')!=''"},
{"doctype":"Address", "query": "select count(*) from `tabAddress` where ifnull(customer, '')!=''"},
{ "title": "Selling Settings",
"route": "Form/Selling Settings", "type": "Link", "icon": "icon-cog" },
]
@ -58,8 +58,8 @@ items = [
"doctype": "Supplier",
"dependencies": [
{"doctype":"Supplier Type"},
{"doctype":"Contact"},
{"doctype":"Address"},
{"doctype":"Contact", "query": "select count(*) from `tabContact` where ifnull(supplier, '')!=''"},
{"doctype":"Address", "query": "select count(*) from `tabAddress` where ifnull(supplier, '')!=''"},
{ "title": "Buying Settings",
"route": "Form/Buying Settings", "type": "Link", "icon": "icon-cog" },
]

2
startup/event_handlers.py
View File

@ -30,7 +30,7 @@ def on_login_post_session(login_manager):
login_manager.user=='Administrator' and '#8CA2B3' or '#1B750D')
webnotes.conn.commit()
if webnotes.cookies.get("full_name"):
if webnotes.conn.get_value("Profile", webnotes.session.user, "user_type") == "Partner":
from website.helpers.cart import set_cart_count
set_cart_count()

4
utilities/doctype/address/address.txt
View File

@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:32",
"docstatus": 0,
"modified": "2013-07-05 14:24:00",
"modified": "2013-07-11 17:02:12",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -53,7 +53,7 @@
"fieldname": "address_title",
"fieldtype": "Data",
"label": "Address Title",
"reqd": 1
"reqd": 0
},
{
"doctype": "DocField",

3
utilities/transaction_base.py
View File

@ -76,7 +76,8 @@ class TransactionBase(StatusUpdater):
# fields prepended with default in Customer doctype
for f in ['sales_partner', 'commission_rate', 'currency', 'price_list']:
out[f] = customer.fields.get("default_" + f)
if customer.fields.get("default_" + f):
out[f] = customer.fields.get("default_" + f)
return out