nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-18 02:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed conflict

Browse Source
This commit is contained in:
Nabin Hait
2015-02-17 11:12:04 +05:30
parent 3237c75d98 46e03eadca
commit 6f0a3ed8d4
62 changed files with 1220 additions and 897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/controllers/js/contact_address_common.js
View File

@@ -20,7 +20,7 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {
docname = last_route.slice(2).join("/");
if(["Customer", "Quotation", "Sales Order", "Sales Invoice", "Delivery Note",
"Installation Note", "Opportunity", "Customer Issue", "Maintenance Visit",
"Installation Note", "Opportunity", "Warranty Claim", "Maintenance Visit",
"Maintenance Schedule"]
.indexOf(doctype)!==-1) {
var refdoc = frappe.get_doc(doctype, docname);

2
erpnext/controllers/selling_controller.py
View File

@@ -55,7 +55,7 @@ class SellingController(StockController):
self.update_if_missing(party_details)
elif getattr(self, "lead", None):
from erpnext.selling.doctype.lead.lead import get_lead_details
from erpnext.crm.doctype.lead.lead import get_lead_details
self.update_if_missing(get_lead_details(self.lead))
def set_price_list_and_item_details(self):