Compare commits

..

4 Commits

Author SHA1 Message Date
mbauskar
353956a864 Merge branch 'hotfix' 2017-08-09 11:17:55 +05:30
mbauskar
3e29a28cee bumped to version 8.8.1 2017-08-09 11:47:55 +06:00
Makarand Bauskar
60fcf47f6a [hotfix] changed the modified date for quotation (#10337) 2017-08-09 11:15:18 +05:30
rohitwaghchaure
468fb97c81 [Fix] Lead address not able to select on the quotation (#10328) 2017-08-08 17:27:58 +05:30
3 changed files with 13 additions and 2 deletions

View File

@@ -4,7 +4,7 @@ import inspect
import frappe
from erpnext.hooks import regional_overrides
__version__ = '8.8.0'
__version__ = '8.8.1'
def get_default_company(user=None):
'''Get default company for user'''

View File

@@ -9,6 +9,15 @@ frappe.ui.form.on('Quotation', {
frm.custom_make_buttons = {
'Sales Order': 'Make Sales Order'
}
},
refresh: function(frm) {
frm.trigger("set_label");
},
quotation_to: function(frm) {
frm.trigger("set_label");
},
set_label: function(frm) {
frm.fields_dict.customer_address.set_label(__(frm.doc.quotation_to + " Address"));
}
});
@@ -24,6 +33,8 @@ erpnext.selling.QuotationController = erpnext.selling.SellingController.extend({
},
refresh: function(doc, dt, dn) {
this._super(doc, dt, dn);
doctype = doc.quotation_to == 'Customer' ? 'Customer':'Lead';
frappe.dynamic_link = {doc: this.frm.doc, fieldname: doctype.toLowerCase(), doctype: doctype}
var me = this;

View File

@@ -2602,7 +2602,7 @@
"istable": 0,
"max_attachments": 1,
"menu_index": 0,
"modified": "2017-08-02 18:15:38.198698",
"modified": "2017-08-09 01:16:21.104135",
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation",