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

Merge pull request #1790 from anandpdoshi/wip-anand

Browse Source 
Fixes split email settings, removed clear custom buttons, pos view switch
This commit is contained in:
Rushabh Mehta 2014-06-12 15:25:03 +05:30
commit 99703a95c2
5 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/sales_invoice/sales_invoice.js
View File

@ -24,7 +24,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
}
// toggle to pos view if is_pos is 1 in user_defaults
if ((cint(frappe.defaults.get_user_defaults("is_pos"))===1 || this.frm.doc.is_pos)) {
if ((is_null(this.frm.doc.is_pos) && cint(frappe.defaults.get_user_default("is_pos"))===1) || this.frm.doc.is_pos) {
if(this.frm.doc.__islocal && !this.frm.doc.amended_from && !this.frm.doc.customer) {
this.frm.set_value("is_pos", 1);
this.is_pos(function() {

2
erpnext/patches/v4_0/split_email_settings.py
View File

@ -28,6 +28,7 @@ def map_outgoing_email_settings(email_settings):
outgoing_email_settings.set(to_fieldname, email_settings.get(from_fieldname))
outgoing_email_settings._fix_numeric_types()
outgoing_email_settings.save()
def map_support_email_settings(email_settings):
@ -47,6 +48,7 @@ def map_support_email_settings(email_settings):
support_email_settings.set(to_fieldname, email_settings.get(from_fieldname))
support_email_settings._fix_numeric_types()
support_email_settings.save()
def get_email_settings():

1
erpnext/public/js/transaction.js
View File

@ -47,7 +47,6 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
},
refresh: function() {
this.frm.clear_custom_buttons();
erpnext.toggle_naming_series();
erpnext.hide_company();
this.show_item_wise_taxes();

1
erpnext/selling/doctype/lead/lead.js
View File

@ -30,7 +30,6 @@ erpnext.LeadController = frappe.ui.form.Controller.extend({
refresh: function() {
var doc = this.frm.doc;
erpnext.toggle_naming_series();
this.frm.clear_custom_buttons();
if(!this.frm.doc.__islocal && this.frm.doc.__onload && !this.frm.doc.__onload.is_customer) {
this.frm.add_custom_button(__("Create Customer"), this.create_customer);

1
erpnext/selling/doctype/opportunity/opportunity.js
View File

@ -80,7 +80,6 @@ $.extend(cur_frm.cscript, new erpnext.selling.Opportunity({frm: cur_frm}));
cur_frm.cscript.refresh = function(doc, cdt, cdn) {
erpnext.toggle_naming_series();
cur_frm.clear_custom_buttons();
if(doc.docstatus === 1 && doc.status!=="Lost") {
cur_frm.add_custom_button(__('Create Quotation'), cur_frm.cscript.create_quotation);