schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix' of https://github.com/frappe/erpnext into gstr2_fix

Browse Source
This commit is contained in:
deepeshgarg007
2019-05-17 10:30:39 +05:30
parent 2a2b884e32 0a22aab6bb
commit cdcf424ba5
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/crm/doctype/opportunity/opportunity.js
View File

@@ -25,9 +25,17 @@ frappe.ui.form.on("Opportunity", {
},
party_name: function(frm) {
frm.toggle_display("contact_info", frm.doc.party_name);
if (frm.doc.opportunity_from == "Customer") {
frm.trigger('set_contact_link');
erpnext.utils.get_party_details(frm);
} else if (frm.doc.opportunity_from == "Lead") {
erpnext.utils.map_current_doc({
method: "erpnext.crm.doctype.lead.lead.make_opportunity",
source_name: frm.doc.party_name,
frm: frm
});
}
},
@@ -162,11 +170,6 @@ erpnext.crm.Opportunity = frappe.ui.form.Controller.extend({
$.extend(cur_frm.cscript, new erpnext.crm.Opportunity({frm: cur_frm}));
cur_frm.cscript.onload_post_render = function(doc, cdt, cdn) {
if(doc.opportunity_from == 'Lead' && doc.party_name)
cur_frm.cscript.lead(doc, cdt, cdn);
}
cur_frm.cscript.item_code = function(doc, cdt, cdn) {
var d = locals[cdt][cdn];
if (d.item_code) {
@@ -185,15 +188,6 @@ cur_frm.cscript.item_code = function(doc, cdt, cdn) {
}
}
cur_frm.cscript.lead = function(doc, cdt, cdn) {
cur_frm.toggle_display("contact_info", doc.party_name);
erpnext.utils.map_current_doc({
method: "erpnext.crm.doctype.lead.lead.make_opportunity",
source_name: cur_frm.doc.party_name,
frm: cur_frm
});
}
cur_frm.cscript['Declare Opportunity Lost'] = function() {
var dialog = new frappe.ui.Dialog({
title: __("Set as Lost"),

2
erpnext/stock/doctype/batch/test_batch.py
View File

@@ -176,7 +176,7 @@ class TestBatch(unittest.TestCase):
item = item_name,
batch_id = batch_name
)).insert(ignore_permissions=True)
batch.submit()
batch.save()
stock_entry = frappe.get_doc(dict(
doctype = 'Stock Entry',