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

Reverted #13259 (#13291)

Browse Source
This commit is contained in:
Nabin Hait 2018-03-13 16:01:11 +05:30 committed by GitHub
parent 97e890d0b3
commit 89346967da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/accounts/party.py
View File

@ -4,12 +4,11 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
import datetime
from frappe import _, msgprint, scrub from frappe import _, msgprint, scrub
from frappe.defaults import get_user_permissions from frappe.defaults import get_user_permissions
from frappe.model.utils import get_fetch_values from frappe.model.utils import get_fetch_values
from frappe.utils import (add_days, getdate, formatdate, get_first_day, date_diff, from frappe.utils import (add_days, getdate, formatdate, date_diff,
add_years, get_timestamp, nowdate, flt, add_months, get_last_day) add_years, get_timestamp, nowdate, flt, add_months, get_last_day)
from frappe.contacts.doctype.address.address import (get_address_display, from frappe.contacts.doctype.address.address import (get_address_display,
get_default_address, get_company_address) get_default_address, get_company_address)
from frappe.contacts.doctype.contact.contact import get_contact_details, get_default_contact from frappe.contacts.doctype.contact.contact import get_contact_details, get_default_contact
@ -141,10 +140,7 @@ def set_price_list(out, party, party_type, given_price_list):
price_list = get_default_price_list(party) price_list = get_default_price_list(party)
if not price_list: if not price_list:
if party.doctype == "Customer": price_list = given_price_list
price_list = frappe.db.get_single_value('Selling Settings', 'selling_price_list')
else:
price_list = frappe.db.get_single_value('Buying Settings', 'buying_price_list')
if price_list: if price_list:
out.price_list_currency = frappe.db.get_value("Price List", price_list, "currency") out.price_list_currency = frappe.db.get_value("Price List", price_list, "currency")

2
erpnext/stock/doctype/delivery_note/delivery_note.json
View File

@ -493,7 +493,7 @@
}, },
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_on_submit": 0, "allow_on_submit": 1,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,